diff --git a/ground/src/plugins/uavobjects/actuatorcommand.cpp b/ground/src/plugins/uavobjects/actuatorcommand.cpp index b09d970d3..fbe023ab2 100644 --- a/ground/src/plugins/uavobjects/actuatorcommand.cpp +++ b/ground/src/plugins/uavobjects/actuatorcommand.cpp @@ -65,10 +65,10 @@ UAVObject::Metadata ActuatorCommand::getDefaultMetadata() UAVObject::Metadata metadata; metadata.flightAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE; - metadata.gcsTelemetryAcked = 1; + metadata.gcsTelemetryAcked = 0; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdatePeriod = 0; - metadata.flightTelemetryAcked = 1; + metadata.flightTelemetryAcked = 0; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdatePeriod = 1000; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; diff --git a/ground/src/plugins/uavobjects/actuatordesired.cpp b/ground/src/plugins/uavobjects/actuatordesired.cpp index 69ab26d3a..5c073f375 100644 --- a/ground/src/plugins/uavobjects/actuatordesired.cpp +++ b/ground/src/plugins/uavobjects/actuatordesired.cpp @@ -67,10 +67,10 @@ UAVObject::Metadata ActuatorDesired::getDefaultMetadata() UAVObject::Metadata metadata; metadata.flightAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE; - metadata.gcsTelemetryAcked = 1; + metadata.gcsTelemetryAcked = 0; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdatePeriod = 0; - metadata.flightTelemetryAcked = 1; + metadata.flightTelemetryAcked = 0; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdatePeriod = 1000; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; diff --git a/ground/src/plugins/uavobjects/altitudeactual.cpp b/ground/src/plugins/uavobjects/altitudeactual.cpp index a0c167651..579b18e08 100644 --- a/ground/src/plugins/uavobjects/altitudeactual.cpp +++ b/ground/src/plugins/uavobjects/altitudeactual.cpp @@ -64,10 +64,10 @@ UAVObject::Metadata AltitudeActual::getDefaultMetadata() UAVObject::Metadata metadata; metadata.flightAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE; - metadata.gcsTelemetryAcked = 1; + metadata.gcsTelemetryAcked = 0; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdatePeriod = 0; - metadata.flightTelemetryAcked = 1; + metadata.flightTelemetryAcked = 0; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdatePeriod = 1000; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; diff --git a/ground/src/plugins/uavobjects/exampleobject1.cpp b/ground/src/plugins/uavobjects/exampleobject1.cpp index 17b789908..6fc20c779 100644 --- a/ground/src/plugins/uavobjects/exampleobject1.cpp +++ b/ground/src/plugins/uavobjects/exampleobject1.cpp @@ -87,7 +87,7 @@ UAVObject::Metadata ExampleObject1::getDefaultMetadata() metadata.gcsAccess = ACCESS_READWRITE; metadata.gcsTelemetryAcked = 1; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; - metadata.gcsTelemetryUpdatePeriod = 200; + metadata.gcsTelemetryUpdatePeriod = 500; metadata.flightTelemetryAcked = 1; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_ONCHANGE; metadata.flightTelemetryUpdatePeriod = 0; diff --git a/ground/src/plugins/uavobjects/exampleobject2.cpp b/ground/src/plugins/uavobjects/exampleobject2.cpp index 4176162ba..bc877c596 100644 --- a/ground/src/plugins/uavobjects/exampleobject2.cpp +++ b/ground/src/plugins/uavobjects/exampleobject2.cpp @@ -75,7 +75,7 @@ UAVObject::Metadata ExampleObject2::getDefaultMetadata() metadata.gcsTelemetryUpdatePeriod = 0; metadata.flightTelemetryAcked = 1; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; - metadata.flightTelemetryUpdatePeriod = 100; + metadata.flightTelemetryUpdatePeriod = 500; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; metadata.loggingUpdatePeriod = 0; return metadata; diff --git a/ground/src/plugins/uavobjects/gpsobject.cpp b/ground/src/plugins/uavobjects/gpsobject.cpp index 493cadba4..5e02be12d 100644 --- a/ground/src/plugins/uavobjects/gpsobject.cpp +++ b/ground/src/plugins/uavobjects/gpsobject.cpp @@ -49,6 +49,12 @@ GpsObject::GpsObject(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS, NAME) QStringList AltitudeElemNames; AltitudeElemNames.append("0"); fields.append( new UAVObjectField(QString("Altitude"), QString("meters"), UAVObjectField::FLOAT32, AltitudeElemNames, QStringList()) ); + QStringList HeadingElemNames; + HeadingElemNames.append("0"); + fields.append( new UAVObjectField(QString("Heading"), QString("degrees"), UAVObjectField::FLOAT32, HeadingElemNames, QStringList()) ); + QStringList GroundSpeedElemNames; + GroundSpeedElemNames.append("0"); + fields.append( new UAVObjectField(QString("GroundSpeed"), QString("m/s"), UAVObjectField::FLOAT32, GroundSpeedElemNames, QStringList()) ); QStringList SatellitesElemNames; SatellitesElemNames.append("0"); fields.append( new UAVObjectField(QString("Satellites"), QString(""), UAVObjectField::INT8, SatellitesElemNames, QStringList()) ); @@ -82,10 +88,10 @@ UAVObject::Metadata GpsObject::getDefaultMetadata() UAVObject::Metadata metadata; metadata.flightAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE; - metadata.gcsTelemetryAcked = 1; + metadata.gcsTelemetryAcked = 0; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdatePeriod = 0; - metadata.flightTelemetryAcked = 1; + metadata.flightTelemetryAcked = 0; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdatePeriod = 1000; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_PERIODIC; diff --git a/ground/src/plugins/uavobjects/gpsobject.h b/ground/src/plugins/uavobjects/gpsobject.h index c1ba2d4c3..a04003a77 100644 --- a/ground/src/plugins/uavobjects/gpsobject.h +++ b/ground/src/plugins/uavobjects/gpsobject.h @@ -44,6 +44,8 @@ public: float Latitude; float Longitude; float Altitude; + float Heading; + float GroundSpeed; qint8 Satellites; quint16 Updates; quint16 Failures; @@ -57,6 +59,8 @@ public: // Field Latitude information // Field Longitude information // Field Altitude information + // Field Heading information + // Field GroundSpeed information // Field Satellites information // Field Updates information // Field Failures information @@ -66,7 +70,7 @@ public: // Constants - static const quint32 OBJID = 2363300180U; + static const quint32 OBJID = 3887395742U; static const QString NAME; static const bool ISSINGLEINST = 1; static const bool ISSETTINGS = 0; diff --git a/ground/src/plugins/uavobjects/gpsobject.py b/ground/src/plugins/uavobjects/gpsobject.py index bcd0305c5..7f5b3207f 100644 --- a/ground/src/plugins/uavobjects/gpsobject.py +++ b/ground/src/plugins/uavobjects/gpsobject.py @@ -67,6 +67,26 @@ _fields = [ \ { } ), + uavobject.UAVObjectField( + 'Heading', + 'f', + 1, + [ + '0', + ], + { + } + ), + uavobject.UAVObjectField( + 'GroundSpeed', + 'f', + 1, + [ + '0', + ], + { + } + ), uavobject.UAVObjectField( 'Satellites', 'b', @@ -132,7 +152,7 @@ _fields = [ \ class GpsObject(uavobject.UAVObject): ## Object constants - OBJID = 2363300180 + OBJID = 3887395742 NAME = "GpsObject" METANAME = "GpsObjectMeta" ISSINGLEINST = 1 diff --git a/ground/src/plugins/uavobjects/manualcontrolcommand.cpp b/ground/src/plugins/uavobjects/manualcontrolcommand.cpp index a5b6e6336..6fd158f64 100644 --- a/ground/src/plugins/uavobjects/manualcontrolcommand.cpp +++ b/ground/src/plugins/uavobjects/manualcontrolcommand.cpp @@ -90,12 +90,12 @@ UAVObject::Metadata ManualControlCommand::getDefaultMetadata() UAVObject::Metadata metadata; metadata.flightAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE; - metadata.gcsTelemetryAcked = 1; + metadata.gcsTelemetryAcked = 0; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdatePeriod = 0; - metadata.flightTelemetryAcked = 1; + metadata.flightTelemetryAcked = 0; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; - metadata.flightTelemetryUpdatePeriod = 3000; + metadata.flightTelemetryUpdatePeriod = 2000; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; metadata.loggingUpdatePeriod = 0; return metadata; diff --git a/ground/src/plugins/uavobjects/systemstats.cpp b/ground/src/plugins/uavobjects/systemstats.cpp index f99e793ba..a4e683cf0 100644 --- a/ground/src/plugins/uavobjects/systemstats.cpp +++ b/ground/src/plugins/uavobjects/systemstats.cpp @@ -64,10 +64,10 @@ UAVObject::Metadata SystemStats::getDefaultMetadata() UAVObject::Metadata metadata; metadata.flightAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE; - metadata.gcsTelemetryAcked = 1; + metadata.gcsTelemetryAcked = 0; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdatePeriod = 0; - metadata.flightTelemetryAcked = 1; + metadata.flightTelemetryAcked = 0; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdatePeriod = 1000; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_PERIODIC; diff --git a/ground/src/shared/uavobjectdefinition/actuatorcommand.xml b/ground/src/shared/uavobjectdefinition/actuatorcommand.xml index d1f1d9a90..1b74ee8d3 100644 --- a/ground/src/shared/uavobjectdefinition/actuatorcommand.xml +++ b/ground/src/shared/uavobjectdefinition/actuatorcommand.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ground/src/shared/uavobjectdefinition/actuatordesired.xml b/ground/src/shared/uavobjectdefinition/actuatordesired.xml index 8ebf1c273..181dc8c5f 100644 --- a/ground/src/shared/uavobjectdefinition/actuatordesired.xml +++ b/ground/src/shared/uavobjectdefinition/actuatordesired.xml @@ -5,8 +5,8 @@ - - + + diff --git a/ground/src/shared/uavobjectdefinition/altitudeactual.xml b/ground/src/shared/uavobjectdefinition/altitudeactual.xml index c318fc184..020ffe168 100644 --- a/ground/src/shared/uavobjectdefinition/altitudeactual.xml +++ b/ground/src/shared/uavobjectdefinition/altitudeactual.xml @@ -4,8 +4,8 @@ - - + + diff --git a/ground/src/shared/uavobjectdefinition/attitudedesired.xml b/ground/src/shared/uavobjectdefinition/attitudedesired.xml index 6c829e775..d75103ffe 100644 --- a/ground/src/shared/uavobjectdefinition/attitudedesired.xml +++ b/ground/src/shared/uavobjectdefinition/attitudedesired.xml @@ -5,8 +5,8 @@ - - + + diff --git a/ground/src/shared/uavobjectdefinition/exampleobject1.xml b/ground/src/shared/uavobjectdefinition/exampleobject1.xml index 489aaab45..68f04098a 100644 --- a/ground/src/shared/uavobjectdefinition/exampleobject1.xml +++ b/ground/src/shared/uavobjectdefinition/exampleobject1.xml @@ -9,7 +9,7 @@ - + diff --git a/ground/src/shared/uavobjectdefinition/exampleobject2.xml b/ground/src/shared/uavobjectdefinition/exampleobject2.xml index 64824e54e..3b77d1e5f 100644 --- a/ground/src/shared/uavobjectdefinition/exampleobject2.xml +++ b/ground/src/shared/uavobjectdefinition/exampleobject2.xml @@ -6,7 +6,7 @@ - + diff --git a/ground/src/shared/uavobjectdefinition/gpsobject.xml b/ground/src/shared/uavobjectdefinition/gpsobject.xml index 5d33c0725..04cca77a4 100644 --- a/ground/src/shared/uavobjectdefinition/gpsobject.xml +++ b/ground/src/shared/uavobjectdefinition/gpsobject.xml @@ -3,6 +3,8 @@ + + @@ -10,8 +12,8 @@ - - + + diff --git a/ground/src/shared/uavobjectdefinition/manualcontrolcommand.xml b/ground/src/shared/uavobjectdefinition/manualcontrolcommand.xml index 613a25fae..7f1362f72 100644 --- a/ground/src/shared/uavobjectdefinition/manualcontrolcommand.xml +++ b/ground/src/shared/uavobjectdefinition/manualcontrolcommand.xml @@ -8,8 +8,8 @@ - - + + diff --git a/ground/src/shared/uavobjectdefinition/systemstats.xml b/ground/src/shared/uavobjectdefinition/systemstats.xml index 1bd5fee6a..1beb49674 100644 --- a/ground/src/shared/uavobjectdefinition/systemstats.xml +++ b/ground/src/shared/uavobjectdefinition/systemstats.xml @@ -4,8 +4,8 @@ - - + +