rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Fixed indentaion.

Browse Source
This commit is contained in:
Brian Webb 2012-03-31 07:59:44 -07:00
parent aba3789d87
commit 496a323b7f
13 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/UAVObjects/uavobjectmanager.c
View File

@ -128,7 +128,7 @@ int32_t UAVObjInitialize()
return -1; return -1;
// Initialize default metadata structure (metadata of metaobjects) // Initialize default metadata structure (metadata of metaobjects)
UAVObjMetadataInitialize(&defMetadata); UAVObjMetadataInitialize(&defMetadata);
// Done // Done
return 0; return 0;

6
ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
View File

@ -298,7 +298,7 @@ void ConfigAHRSWidget::launchAccelBiasCalibration()
obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("AttitudeRaw"))); obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("AttitudeRaw")));
initialMdata = obj->getMetadata(); initialMdata = obj->getMetadata();
UAVObject::Metadata mdata = initialMdata; UAVObject::Metadata mdata = initialMdata;
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC);
mdata.flightTelemetryUpdatePeriod = 100; mdata.flightTelemetryUpdatePeriod = 100;
obj->setMetadata(mdata); obj->setMetadata(mdata);
@ -380,7 +380,7 @@ void ConfigAHRSWidget::launchGyroDriftCalibration()
obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("AttitudeRaw"))); obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("AttitudeRaw")));
initialMdata = obj->getMetadata(); initialMdata = obj->getMetadata();
UAVObject::Metadata mdata = initialMdata; UAVObject::Metadata mdata = initialMdata;
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC);
mdata.flightTelemetryUpdatePeriod = 100; mdata.flightTelemetryUpdatePeriod = 100;
obj->setMetadata(mdata); obj->setMetadata(mdata);
@ -998,7 +998,7 @@ void ConfigAHRSWidget::multiPointCalibrationMode()
obj = getObjectManager()->getObject(QString("AttitudeRaw")); obj = getObjectManager()->getObject(QString("AttitudeRaw"));
initialMdata = obj->getMetadata(); initialMdata = obj->getMetadata();
UAVObject::Metadata mdata = initialMdata; UAVObject::Metadata mdata = initialMdata;
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC);
mdata.flightTelemetryUpdatePeriod = 100; mdata.flightTelemetryUpdatePeriod = 100;
obj->setMetadata(mdata); obj->setMetadata(mdata);

2
ground/openpilotgcs/src/plugins/config/configairframewidget.cpp
View File

@ -309,7 +309,7 @@ void ConfigAirframeWidget::enableFFTest()
UAVDataObject* obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("ManualControlCommand"))); UAVDataObject* obj = dynamic_cast<UAVDataObject*>(getObjectManager()->getObject(QString("ManualControlCommand")));
UAVObject::Metadata mdata = obj->getMetadata(); UAVObject::Metadata mdata = obj->getMetadata();
accInitialData = mdata; accInitialData = mdata;
UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY); UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY);
obj->setMetadata(mdata); obj->setMetadata(mdata);
} }
// Depending on phase, either move actuator or send FF settings: // Depending on phase, either move actuator or send FF settings:

2
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
View File

@ -148,7 +148,7 @@ void ConfigCCAttitudeWidget::startAccelCalibration() {
// Speed up updates // Speed up updates
initialMdata = obj->getMetadata(); initialMdata = obj->getMetadata();
UAVObject::Metadata mdata = initialMdata; UAVObject::Metadata mdata = initialMdata;
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC);
mdata.flightTelemetryUpdatePeriod = 100; mdata.flightTelemetryUpdatePeriod = 100;
obj->setMetadata(mdata); obj->setMetadata(mdata);

8
ground/openpilotgcs/src/plugins/config/configccpmwidget.cpp
View File

