From a0cd71abe671eddda309cb76f610cbaf7da4deeb Mon Sep 17 00:00:00 2001
From: Corvus Corax <corvuscorax@cybertrench.com>
Date: Wed, 30 Nov 2011 08:18:23 +0100
Subject: [PATCH] UAVObjects ; Modules/ManualControl: Fixed metadata interface
 and segfault when retrieving it

---
 flight/Modules/Actuator/actuator.c           | 2 +-
 flight/Modules/ManualControl/manualcontrol.c | 8 ++++----
 flight/UAVObjects/inc/uavobjecttemplate.h    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flight/Modules/Actuator/actuator.c b/flight/Modules/Actuator/actuator.c
index f50848ddc..9cc856487 100644
--- a/flight/Modules/Actuator/actuator.c
+++ b/flight/Modules/Actuator/actuator.c
@@ -207,7 +207,7 @@ static void actuatorTask(void* parameters)
 				nMixers ++;
 			}
 		}
-		if((nMixers < 2) && !ActuatorCommandReadOnly(dummy)) //Nothing can fly with less than two mixers.
+		if((nMixers < 2) && !ActuatorCommandReadOnly()) //Nothing can fly with less than two mixers.
 		{
 			setFailsafe(); // So that channels like PWM buzzer keep working
 			continue;
diff --git a/flight/Modules/ManualControl/manualcontrol.c b/flight/Modules/ManualControl/manualcontrol.c
index db98283df..19b99148c 100644
--- a/flight/Modules/ManualControl/manualcontrol.c
+++ b/flight/Modules/ManualControl/manualcontrol.c
@@ -189,19 +189,19 @@ static void manualControlTask(void *parameters)
 			lastActivityTime = lastSysTime;
 		}
 
-		if (ManualControlCommandReadOnly(&cmd)) {
+		if (ManualControlCommandReadOnly()) {
 			FlightTelemetryStatsData flightTelemStats;
 			FlightTelemetryStatsGet(&flightTelemStats);
 			if(flightTelemStats.Status != FLIGHTTELEMETRYSTATS_STATUS_CONNECTED) {
 				/* trying to fly via GCS and lost connection.  fall back to transmitter */
 				UAVObjMetadata metadata;
-				UAVObjGetMetadata(&cmd, &metadata);
+				ManualControlCommandGetMetadata(&metadata);
 				metadata.access = ACCESS_READWRITE;
-				UAVObjSetMetadata(&cmd, &metadata);
+				ManualControlCommandSetMetadata(&metadata);
 			}
 		}
 
-		if (!ManualControlCommandReadOnly(&cmd)) {
+		if (!ManualControlCommandReadOnly()) {
 
 			bool valid_input_detected = true;
 			
diff --git a/flight/UAVObjects/inc/uavobjecttemplate.h b/flight/UAVObjects/inc/uavobjecttemplate.h
index 9564d05d2..f106dd8ba 100644
--- a/flight/UAVObjects/inc/uavobjecttemplate.h
+++ b/flight/UAVObjects/inc/uavobjecttemplate.h
@@ -67,7 +67,7 @@
 #define $(NAME)InstUpdated(instId) UAVObjUpdated($(NAME)Handle(), instId)
 #define $(NAME)GetMetadata(dataOut) UAVObjGetMetadata($(NAME)Handle(), dataOut)
 #define $(NAME)SetMetadata(dataIn) UAVObjSetMetadata($(NAME)Handle(), dataIn)
-#define $(NAME)ReadOnly(dataIn) UAVObjReadOnly($(NAME)Handle())
+#define $(NAME)ReadOnly() UAVObjReadOnly($(NAME)Handle())
 
 // Object data
 typedef struct {