From eb6f175af4be8c3baf149a44c9fc62c8394f955a Mon Sep 17 00:00:00 2001 From: Brian Webb Date: Sat, 21 Apr 2012 11:59:14 -0700 Subject: [PATCH] Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual). --- flight/Modules/Telemetry/telemetry.c | 30 ++++++++++--------- flight/UAVObjects/inc/uavobjectmanager.h | 2 +- .../plugins/uavobjects/tests/uavobjectstest.h | 1 + .../src/plugins/uavobjects/uavmetaobject.cpp | 14 +++------ .../src/plugins/uavobjects/uavobject.h | 1 + .../src/plugins/uavtalk/telemetry.cpp | 26 ++++++++++++---- .../src/plugins/uavtalk/telemetry.h | 1 + .../generators/generator_common.cpp | 2 +- ground/uavobjgenerator/uavobjectparser.cpp | 2 +- ground/uavobjgenerator/uavobjectparser.h | 4 +-- .../uavobjectdefinition/accessorydesired.xml | 2 +- .../uavobjectdefinition/actuatorcommand.xml | 2 +- .../uavobjectdefinition/actuatordesired.xml | 2 +- .../uavobjectdefinition/actuatorsettings.xml | 2 +- .../uavobjectdefinition/ahrscalibration.xml | 2 +- shared/uavobjectdefinition/ahrssettings.xml | 2 +- shared/uavobjectdefinition/attitudeactual.xml | 2 +- shared/uavobjectdefinition/attituderaw.xml | 2 +- .../uavobjectdefinition/attitudesettings.xml | 2 +- shared/uavobjectdefinition/baroaltitude.xml | 2 +- shared/uavobjectdefinition/cameradesired.xml | 2 +- .../camerastabsettings.xml | 2 +- shared/uavobjectdefinition/faultsettings.xml | 2 +- shared/uavobjectdefinition/firmwareiapobj.xml | 2 +- .../flightbatterysettings.xml | 2 +- .../flightbatterystate.xml | 2 +- .../uavobjectdefinition/flightplancontrol.xml | 2 +- .../flightplansettings.xml | 2 +- .../uavobjectdefinition/flightplanstatus.xml | 2 +- shared/uavobjectdefinition/flightstatus.xml | 2 +- shared/uavobjectdefinition/gcsreceiver.xml | 2 +- .../uavobjectdefinition/gcstelemetrystats.xml | 2 +- .../uavobjectdefinition/guidancesettings.xml | 2 +- shared/uavobjectdefinition/homelocation.xml | 2 +- shared/uavobjectdefinition/hwsettings.xml | 2 +- .../manualcontrolcommand.xml | 2 +- .../manualcontrolsettings.xml | 2 +- shared/uavobjectdefinition/mixersettings.xml | 2 +- shared/uavobjectdefinition/nedaccel.xml | 2 +- .../uavobjectdefinition/objectpersistence.xml | 2 +- .../uavobjectdefinition/receiveractivity.xml | 2 +- shared/uavobjectdefinition/sonaraltitude.xml | 2 +- .../stabilizationdesired.xml | 2 +- .../stabilizationsettings.xml | 2 +- shared/uavobjectdefinition/systemsettings.xml | 2 +- shared/uavobjectdefinition/txpidsettings.xml | 2 +- 46 files changed, 85 insertions(+), 70 deletions(-) diff --git a/flight/Modules/Telemetry/telemetry.c b/flight/Modules/Telemetry/telemetry.c index e4ba7f684..318aef868 100644 --- a/flight/Modules/Telemetry/telemetry.c +++ b/flight/Modules/Telemetry/telemetry.c @@ -180,7 +180,7 @@ static void updateObject(UAVObjHandle obj, int32_t eventType) // Set update period setUpdatePeriod(obj, metadata.telemetryUpdatePeriod); // Connect queue - eventMask = EV_UPDATED_MANUAL | EV_UPDATE_REQ | EV_UPDATED_PERIODIC; + eventMask = EV_UPDATED_PERIODIC | EV_UPDATED_MANUAL | EV_UPDATE_REQ; if (UAVObjIsMetaobject(obj)) { eventMask |= EV_UNPACKED; // we also need to act on remote updates (unpack events) } @@ -196,27 +196,25 @@ static void updateObject(UAVObjHandle obj, int32_t eventType) UAVObjConnectQueue(obj, priorityQueue, eventMask); } else if (updateMode == UPDATEMODE_THROTTLED) { // If we received a periodic update, we can change back to update on change - if (eventType == EV_UPDATED_PERIODIC) { + if ((eventType == EV_UPDATED_PERIODIC) || (eventType == EV_NONE)) { // Set update period setUpdatePeriod(obj, 0); // Connect queue eventMask = EV_UPDATED | EV_UPDATED_MANUAL | EV_UPDATE_REQ; - if (UAVObjIsMetaobject(obj)) { - eventMask |= EV_UNPACKED; // we also need to act on remote updates (unpack events) - } - UAVObjConnectQueue(obj, priorityQueue, eventMask); } else { // Otherwise, we just received an object update, so switch to periodic for the timeout period to prevent more updates // Set update period setUpdatePeriod(obj, metadata.telemetryUpdatePeriod); // Connect queue - eventMask = EV_UPDATED_MANUAL | EV_UPDATE_REQ | EV_UPDATED_PERIODIC; + eventMask = EV_UPDATED_PERIODIC | EV_UPDATED_MANUAL | EV_UPDATE_REQ; if (UAVObjIsMetaobject(obj)) { eventMask |= EV_UNPACKED; // we also need to act on remote updates (unpack events) } - UAVObjConnectQueue(obj, priorityQueue, eventMask); - } - UAVObjConnectQueue(obj, priorityQueue, eventMask); + } + if (UAVObjIsMetaobject(obj)) { + eventMask |= EV_UNPACKED; // we also need to act on remote updates (unpack events) + } + UAVObjConnectQueue(obj, priorityQueue, eventMask); } else if (updateMode == UPDATEMODE_MANUAL) { // Set update period setUpdatePeriod(obj, 0); @@ -247,10 +245,10 @@ static void processObjEvent(UAVObjEvent * ev) } else { // Only process event if connected to GCS or if object FlightTelemetryStats is updated FlightTelemetryStatsGet(&flightStats); + // Get object metadata + UAVObjGetMetadata(ev->obj, &metadata); + updateMode = UAVObjGetTelemetryUpdateMode(&metadata); if (flightStats.Status == FLIGHTTELEMETRYSTATS_STATUS_CONNECTED || ev->obj == FlightTelemetryStatsHandle()) { - // Get object metadata - UAVObjGetMetadata(ev->obj, &metadata); - updateMode = UAVObjGetTelemetryUpdateMode(&metadata); // Act on event retries = 0; success = -1; @@ -282,6 +280,10 @@ static void processObjEvent(UAVObjEvent * ev) updateObject(UAVObjGetLinkedObj(ev->obj), ev->event); // linked object will be the actual object the metadata are for } } + if((updateMode == UPDATEMODE_THROTTLED) && !UAVObjIsMetaobject(ev->obj)) { + // If this is UPDATEMODE_THROTTLED, the event mask changes on every event. + updateObject(ev->obj, ev->event); + } } } @@ -398,7 +400,7 @@ static int32_t addObject(UAVObjHandle obj) // Add object for periodic updates ev.obj = obj; ev.instId = UAVOBJ_ALL_INSTANCES; - ev.event = EV_UPDATED_MANUAL; + ev.event = EV_UPDATED_PERIODIC; return EventPeriodicQueueCreate(&ev, queue, 0); } diff --git a/flight/UAVObjects/inc/uavobjectmanager.h b/flight/UAVObjects/inc/uavobjectmanager.h index d32fb0d36..ff152c82d 100644 --- a/flight/UAVObjects/inc/uavobjectmanager.h +++ b/flight/UAVObjects/inc/uavobjectmanager.h @@ -104,7 +104,7 @@ typedef enum { * Helper macros for event masks */ #define EV_MASK_ALL 0 -#define EV_MASK_ALL_UPDATES (EV_UNPACKED | EV_UPDATED | EV_UPDATED_MANUAL) +#define EV_MASK_ALL_UPDATES (EV_UNPACKED | EV_UPDATED | EV_UPDATED_MANUAL | EV_UPDATED_PERIODIC) /** * Access types diff --git a/ground/openpilotgcs/src/plugins/uavobjects/tests/uavobjectstest.h b/ground/openpilotgcs/src/plugins/uavobjects/tests/uavobjectstest.h index 107bccb8f..1b5956b11 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/tests/uavobjectstest.h +++ b/ground/openpilotgcs/src/plugins/uavobjects/tests/uavobjectstest.h @@ -18,6 +18,7 @@ private slots: void objectUpdated(UAVObject* obj); void objectUpdatedAuto(UAVObject* obj); void objectUpdatedManual(UAVObject* obj); + void objectUpdatedPeriodic(UAVObject* obj); void objectUnpacked(UAVObject* obj); void updateRequested(UAVObject* obj); void runTest(); diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavmetaobject.cpp b/ground/openpilotgcs/src/plugins/uavobjects/uavmetaobject.cpp index dcaf6e3ba..bb45495f5 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavmetaobject.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavmetaobject.cpp @@ -45,16 +45,10 @@ UAVMetaObject::UAVMetaObject(quint32 objID, const QString& name, UAVObject* pare QStringList accessModeEnum; accessModeEnum << tr("Read/Write") << tr("Read Only"); QList fields; - fields.append( new UAVObjectField(tr("Flight Access Mode"), tr(""), UAVObjectField::ENUM, 1, accessModeEnum) ); - fields.append( new UAVObjectField(tr("GCS Access Mode"), tr(""), UAVObjectField::ENUM, 1, accessModeEnum) ); - fields.append( new UAVObjectField(tr("Flight Telemetry Acked"), tr(""), UAVObjectField::ENUM, 1, boolEnum) ); - fields.append( new UAVObjectField(tr("Flight Telemetry Update Mode"), tr(""), UAVObjectField::ENUM, 1, updateModeEnum) ); - fields.append( new UAVObjectField(tr("Flight Telemetry Update Period"), tr(""), UAVObjectField::UINT32, 1, QStringList()) ); - fields.append( new UAVObjectField(tr("GCS Telemetry Acked"), tr(""), UAVObjectField::ENUM, 1, boolEnum) ); - fields.append( new UAVObjectField(tr("GCS Telemetry Update Mode"), tr(""), UAVObjectField::ENUM, 1, updateModeEnum) ); - fields.append( new UAVObjectField(tr("GCS Telemetry Update Period"), tr(""), UAVObjectField::UINT32, 1, QStringList()) ); - fields.append( new UAVObjectField(tr("Logging Update Mode"), tr(""), UAVObjectField::ENUM, 1, updateModeEnum) ); - fields.append( new UAVObjectField(tr("Logging Update Period"), tr(""), UAVObjectField::UINT32, 1, QStringList()) ); + fields.append( new UAVObjectField(tr("Modes"), tr(""), UAVObjectField::UINT8, 1, accessModeEnum) ); + fields.append( new UAVObjectField(tr("Flight Telemetry Update Period"), tr(""), UAVObjectField::UINT16, 1, QStringList()) ); + fields.append( new UAVObjectField(tr("GCS Telemetry Update Period"), tr(""), UAVObjectField::UINT16, 1, QStringList()) ); + fields.append( new UAVObjectField(tr("Logging Update Period"), tr(""), UAVObjectField::UINT16, 1, QStringList()) ); // Initialize parent UAVObject::initialize(0); UAVObject::initializeFields(fields, (quint8*)&parentMetadata, sizeof(Metadata)); diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h b/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h index 6f277f6ce..62b96da02 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h @@ -148,6 +148,7 @@ signals: void objectUpdated(UAVObject* obj); void objectUpdatedAuto(UAVObject* obj); void objectUpdatedManual(UAVObject* obj); + void objectUpdatedPeriodic(UAVObject* obj); void objectUnpacked(UAVObject* obj); void updateRequested(UAVObject* obj); void transactionCompleted(UAVObject* obj, bool success); diff --git a/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp b/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp index f37b35348..5bc9afd93 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp +++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp @@ -142,6 +142,10 @@ void Telemetry::connectToObjectInstances(UAVObject* obj, quint32 eventMask) { connect(objs[n], SIGNAL(objectUpdatedManual(UAVObject*)), this, SLOT(objectUpdatedManual(UAVObject*))); } + if ( (eventMask&EV_UPDATED_PERIODIC) != 0) + { + connect(objs[n], SIGNAL(objectUpdatedPeriodic(UAVObject*)), this, SLOT(objectUpdatedPeriodic(UAVObject*))); + } if ( (eventMask&EV_UPDATE_REQ) != 0) { connect(objs[n], SIGNAL(updateRequested(UAVObject*)), this, SLOT(updateRequested(UAVObject*))); @@ -165,7 +169,7 @@ void Telemetry::updateObject(UAVObject* obj, quint32 eventType) // Set update period setUpdatePeriod(obj, metadata.gcsTelemetryUpdatePeriod); // Connect signals for all instances - eventMask = EV_UPDATED_MANUAL | EV_UPDATE_REQ; + eventMask = EV_UPDATED_MANUAL | EV_UPDATE_REQ | EV_UPDATED_PERIODIC; if( dynamic_cast(obj) != NULL ) { eventMask |= EV_UNPACKED; // we also need to act on remote updates (unpack events) @@ -187,11 +191,11 @@ void Telemetry::updateObject(UAVObject* obj, quint32 eventType) else if ( updateMode == UAVObject::UPDATEMODE_THROTTLED ) { // If we received a periodic update, we can change back to update on change - if (eventType == EV_UPDATED_PERIODIC) { + if ((eventType == EV_UPDATED_PERIODIC) || (eventType == EV_NONE)) { // Set update period setUpdatePeriod(obj, 0); // Connect signals for all instances - eventMask = EV_UPDATED | EV_UPDATED_MANUAL | EV_UPDATE_REQ; + eventMask = EV_UPDATED | EV_UPDATED_MANUAL | EV_UPDATE_REQ | EV_UPDATED_PERIODIC; if( dynamic_cast(obj) != NULL ) { eventMask |= EV_UNPACKED; // we also need to act on remote updates (unpack events) @@ -403,7 +407,9 @@ void Telemetry::processObjectQueue() } // Setup transaction (skip if unpack event) - if ( objInfo.event != EV_UNPACKED ) + UAVObject::Metadata metadata = objInfo.obj->getMetadata(); + UAVObject::UpdateMode updateMode = UAVObject::GetGcsTelemetryUpdateMode(metadata); + if ( ( objInfo.event != EV_UNPACKED ) && ( ( objInfo.event != EV_UPDATED_PERIODIC ) || ( updateMode != UAVObject::UPDATEMODE_THROTTLED ) ) ) { UAVObject::Metadata metadata = objInfo.obj->getMetadata(); transInfo.obj = objInfo.obj; @@ -432,6 +438,10 @@ void Telemetry::processObjectQueue() { updateObject( metaobj->getParentObject(), objInfo.event ); } + else if ( updateMode != UAVObject::UPDATEMODE_THROTTLED ) + { + updateObject( objInfo.obj, objInfo.event ); + } // The fact we received an unpacked event does not mean that // we do not have additional objects still in the queue, @@ -475,7 +485,7 @@ void Telemetry::processPeriodicUpdates() objinfo->timeToNextUpdateMs = objinfo->updatePeriodMs - offset; // Send object time.start(); - processObjectUpdates(objinfo->obj, EV_UPDATED_MANUAL, true, false); + processObjectUpdates(objinfo->obj, EV_UPDATED_PERIODIC, true, false); elapsedMs = time.elapsed(); // Update timeToNextUpdateMs with the elapsed delay of sending the object; timeToNextUpdateMs += elapsedMs; @@ -544,6 +554,12 @@ void Telemetry::objectUpdatedManual(UAVObject* obj) processObjectUpdates(obj, EV_UPDATED_MANUAL, false, true); } +void Telemetry::objectUpdatedPeriodic(UAVObject* obj) +{ + QMutexLocker locker(mutex); + processObjectUpdates(obj, EV_UPDATED_PERIODIC, false, true); +} + void Telemetry::objectUnpacked(UAVObject* obj) { QMutexLocker locker(mutex); diff --git a/ground/openpilotgcs/src/plugins/uavtalk/telemetry.h b/ground/openpilotgcs/src/plugins/uavtalk/telemetry.h index 54fdc3cea..f703f636b 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/telemetry.h +++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetry.h @@ -63,6 +63,7 @@ signals: private slots: void objectUpdatedAuto(UAVObject* obj); void objectUpdatedManual(UAVObject* obj); + void objectUpdatedPeriodic(UAVObject* obj); void objectUnpacked(UAVObject* obj); void updateRequested(UAVObject* obj); void newObject(UAVObject* obj); diff --git a/ground/uavobjgenerator/generators/generator_common.cpp b/ground/uavobjgenerator/generators/generator_common.cpp index cd67b0899..34f097e44 100644 --- a/ground/uavobjgenerator/generators/generator_common.cpp +++ b/ground/uavobjgenerator/generators/generator_common.cpp @@ -38,7 +38,7 @@ void replaceCommonTags(QString& out, ObjectInfo* info) QStringList updateModeStr,accessModeStr; updateModeStr << "UPDATEMODE_PERIODIC" << "UPDATEMODE_ONCHANGE" - << "UPDATEMODE_MANUAL" << "UPDATEMODE_NEVER"; + << "UPDATEMODE_THROTTLED" << "UPDATEMODE_MANUAL"; accessModeStr << "ACCESS_READWRITE" << "ACCESS_READONLY"; diff --git a/ground/uavobjgenerator/uavobjectparser.cpp b/ground/uavobjgenerator/uavobjectparser.cpp index a0409f06f..29f71934c 100644 --- a/ground/uavobjgenerator/uavobjectparser.cpp +++ b/ground/uavobjgenerator/uavobjectparser.cpp @@ -34,7 +34,7 @@ UAVObjectParser::UAVObjectParser() fieldTypeStrXML << "int8" << "int16" << "int32" << "uint8" << "uint16" << "uint32" <<"float" << "enum"; - updateModeStrXML << "periodic" << "onchange" << "manual" << "never"; + updateModeStrXML << "periodic" << "onchange" << "throttled" << "manual"; accessModeStr << "ACCESS_READWRITE" << "ACCESS_READONLY"; diff --git a/ground/uavobjgenerator/uavobjectparser.h b/ground/uavobjgenerator/uavobjectparser.h index f1e93d8f5..f41c3ce30 100644 --- a/ground/uavobjgenerator/uavobjectparser.h +++ b/ground/uavobjgenerator/uavobjectparser.h @@ -66,8 +66,8 @@ typedef struct { typedef enum { UPDATEMODE_PERIODIC = 0, /** Automatically update object at periodic intervals */ UPDATEMODE_ONCHANGE, /** Only update object when its data changes */ - UPDATEMODE_MANUAL, /** Manually update object, by calling the updated() function */ - UPDATEMODE_NEVER /** Object is never updated */ + UPDATEMODE_THROTTLED, /** Object is updated on change, but not more often than the interval time */ + UPDATEMODE_MANUAL /** Manually update object, by calling the updated() function */ } UpdateMode; diff --git a/shared/uavobjectdefinition/accessorydesired.xml b/shared/uavobjectdefinition/accessorydesired.xml index d0a7b0ed8..dbeb583d9 100644 --- a/shared/uavobjectdefinition/accessorydesired.xml +++ b/shared/uavobjectdefinition/accessorydesired.xml @@ -5,6 +5,6 @@ - + diff --git a/shared/uavobjectdefinition/actuatorcommand.xml b/shared/uavobjectdefinition/actuatorcommand.xml index c0b65bbbc..a28b70df4 100644 --- a/shared/uavobjectdefinition/actuatorcommand.xml +++ b/shared/uavobjectdefinition/actuatorcommand.xml @@ -8,6 +8,6 @@ - + diff --git a/shared/uavobjectdefinition/actuatordesired.xml b/shared/uavobjectdefinition/actuatordesired.xml index f3ad47654..5b7b2f80e 100644 --- a/shared/uavobjectdefinition/actuatordesired.xml +++ b/shared/uavobjectdefinition/actuatordesired.xml @@ -10,6 +10,6 @@ - + diff --git a/shared/uavobjectdefinition/actuatorsettings.xml b/shared/uavobjectdefinition/actuatorsettings.xml index dd64dad15..66ae5d05c 100644 --- a/shared/uavobjectdefinition/actuatorsettings.xml +++ b/shared/uavobjectdefinition/actuatorsettings.xml @@ -30,6 +30,6 @@ - + diff --git a/shared/uavobjectdefinition/ahrscalibration.xml b/shared/uavobjectdefinition/ahrscalibration.xml index b56f86985..726b25f8b 100644 --- a/shared/uavobjectdefinition/ahrscalibration.xml +++ b/shared/uavobjectdefinition/ahrscalibration.xml @@ -18,6 +18,6 @@ - + diff --git a/shared/uavobjectdefinition/ahrssettings.xml b/shared/uavobjectdefinition/ahrssettings.xml index d5756cde8..4c98d050d 100644 --- a/shared/uavobjectdefinition/ahrssettings.xml +++ b/shared/uavobjectdefinition/ahrssettings.xml @@ -11,6 +11,6 @@ - + diff --git a/shared/uavobjectdefinition/attitudeactual.xml b/shared/uavobjectdefinition/attitudeactual.xml index 6db0e06b2..2d1d66a32 100644 --- a/shared/uavobjectdefinition/attitudeactual.xml +++ b/shared/uavobjectdefinition/attitudeactual.xml @@ -11,6 +11,6 @@ - + diff --git a/shared/uavobjectdefinition/attituderaw.xml b/shared/uavobjectdefinition/attituderaw.xml index 8a2a69ab7..9138d53d9 100644 --- a/shared/uavobjectdefinition/attituderaw.xml +++ b/shared/uavobjectdefinition/attituderaw.xml @@ -8,6 +8,6 @@ - + diff --git a/shared/uavobjectdefinition/attitudesettings.xml b/shared/uavobjectdefinition/attitudesettings.xml index e60c2454b..ca0ba9dc5 100644 --- a/shared/uavobjectdefinition/attitudesettings.xml +++ b/shared/uavobjectdefinition/attitudesettings.xml @@ -14,6 +14,6 @@ - + diff --git a/shared/uavobjectdefinition/baroaltitude.xml b/shared/uavobjectdefinition/baroaltitude.xml index aeabfc68c..8335b56dd 100644 --- a/shared/uavobjectdefinition/baroaltitude.xml +++ b/shared/uavobjectdefinition/baroaltitude.xml @@ -7,6 +7,6 @@ - + diff --git a/shared/uavobjectdefinition/cameradesired.xml b/shared/uavobjectdefinition/cameradesired.xml index 022728f7e..7d9cdbe64 100644 --- a/shared/uavobjectdefinition/cameradesired.xml +++ b/shared/uavobjectdefinition/cameradesired.xml @@ -7,6 +7,6 @@ - + diff --git a/shared/uavobjectdefinition/camerastabsettings.xml b/shared/uavobjectdefinition/camerastabsettings.xml index 069abdeb3..d6956c9fa 100644 --- a/shared/uavobjectdefinition/camerastabsettings.xml +++ b/shared/uavobjectdefinition/camerastabsettings.xml @@ -11,6 +11,6 @@ - + diff --git a/shared/uavobjectdefinition/faultsettings.xml b/shared/uavobjectdefinition/faultsettings.xml index 8d02f0d78..6750c4f99 100644 --- a/shared/uavobjectdefinition/faultsettings.xml +++ b/shared/uavobjectdefinition/faultsettings.xml @@ -7,6 +7,6 @@ - + diff --git a/shared/uavobjectdefinition/firmwareiapobj.xml b/shared/uavobjectdefinition/firmwareiapobj.xml index 51438395e..30b070857 100644 --- a/shared/uavobjectdefinition/firmwareiapobj.xml +++ b/shared/uavobjectdefinition/firmwareiapobj.xml @@ -11,7 +11,7 @@ - + diff --git a/shared/uavobjectdefinition/flightbatterysettings.xml b/shared/uavobjectdefinition/flightbatterysettings.xml index a7f796ea0..c95e7e817 100644 --- a/shared/uavobjectdefinition/flightbatterysettings.xml +++ b/shared/uavobjectdefinition/flightbatterysettings.xml @@ -14,6 +14,6 @@ - + diff --git a/shared/uavobjectdefinition/flightbatterystate.xml b/shared/uavobjectdefinition/flightbatterystate.xml index bc5310b8b..5cefbdd86 100644 --- a/shared/uavobjectdefinition/flightbatterystate.xml +++ b/shared/uavobjectdefinition/flightbatterystate.xml @@ -10,6 +10,6 @@ - + diff --git a/shared/uavobjectdefinition/flightplancontrol.xml b/shared/uavobjectdefinition/flightplancontrol.xml index bc9dbdfa6..f4412f74a 100644 --- a/shared/uavobjectdefinition/flightplancontrol.xml +++ b/shared/uavobjectdefinition/flightplancontrol.xml @@ -5,6 +5,6 @@ - + diff --git a/shared/uavobjectdefinition/flightplansettings.xml b/shared/uavobjectdefinition/flightplansettings.xml index d4c16ec7f..cd1464e8d 100644 --- a/shared/uavobjectdefinition/flightplansettings.xml +++ b/shared/uavobjectdefinition/flightplansettings.xml @@ -5,6 +5,6 @@ - + diff --git a/shared/uavobjectdefinition/flightplanstatus.xml b/shared/uavobjectdefinition/flightplanstatus.xml index fcf086d26..b5667de30 100644 --- a/shared/uavobjectdefinition/flightplanstatus.xml +++ b/shared/uavobjectdefinition/flightplanstatus.xml @@ -9,6 +9,6 @@ - + diff --git a/shared/uavobjectdefinition/flightstatus.xml b/shared/uavobjectdefinition/flightstatus.xml index 849e458d6..e3c0593f8 100644 --- a/shared/uavobjectdefinition/flightstatus.xml +++ b/shared/uavobjectdefinition/flightstatus.xml @@ -9,6 +9,6 @@ - + diff --git a/shared/uavobjectdefinition/gcsreceiver.xml b/shared/uavobjectdefinition/gcsreceiver.xml index 3f6b8eaef..ddf514087 100644 --- a/shared/uavobjectdefinition/gcsreceiver.xml +++ b/shared/uavobjectdefinition/gcsreceiver.xml @@ -5,6 +5,6 @@ - + diff --git a/shared/uavobjectdefinition/gcstelemetrystats.xml b/shared/uavobjectdefinition/gcstelemetrystats.xml index 3f9c74b1b..3971cffba 100644 --- a/shared/uavobjectdefinition/gcstelemetrystats.xml +++ b/shared/uavobjectdefinition/gcstelemetrystats.xml @@ -10,6 +10,6 @@ - + diff --git a/shared/uavobjectdefinition/guidancesettings.xml b/shared/uavobjectdefinition/guidancesettings.xml index 5d83f92e5..56149204a 100644 --- a/shared/uavobjectdefinition/guidancesettings.xml +++ b/shared/uavobjectdefinition/guidancesettings.xml @@ -14,6 +14,6 @@ - + diff --git a/shared/uavobjectdefinition/homelocation.xml b/shared/uavobjectdefinition/homelocation.xml index c1ed6a5b8..893af7e30 100644 --- a/shared/uavobjectdefinition/homelocation.xml +++ b/shared/uavobjectdefinition/homelocation.xml @@ -12,6 +12,6 @@ - + diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml index 1327c8d69..592b04861 100644 --- a/shared/uavobjectdefinition/hwsettings.xml +++ b/shared/uavobjectdefinition/hwsettings.xml @@ -22,6 +22,6 @@ - + diff --git a/shared/uavobjectdefinition/manualcontrolcommand.xml b/shared/uavobjectdefinition/manualcontrolcommand.xml index d8dba78d6..00b5f0a12 100644 --- a/shared/uavobjectdefinition/manualcontrolcommand.xml +++ b/shared/uavobjectdefinition/manualcontrolcommand.xml @@ -11,6 +11,6 @@ - + diff --git a/shared/uavobjectdefinition/manualcontrolsettings.xml b/shared/uavobjectdefinition/manualcontrolsettings.xml index 14a92a6cb..617f7ac75 100644 --- a/shared/uavobjectdefinition/manualcontrolsettings.xml +++ b/shared/uavobjectdefinition/manualcontrolsettings.xml @@ -29,6 +29,6 @@ - + diff --git a/shared/uavobjectdefinition/mixersettings.xml b/shared/uavobjectdefinition/mixersettings.xml index e2df02ce0..6e0d519f1 100644 --- a/shared/uavobjectdefinition/mixersettings.xml +++ b/shared/uavobjectdefinition/mixersettings.xml @@ -31,6 +31,6 @@ - + diff --git a/shared/uavobjectdefinition/nedaccel.xml b/shared/uavobjectdefinition/nedaccel.xml index 83da85e7e..9e278671f 100644 --- a/shared/uavobjectdefinition/nedaccel.xml +++ b/shared/uavobjectdefinition/nedaccel.xml @@ -7,6 +7,6 @@ - + diff --git a/shared/uavobjectdefinition/objectpersistence.xml b/shared/uavobjectdefinition/objectpersistence.xml index aa7a58e8c..afeb2ff24 100644 --- a/shared/uavobjectdefinition/objectpersistence.xml +++ b/shared/uavobjectdefinition/objectpersistence.xml @@ -8,6 +8,6 @@ - + diff --git a/shared/uavobjectdefinition/receiveractivity.xml b/shared/uavobjectdefinition/receiveractivity.xml index c2a741d7f..8e30e0889 100644 --- a/shared/uavobjectdefinition/receiveractivity.xml +++ b/shared/uavobjectdefinition/receiveractivity.xml @@ -9,6 +9,6 @@ - + diff --git a/shared/uavobjectdefinition/sonaraltitude.xml b/shared/uavobjectdefinition/sonaraltitude.xml index 9c52bda24..98b678413 100644 --- a/shared/uavobjectdefinition/sonaraltitude.xml +++ b/shared/uavobjectdefinition/sonaraltitude.xml @@ -5,6 +5,6 @@ - + diff --git a/shared/uavobjectdefinition/stabilizationdesired.xml b/shared/uavobjectdefinition/stabilizationdesired.xml index c1e013be3..21138c2e3 100644 --- a/shared/uavobjectdefinition/stabilizationdesired.xml +++ b/shared/uavobjectdefinition/stabilizationdesired.xml @@ -10,6 +10,6 @@ - + diff --git a/shared/uavobjectdefinition/stabilizationsettings.xml b/shared/uavobjectdefinition/stabilizationsettings.xml index 29c9d8116..de1c92daa 100644 --- a/shared/uavobjectdefinition/stabilizationsettings.xml +++ b/shared/uavobjectdefinition/stabilizationsettings.xml @@ -27,6 +27,6 @@ - + diff --git a/shared/uavobjectdefinition/systemsettings.xml b/shared/uavobjectdefinition/systemsettings.xml index ec092df8e..249c2336d 100644 --- a/shared/uavobjectdefinition/systemsettings.xml +++ b/shared/uavobjectdefinition/systemsettings.xml @@ -6,6 +6,6 @@ - + diff --git a/shared/uavobjectdefinition/txpidsettings.xml b/shared/uavobjectdefinition/txpidsettings.xml index 876ffccc7..bdc05ba33 100644 --- a/shared/uavobjectdefinition/txpidsettings.xml +++ b/shared/uavobjectdefinition/txpidsettings.xml @@ -24,6 +24,6 @@ - +