From a30f1155671811e85fbeec29a28753ff198d38d3 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Tue, 24 Feb 2015 22:02:56 +0100 Subject: [PATCH] OP-1743 - Fix uninitialized objects usage --- flight/modules/ManualControl/manualcontrol.c | 4 ++-- flight/modules/Receiver/receiver.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flight/modules/ManualControl/manualcontrol.c b/flight/modules/ManualControl/manualcontrol.c index fa8a7497d..cf65a9328 100644 --- a/flight/modules/ManualControl/manualcontrol.c +++ b/flight/modules/ManualControl/manualcontrol.c @@ -43,8 +43,8 @@ #include #include #include -#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES #include +#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES #include #endif @@ -160,9 +160,9 @@ int32_t ManualControlInitialize() ManualControlSettingsInitialize(); FlightModeSettingsInitialize(); SystemSettingsInitialize(); + StabilizationSettingsInitialize(); #ifndef PIOS_EXCLUDE_ADVANCED_FEATURES VtolSelfTuningStatsInitialize(); - StabilizationSettingsInitialize(); VtolPathFollowerSettingsInitialize(); #endif callbackHandle = PIOS_CALLBACKSCHEDULER_Create(&manualControlTask, CALLBACK_PRIORITY, CBTASK_PRIORITY, CALLBACKINFO_RUNNING_MANUALCONTROL, STACK_SIZE_BYTES); diff --git a/flight/modules/Receiver/receiver.c b/flight/modules/Receiver/receiver.c index bf68b73e0..2f42b7eed 100644 --- a/flight/modules/Receiver/receiver.c +++ b/flight/modules/Receiver/receiver.c @@ -135,7 +135,7 @@ int32_t ReceiverInitialize() { /* Check the assumptions about uavobject enum's are correct */ PIOS_STATIC_ASSERT(assumptions); - + AccessoryDesiredInitialize(); ManualControlCommandInitialize(); ReceiverActivityInitialize(); ManualControlSettingsInitialize();