From ed48dc25de0c979070e1052b711e3011f8b1a178 Mon Sep 17 00:00:00 2001 From: vassilis Date: Sat, 17 Apr 2010 22:28:50 +0000 Subject: [PATCH] GCS Updated gpsobject XML file (made it a single instance - less protocol overhead) git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@518 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/plugins/uavobjects/gpsobject.cpp | 6 +++--- ground/src/plugins/uavobjects/gpsobject.h | 2 +- .../src/shared/uavobjectdefinition/gpsobject.xml | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ground/src/plugins/uavobjects/gpsobject.cpp b/ground/src/plugins/uavobjects/gpsobject.cpp index a23965b6f..042454a9d 100644 --- a/ground/src/plugins/uavobjects/gpsobject.cpp +++ b/ground/src/plugins/uavobjects/gpsobject.cpp @@ -50,13 +50,13 @@ UAVObject::Metadata GpsObject::getDefaultMetadata() { UAVObject::Metadata metadata; metadata.gcsTelemetryAcked = 1; - metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_ONCHANGE; + metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_NEVER; metadata.gcsTelemetryUpdatePeriod = 0; metadata.flightTelemetryAcked = 1; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdatePeriod = 1000; - metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; - metadata.loggingUpdatePeriod = 0; + metadata.loggingUpdateMode = UAVObject::UPDATEMODE_PERIODIC; + metadata.loggingUpdatePeriod = 1000; return metadata; } diff --git a/ground/src/plugins/uavobjects/gpsobject.h b/ground/src/plugins/uavobjects/gpsobject.h index 2261ab0bc..7facb65c0 100644 --- a/ground/src/plugins/uavobjects/gpsobject.h +++ b/ground/src/plugins/uavobjects/gpsobject.h @@ -53,7 +53,7 @@ public: // Constants static const quint32 OBJID = 4042402288U; static const QString NAME; - static const bool ISSINGLEINST = 0; + static const bool ISSINGLEINST = 1; static const bool ISSETTINGS = 0; static const quint32 NUMBYTES = sizeof(DataFields); diff --git a/ground/src/shared/uavobjectdefinition/gpsobject.xml b/ground/src/shared/uavobjectdefinition/gpsobject.xml index 2345331c8..d10c5d5c2 100644 --- a/ground/src/shared/uavobjectdefinition/gpsobject.xml +++ b/ground/src/shared/uavobjectdefinition/gpsobject.xml @@ -1,11 +1,11 @@ - - - - - - - - + + + + + + + +