From 2dcc28cea398c08462602a5fdf4f2836cbf0b91d Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Fri, 29 Jun 2012 10:33:33 +0200 Subject: [PATCH] uavobjectgenerator: for consistency with flight and gcs code, change order of update modes. This is a cosmetic change, it does ot change the generated code since update modes are always identified by string, not numerically. --- ground/uavobjgenerator/generators/generator_common.cpp | 5 +++-- ground/uavobjgenerator/uavobjectparser.cpp | 2 +- ground/uavobjgenerator/uavobjectparser.h | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ground/uavobjgenerator/generators/generator_common.cpp b/ground/uavobjgenerator/generators/generator_common.cpp index 34f097e44..7814a9c05 100644 --- a/ground/uavobjgenerator/generators/generator_common.cpp +++ b/ground/uavobjgenerator/generators/generator_common.cpp @@ -37,8 +37,9 @@ void replaceCommonTags(QString& out, ObjectInfo* info) { QStringList updateModeStr,accessModeStr; - updateModeStr << "UPDATEMODE_PERIODIC" << "UPDATEMODE_ONCHANGE" - << "UPDATEMODE_THROTTLED" << "UPDATEMODE_MANUAL"; + updateModeStr << "UPDATEMODE_MANUAL" << "UPDATEMODE_PERIODIC" + << "UPDATEMODE_ONCHANGE" + << "UPDATEMODE_THROTTLED"; accessModeStr << "ACCESS_READWRITE" << "ACCESS_READONLY"; diff --git a/ground/uavobjgenerator/uavobjectparser.cpp b/ground/uavobjgenerator/uavobjectparser.cpp index a11a53e82..94fce6043 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" << "throttled" << "manual"; + updateModeStrXML << "manual" << "periodic" << "onchange" << "throttled"; accessModeStr << "ACCESS_READWRITE" << "ACCESS_READONLY"; diff --git a/ground/uavobjgenerator/uavobjectparser.h b/ground/uavobjgenerator/uavobjectparser.h index f41c3ce30..66b52ff88 100644 --- a/ground/uavobjgenerator/uavobjectparser.h +++ b/ground/uavobjgenerator/uavobjectparser.h @@ -64,10 +64,10 @@ typedef struct { * Object update mode */ typedef enum { - UPDATEMODE_PERIODIC = 0, /** Automatically update object at periodic intervals */ - UPDATEMODE_ONCHANGE, /** Only update object when its data changes */ - 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_MANUAL = 0, /** Manually update object, by calling the updated() function */ + UPDATEMODE_PERIODIC = 1, /** Automatically update object at periodic intervals */ + UPDATEMODE_ONCHANGE = 2, /** Only update object when its data changes */ + UPDATEMODE_THROTTLED = 3 /** Object is updated on change, but not more often than the interval time */ } UpdateMode;