From 54a4ac9672239bbd596f3bf25c04ce8f6fd94112 Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Sun, 7 Feb 2016 16:31:15 +0100
Subject: [PATCH] LP-207 - Fix naming, fix style

---
 flight/uavobjects/inc/uavobject.h.template | 87 +++++++++++++++-------
 1 file changed, 61 insertions(+), 26 deletions(-)

diff --git a/flight/uavobjects/inc/uavobject.h.template b/flight/uavobjects/inc/uavobject.h.template
index 46e139675..349a01c1d 100644
--- a/flight/uavobjects/inc/uavobject.h.template
+++ b/flight/uavobjects/inc/uavobject.h.template
@@ -1,20 +1,20 @@
 /**
  ******************************************************************************
  * @addtogroup UAVObjects OpenPilot UAVObjects
- * @{ 
- * @addtogroup $(NAME) $(NAME) 
+ * @{
+ * @addtogroup $(NAME) $(NAME)
  * @brief $(DESCRIPTION)
  *
  * Autogenerated files and functions for $(NAME) Object
  *
- * @{ 
+ * @{
  *
  * @file       $(NAMELC).h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010-2013.
- * @brief      Implementation of the $(NAME) object. This file has been 
+ * @brief      Implementation of the $(NAME) object. This file has been
  *             automatically generated by the UAVObjectGenerator.
- * 
- * @note       Object definition file: $(XMLFILE). 
+ *
+ * @note       Object definition file: $(XMLFILE).
  *             This is an automatically generated file.
  *             DO NOT modify manually.
  *
@@ -39,7 +39,7 @@
 
 #ifndef $(NAMEUC)_H
 #define $(NAMEUC)_H
-
+#include <stdbool.h>
 /* Object constants */
 #define $(NAMEUC)_OBJID $(OBJIDHEX)
 #define $(NAMEUC)_ISSINGLEINST $(ISSINGLEINST)
@@ -61,7 +61,8 @@ $(DATASTRUCTURES)
  * (eg a single instance on the heap)
  */
 typedef struct {
-$(DATAFIELDS)} __attribute__((packed)) $(NAME)DataPacked;
+    $(DATAFIELDS)
+} __attribute__((packed)) $(NAME)DataPacked;
 
 /*
  * Packed Object data.
@@ -69,25 +70,59 @@ $(DATAFIELDS)} __attribute__((packed)) $(NAME)DataPacked;
  * on Cortex M4F during load/store of float UAVO fields
  */
 typedef $(NAME)DataPacked __attribute__((aligned(4))) $(NAME)Data;
-    
+
 /* Typesafe Object access functions */
