From 290c9c538f57553c45d081ff6896208d899395dd Mon Sep 17 00:00:00 2001
From: osnwt <osnwt>
Date: Sat, 15 Jan 2011 17:00:17 +0000
Subject: [PATCH] Replace decimal OBJID representation in auto-generated
 headers by hexadecimal (taking advantage of new UAVObjGenerator). It makes
 easier to read and compare them with files on SD card. This does not change
 OBJID values and should be completely transparent.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2434 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/UAVObjects/inc/uavobjecttemplate.h         | 2 +-
 ground/src/plugins/uavobjects/uavobjecttemplate.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flight/UAVObjects/inc/uavobjecttemplate.h b/flight/UAVObjects/inc/uavobjecttemplate.h
index 4fa977296..5b15a5a84 100644
--- a/flight/UAVObjects/inc/uavobjecttemplate.h
+++ b/flight/UAVObjects/inc/uavobjecttemplate.h
@@ -41,7 +41,7 @@
 #define $(NAMEUC)_H
 
 // Object constants
-#define $(NAMEUC)_OBJID $(OBJID)U
+#define $(NAMEUC)_OBJID $(OBJIDHEX)
 #define $(NAMEUC)_NAME "$(NAME)"
 #define $(NAMEUC)_METANAME "$(NAME)Meta"
 #define $(NAMEUC)_ISSINGLEINST $(ISSINGLEINST)
diff --git a/ground/src/plugins/uavobjects/uavobjecttemplate.h b/ground/src/plugins/uavobjects/uavobjecttemplate.h
index 5df99c975..8149b4774 100644
--- a/ground/src/plugins/uavobjects/uavobjecttemplate.h
+++ b/ground/src/plugins/uavobjects/uavobjecttemplate.h
@@ -50,7 +50,7 @@ $(DATAFIELDS)
 $(DATAFIELDINFO)
   
     // Constants
-    static const quint32 OBJID = $(OBJID)U;
+    static const quint32 OBJID = $(OBJIDHEX);
     static const QString NAME;
     static const QString DESCRIPTION;
     static const bool ISSINGLEINST = $(ISSINGLEINST);