From a592e7d398db7f2b3ab88cfc728ea216538a8ff5 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Thu, 4 Aug 2011 07:47:50 -0500
Subject: [PATCH] ManualControlSettings must be also initialized in
 pios_board.c

---
 flight/CopterControl/System/pios_board.c     | 1 +
 flight/Modules/ManualControl/manualcontrol.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c
index 785615280..d512ae989 100644
--- a/flight/CopterControl/System/pios_board.c
+++ b/flight/CopterControl/System/pios_board.c
@@ -909,6 +909,7 @@ void PIOS_Board_Init(void) {
 	UAVObjInitialize();
 
 	HwSettingsInitialize();
+	ManualControlSettingsInitialize();
 	
 #if defined(PIOS_INCLUDE_RTC)
 	/* Initialize the real-time clock and its associated tick */
diff --git a/flight/Modules/ManualControl/manualcontrol.c b/flight/Modules/ManualControl/manualcontrol.c
index 5b9907864..bdd9f6b34 100644
--- a/flight/Modules/ManualControl/manualcontrol.c
+++ b/flight/Modules/ManualControl/manualcontrol.c
@@ -113,11 +113,13 @@ int32_t ManualControlInitialize()
 		return -1;
 
 	AccessoryDesiredInitialize();
-	ManualControlSettingsInitialize();
 	ManualControlCommandInitialize();
 	FlightStatusInitialize();
 	StabilizationDesiredInitialize();
 
+	// ManualControlSettingsInitialize(); // this is initialized in
+	// pios_board.c
+
 	return 0;
 }
 MODULE_INITCALL(ManualControlInitialize, ManualControlStart)