-static inline int32_t $(NAME)Get($(NAME)Data *dataOut) { return UAVObjGetData($(NAME)Handle(), dataOut); }
-static inline int32_t $(NAME)Set(const $(NAME)Data *dataIn) { return UAVObjSetData($(NAME)Handle(), dataIn); }
-static inline int32_t $(NAME)InstGet(uint16_t instId, $(NAME)Data *dataOut) { return UAVObjGetInstanceData($(NAME)Handle(), instId, dataOut); }
-static inline int32_t $(NAME)InstSet(uint16_t instId, const $(NAME)Data *dataIn) { return UAVObjSetInstanceData($(NAME)Handle(), instId, dataIn); }
-static inline int32_t $(NAME)ConnectQueue(xQueueHandle queue) { return UAVObjConnectQueue($(NAME)Handle(), queue, EV_MASK_ALL_UPDATES); }
-static inline int32_t $(NAME)ConnectCallback(UAVObjEventCallback cb) { return UAVObjConnectCallback($(NAME)Handle(), cb, EV_MASK_ALL_UPDATES,FALSE); }
-static inline int32_t $(NAME)ConnectCallbackFast(UAVObjEventCallback cb) { return UAVObjConnectCallback($(NAME)Handle(), cb, EV_MASK_ALL_UPDATES, TRUE); }
-static inline uint16_t $(NAME)CreateInstance() { return UAVObjCreateInstance($(NAME)Handle(), &$(NAME)SetDefaults); }
-static inline void $(NAME)RequestUpdate() { UAVObjRequestUpdate($(NAME)Handle()); }
-static inline void $(NAME)RequestInstUpdate(uint16_t instId) { UAVObjRequestInstanceUpdate($(NAME)Handle(), instId); }
-static inline void $(NAME)Updated() { UAVObjUpdated($(NAME)Handle()); }
-static inline void $(NAME)InstUpdated(uint16_t instId) { UAVObjInstanceUpdated($(NAME)Handle(), instId); }
-static inline void $(NAME)Logging() { UAVObjLogging($(NAME)Handle()); }
-static inline void $(NAME)InstLogging(uint16_t instId) { UAVObjInstanceLogging($(NAME)Handle(), instId); }
-static inline int32_t $(NAME)GetMetadata(UAVObjMetadata *dataOut) { return UAVObjGetMetadata($(NAME)Handle(), dataOut); }
-static inline int32_t $(NAME)SetMetadata(const UAVObjMetadata *dataIn) { return UAVObjSetMetadata($(NAME)Handle(), dataIn); }
-static inline int8_t $(NAME)ReadOnly() { return UAVObjReadOnly($(NAME)Handle()); }
+static inline int32_t $(NAME)Get($(NAME)Data * dataOut) {
+    return UAVObjGetData($(NAME)Handle(), dataOut);
+}
+static inline int32_t $(NAME)Set(const $(NAME)Data * dataIn) {
+    return UAVObjSetData($(NAME)Handle(), dataIn);
+}
+static inline int32_t $(NAME)InstGet(uint16_t instId, $(NAME)Data * dataOut) {
+    return UAVObjGetInstanceData($(NAME)Handle(), instId, dataOut);
+}
+static inline int32_t $(NAME)InstSet(uint16_t instId, const $(NAME)Data * dataIn) {
+    return UAVObjSetInstanceData($(NAME)Handle(), instId, dataIn);
+}
+static inline int32_t $(NAME)ConnectQueue(xQueueHandle queue) {
+    return UAVObjConnectQueue($(NAME)Handle(), queue, EV_MASK_ALL_UPDATES);
+}
+static inline int32_t $(NAME)ConnectCallback(UAVObjEventCallback cb) {
+    return UAVObjConnectCallback($(NAME)Handle(), cb, EV_MASK_ALL_UPDATES, false);
+}
+static inline int32_t $(NAME)ConnectFastCallback(UAVObjEventCallback cb) {
+    return UAVObjConnectCallback($(NAME)Handle(), cb, EV_MASK_ALL_UPDATES, true);
+}
+static inline uint16_t $(NAME)CreateInstance() {
+    return UAVObjCreateInstance($(NAME)Handle(), &$(NAME)SetDefaults);
+}
+static inline void $(NAME)RequestUpdate() {
+    UAVObjRequestUpdate($(NAME)Handle());
+}
+static inline void $(NAME)RequestInstUpdate(uint16_t instId) {
+    UAVObjRequestInstanceUpdate($(NAME)Handle(), instId);
+}
+static inline void $(NAME)Updated() {
+    UAVObjUpdated($(NAME)Handle());
+}
+static inline void $(NAME)InstUpdated(uint16_t instId) {
+    UAVObjInstanceUpdated($(NAME)Handle(), instId);
+}
+static inline void $(NAME)Logging() {
+    UAVObjLogging($(NAME)Handle());
+}
+static inline void $(NAME)InstLogging(uint16_t instId) {
+    UAVObjInstanceLogging($(NAME)Handle(), instId);
+}
+static inline int32_t $(NAME)GetMetadata(UAVObjMetadata * dataOut) {
+    return UAVObjGetMetadata($(NAME)Handle(), dataOut);
+}
+static inline int32_t $(NAME)SetMetadata(const UAVObjMetadata * dataIn) {
+    return UAVObjSetMetadata($(NAME)Handle(), dataIn);
+}
+static inline int8_t $(NAME)ReadOnly() {
+    return UAVObjReadOnly($(NAME)Handle());
+}
 
 /* Set/Get functions */
 $(SETGETFIELDSEXTERN)