@ -1703,10 +1703,10 @@ void ConfigccpmWidget::enableSwashplateLevellingControl(bool state)
if (state) if (state)
{ {
SwashLvlaccInitialData = mdata; SwashLvlaccInitialData = mdata;
UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY); UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY);
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE);
UAVObject::SetGcsTelemetryAcked(mdata, false); UAVObject::SetGcsTelemetryAcked(mdata, false);
UAVObject::SetGcsTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE); UAVObject::SetGcsTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE);
mdata.gcsTelemetryUpdatePeriod = 100; mdata.gcsTelemetryUpdatePeriod = 100;
SwashLvlConfigurationInProgress=1; SwashLvlConfigurationInProgress=1;
m_ccpm->TabObject->setTabEnabled(0,0); m_ccpm->TabObject->setTabEnabled(0,0);

2
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -601,7 +601,7 @@ void ConfigInputWidget::fastMdata()
{ {
manualControlMdata = manualCommandObj->getMetadata(); manualControlMdata = manualCommandObj->getMetadata();
UAVObject::Metadata mdata = manualControlMdata; UAVObject::Metadata mdata = manualControlMdata;
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_PERIODIC);
mdata.flightTelemetryUpdatePeriod = 150; mdata.flightTelemetryUpdatePeriod = 150;
manualCommandObj->setMetadata(mdata); manualCommandObj->setMetadata(mdata);
} }

8
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
View File

@ -152,10 +152,10 @@ void ConfigOutputWidget::runChannelTests(bool state)
{ {
wasItMe=true; wasItMe=true;
accInitialData = mdata; accInitialData = mdata;
UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY); UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY);
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE);
UAVObject::SetGcsTelemetryAcked(mdata, false); UAVObject::SetGcsTelemetryAcked(mdata, false);
UAVObject::SetGcsTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE); UAVObject::SetGcsTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE);
mdata.gcsTelemetryUpdatePeriod = 100; mdata.gcsTelemetryUpdatePeriod = 100;
} }
else else

8
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetwidget.cpp
View File

@ -117,10 +117,10 @@ void GCSControlGadgetWidget::toggleControl(int state)
if (state) if (state)
{ {
mccInitialData = mdata; mccInitialData = mdata;
UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY); UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY);
UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE); UAVObject::SetFlightTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE);
UAVObject::SetGcsTelemetryAcked(mdata, false); UAVObject::SetGcsTelemetryAcked(mdata, false);
UAVObject::SetGcsTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE); UAVObject::SetGcsTelemetryUpdateMode(mdata, UAVObject::UPDATEMODE_ONCHANGE);
mdata.gcsTelemetryUpdatePeriod = 100; mdata.gcsTelemetryUpdatePeriod = 100;
} }

2
ground/openpilotgcs/src/plugins/uavobjects/uavmetaobject.cpp
View File

