Copter: rc10, rc11 available even without MOUNT

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

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
+#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),
-#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),
     // @Group: RC12_
     // @Path: ../libraries/RC_Channel/RC_Channel.cpp,../libraries/RC_Channel/RC_Channel_aux.cpp
     GGROUP(rc_12,                   "RC12_", RC_Channel_aux),