diff --git a/ArduCopter/Copter.cpp b/ArduCopter/Copter.cpp index a7548fbb54..cbdea5824b 100644 --- a/ArduCopter/Copter.cpp +++ b/ArduCopter/Copter.cpp @@ -31,8 +31,6 @@ Copter::Copter(void) : control_mode(STABILIZE), #if FRAME_CONFIG == HELI_FRAME // helicopter constructor requires more arguments motors(g.rc_7, g.heli_servo_rsc, g.heli_servo_1, g.heli_servo_2, g.heli_servo_3, g.heli_servo_4, MAIN_LOOP_RATE), -#elif FRAME_CONFIG == SINGLE_FRAME // single constructor requires extra servos for flaps - motors(g.single_servo_1, g.single_servo_2, g.single_servo_3, g.single_servo_4, MAIN_LOOP_RATE), #else motors(MAIN_LOOP_RATE), #endif diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp index cb430965a1..5675926c5b 100644 --- a/ArduCopter/Parameters.cpp +++ b/ArduCopter/Parameters.cpp @@ -1001,18 +1001,6 @@ const AP_Param::Info Copter::var_info[] = { GOBJECT(motors, "H_", AP_MotorsHeli_Single), #elif FRAME_CONFIG == SINGLE_FRAME - // @Group: SS1_ - // @Path: ../libraries/RC_Channel/RC_Channel.cpp - GGROUP(single_servo_1, "SS1_", RC_Channel), - // @Group: SS2_ - // @Path: ../libraries/RC_Channel/RC_Channel.cpp - GGROUP(single_servo_2, "SS2_", RC_Channel), - // @Group: SS3_ - // @Path: ../libraries/RC_Channel/RC_Channel.cpp - GGROUP(single_servo_3, "SS3_", RC_Channel), - // @Group: SS4_ - // @Path: ../libraries/RC_Channel/RC_Channel.cpp - GGROUP(single_servo_4, "SS4_", RC_Channel), // @Group: MOT_ // @Path: ../libraries/AP_Motors/AP_MotorsSingle.cpp GOBJECT(motors, "MOT_", AP_MotorsSingle), diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index b91d071160..cabf04c2ef 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -458,10 +458,6 @@ public: RC_Channel heli_servo_1, heli_servo_2, heli_servo_3, heli_servo_4; // servos for swash plate and tail RC_Channel heli_servo_rsc; // servo for rotor speed control output #endif -#if FRAME_CONFIG == SINGLE_FRAME - // Single - RC_Channel single_servo_1, single_servo_2, single_servo_3, single_servo_4; // servos for four flaps -#endif // RC channels RC_Channel rc_1; @@ -526,12 +522,6 @@ public: heli_servo_4 (CH_4), heli_servo_rsc (CH_8), #endif -#if FRAME_CONFIG == SINGLE_FRAME - single_servo_1 (CH_1), - single_servo_2 (CH_2), - single_servo_3 (CH_3), - single_servo_4 (CH_4), -#endif rc_1 (CH_1), rc_2 (CH_2),