@ -36,7 +36,7 @@ UAVMetaObject::UAVMetaObject(quint32 objID, const QString& name, UAVObject* pare
{ {
this->parent = parent; this->parent = parent;
// Setup default metadata of metaobject (can not be changed) // Setup default metadata of metaobject (can not be changed)
UAVObject::MetadataInitialize(ownMetadata); UAVObject::MetadataInitialize(ownMetadata);
// Setup fields // Setup fields
QStringList boolEnum; QStringList boolEnum;
boolEnum << tr("False") << tr("True"); boolEnum << tr("False") << tr("True");

72
ground/openpilotgcs/src/plugins/uavobjects/uavobject.h
View File

@ -72,28 +72,28 @@ public:
ACCESS_READONLY = 1 ACCESS_READONLY = 1
} AccessMode; } AccessMode;
/** /**
* Object metadata, each object has a meta object that holds its metadata. The metadata define * Object metadata, each object has a meta object that holds its metadata. The metadata define
* properties for each object and can be used by multiple modules (e.g. telemetry and logger) * properties for each object and can be used by multiple modules (e.g. telemetry and logger)
* *
* The object metadata flags are packed into a single 16 bit integer. * The object metadata flags are packed into a single 16 bit integer.
* The bits in the flag field are defined as: * The bits in the flag field are defined as:
* *
* Bit(s) Name Meaning * Bit(s) Name Meaning
* ------ ---- ------- * ------ ---- -------
* 0 access Defines the access level for the local transactions (readonly=0 and readwrite=1) * 0 access Defines the access level for the local transactions (readonly=0 and readwrite=1)
* 1 gcsAccess Defines the access level for the local GCS transactions (readonly=0 and readwrite=1), not used in the flight s/w * 1 gcsAccess Defines the access level for the local GCS transactions (readonly=0 and readwrite=1), not used in the flight s/w
* 2 telemetryAcked Defines if an ack is required for the transactions of this object (1:acked, 0:not acked) * 2 telemetryAcked Defines if an ack is required for the transactions of this object (1:acked, 0:not acked)
* 3 gcsTelemetryAcked Defines if an ack is required for the transactions of this object (1:acked, 0:not acked) * 3 gcsTelemetryAcked Defines if an ack is required for the transactions of this object (1:acked, 0:not acked)
* 4-5 telemetryUpdateMode Update mode used by the telemetry module (UAVObjUpdateMode) * 4-5 telemetryUpdateMode Update mode used by the telemetry module (UAVObjUpdateMode)
* 6-7 gcsTelemetryUpdateMode Update mode used by the GCS (UAVObjUpdateMode) * 6-7 gcsTelemetryUpdateMode Update mode used by the GCS (UAVObjUpdateMode)
*/ */
typedef struct { typedef struct {
uint8_t flags; /** Defines flags for update and logging modes and whether an update should be ACK'd (bits defined above) */ uint8_t flags; /** Defines flags for update and logging modes and whether an update should be ACK'd (bits defined above) */
uint16_t flightTelemetryUpdatePeriod; /** Update period used by the telemetry module (only if telemetry mode is PERIODIC) */ uint16_t flightTelemetryUpdatePeriod; /** Update period used by the telemetry module (only if telemetry mode is PERIODIC) */
uint16_t gcsTelemetryUpdatePeriod; /** Update period used by the GCS (only if telemetry mode is PERIODIC) */ uint16_t gcsTelemetryUpdatePeriod; /** Update period used by the GCS (only if telemetry mode is PERIODIC) */
uint16_t loggingUpdatePeriod; /** Update period used by the logging module (only if logging mode is PERIODIC) */ uint16_t loggingUpdatePeriod; /** Update period used by the logging module (only if logging mode is PERIODIC) */
} __attribute__((packed)) Metadata; } __attribute__((packed)) Metadata;
UAVObject(quint32 objID, bool isSingleInst, const QString& name); UAVObject(quint32 objID, bool isSingleInst, const QString& name);
@ -125,20 +125,20 @@ public:
QString toStringData(); QString toStringData();
void emitTransactionCompleted(bool success); void emitTransactionCompleted(bool success);
// Metadata accessors // Metadata accessors
static void MetadataInitialize(Metadata& meta); static void MetadataInitialize(Metadata& meta);
static AccessMode GetFlightAccess(const Metadata& meta); static AccessMode GetFlightAccess(const Metadata& meta);
static void SetFlightAccess(Metadata& meta, AccessMode mode); static void SetFlightAccess(Metadata& meta, AccessMode mode);
static AccessMode GetGcsAccess(const Metadata& meta); static AccessMode GetGcsAccess(const Metadata& meta);
static void SetGcsAccess(Metadata& meta, AccessMode mode); static void SetGcsAccess(Metadata& meta, AccessMode mode);
static uint8_t GetFlightTelemetryAcked(const Metadata& meta); static uint8_t GetFlightTelemetryAcked(const Metadata& meta);
static void SetFlightTelemetryAcked(Metadata& meta, uint8_t val); static void SetFlightTelemetryAcked(Metadata& meta, uint8_t val);
static uint8_t GetGcsTelemetryAcked(const Metadata& meta); static uint8_t GetGcsTelemetryAcked(const Metadata& meta);
static void SetGcsTelemetryAcked(Metadata& meta, uint8_t val); static void SetGcsTelemetryAcked(Metadata& meta, uint8_t val);
static UpdateMode GetFlightTelemetryUpdateMode(const Metadata& meta); static UpdateMode GetFlightTelemetryUpdateMode(const Metadata& meta);
static void SetFlightTelemetryUpdateMode(Metadata& meta, UpdateMode val); static void SetFlightTelemetryUpdateMode(Metadata& meta, UpdateMode val);
static UpdateMode GetGcsTelemetryUpdateMode(const Metadata& meta); static UpdateMode GetGcsTelemetryUpdateMode(const Metadata& meta);
static void SetGcsTelemetryUpdateMode(Metadata& meta, UpdateMode val); static void SetGcsTelemetryUpdateMode(Metadata& meta, UpdateMode val);
public slots: public slots:
void requestUpdate(); void requestUpdate();

20
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.cpp
View File

@ -61,16 +61,16 @@ $(FIELDSINIT)
UAVObject::Metadata $(NAME)::getDefaultMetadata() UAVObject::Metadata $(NAME)::getDefaultMetadata()
{ {
UAVObject::Metadata metadata; UAVObject::Metadata metadata;
metadata.flags = metadata.flags =
$(FLIGHTACCESS) << UAVOBJ_ACCESS_SHIFT | $(FLIGHTACCESS) << UAVOBJ_ACCESS_SHIFT |
$(GCSACCESS) << UAVOBJ_GCS_ACCESS_SHIFT | $(GCSACCESS) << UAVOBJ_GCS_ACCESS_SHIFT |
$(FLIGHTTELEM_ACKED) << UAVOBJ_TELEMETRY_ACKED_SHIFT | $(FLIGHTTELEM_ACKED) << UAVOBJ_TELEMETRY_ACKED_SHIFT |
$(GCSTELEM_ACKED) << UAVOBJ_GCS_TELEMETRY_ACKED_SHIFT | $(GCSTELEM_ACKED) << UAVOBJ_GCS_TELEMETRY_ACKED_SHIFT |
$(FLIGHTTELEM_UPDATEMODE) << UAVOBJ_TELEMETRY_UPDATE_MODE_SHIFT | $(FLIGHTTELEM_UPDATEMODE) << UAVOBJ_TELEMETRY_UPDATE_MODE_SHIFT |
$(GCSTELEM_UPDATEMODE) << UAVOBJ_GCS_TELEMETRY_UPDATE_MODE_SHIFT; $(GCSTELEM_UPDATEMODE) << UAVOBJ_GCS_TELEMETRY_UPDATE_MODE_SHIFT;
metadata.flightTelemetryUpdatePeriod = $(FLIGHTTELEM_UPDATEPERIOD); metadata.flightTelemetryUpdatePeriod = $(FLIGHTTELEM_UPDATEPERIOD);
metadata.gcsTelemetryUpdatePeriod = $(GCSTELEM_UPDATEPERIOD); metadata.gcsTelemetryUpdatePeriod = $(GCSTELEM_UPDATEPERIOD);
metadata.loggingUpdatePeriod = $(LOGGING_UPDATEPERIOD); metadata.loggingUpdatePeriod = $(LOGGING_UPDATEPERIOD);
return metadata; return metadata;
} }

2
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
View File

@ -156,7 +156,7 @@ void Telemetry::updateObject(UAVObject* obj)
{ {
// Get metadata // Get metadata
UAVObject::Metadata metadata = obj->getMetadata(); UAVObject::Metadata metadata = obj->getMetadata();
UAVObject::UpdateMode updateMode = UAVObject::GetGcsTelemetryUpdateMode(metadata); UAVObject::UpdateMode updateMode = UAVObject::GetGcsTelemetryUpdateMode(metadata);
// Setup object depending on update mode // Setup object depending on update mode
qint32 eventMask; qint32 eventMask;

2
ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
View File

@ -91,7 +91,7 @@ void TelemetryMonitor::startRetrievingObjects()
} }
else else
{ {
if ( UAVObject::GetFlightTelemetryUpdateMode(mdata) == UAVObject::UPDATEMODE_ONCHANGE ) if ( UAVObject::GetFlightTelemetryUpdateMode(mdata) == UAVObject::UPDATEMODE_ONCHANGE )
{ {
queue.enqueue(obj); queue.enqueue(obj);
} }