From 97770ae3524120fbac5b7c391d008507e7a999a9 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 31 Oct 2013 22:52:13 +0900 Subject: [PATCH] Copter: rc10, rc11 available even without MOUNT --- ArduCopter/Parameters.h | 8 ++------ ArduCopter/Parameters.pde | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index 83d26afe7f..5f7df10b1f 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -370,11 +370,8 @@ public: RC_Channel_aux rc_6; RC_Channel_aux rc_7; RC_Channel_aux rc_8; - -#if MOUNT == ENABLED RC_Channel_aux rc_10; RC_Channel_aux rc_11; -#endif #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 RC_Channel_aux rc_9; @@ -430,12 +427,11 @@ public: rc_8 (CH_8), #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 rc_9 (CH_9), +#endif rc_10 (CH_10), rc_11 (CH_11), +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 rc_12 (CH_12), -#elif MOUNT == ENABLED - rc_10 (CH_10), - rc_11 (CH_11), #endif // PID controller initial P initial I initial D diff --git a/ArduCopter/Parameters.pde b/ArduCopter/Parameters.pde index ebd0475fd1..8b7b57ab10 100644 --- a/ArduCopter/Parameters.pde +++ b/ArduCopter/Parameters.pde @@ -486,20 +486,20 @@ const AP_Param::Info var_info[] PROGMEM = { // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp GGROUP(rc_8, "RC8_", RC_Channel_aux), -#if MOUNT == ENABLED - // @Group: RC10_ - // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp - GGROUP(rc_10, "RC10_", RC_Channel_aux), - - // @Group: RC11_ - // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp - GGROUP(rc_11, "RC11_", RC_Channel_aux), -#endif - #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 // @Group: RC9_ // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp GGROUP(rc_9, "RC9_", RC_Channel_aux), +#endif + + // @Group: RC10_ + // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp + GGROUP(rc_10, "RC10_", RC_Channel_aux), + // @Group: RC11_ + // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp + GGROUP(rc_11, "RC11_", RC_Channel_aux), + +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 // @Group: RC12_ // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp GGROUP(rc_12, "RC12_", RC_Channel_aux),