diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index 010d435c1a..7f50bf18b1 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -99,6 +99,14 @@ public: k_param_fence, k_param_gps_glitch, // 70 + // + // 75: Singlecopter + // + k_param_single_servo_1 = 75, + k_param_single_servo_2, + k_param_single_servo_3, + k_param_single_servo_4, // 78 + // // 80: Heli // @@ -261,16 +269,6 @@ public: k_param_acro_balance_pitch, k_param_acro_yaw_p, // 244 - - // - //245: Singlecopter - // - k_param_single_servo_1 = 245, // - k_param_single_servo_2, - k_param_single_servo_3, - k_param_single_servo_4, - - // 254,255: reserved }; diff --git a/ArduCopter/Parameters.pde b/ArduCopter/Parameters.pde index 75ce0abaae..84bfcc630e 100644 --- a/ArduCopter/Parameters.pde +++ b/ArduCopter/Parameters.pde @@ -948,7 +948,6 @@ const AP_Param::Info var_info[] PROGMEM = { // variables not in the g class which contain EEPROM saved variables - // variables not in the g class which contain EEPROM saved variables #if CAMERA == ENABLED // @Group: CAM_ // @Path: ../libraries/AP_Camera/AP_Camera.cpp @@ -1037,10 +1036,24 @@ const AP_Param::Info var_info[] PROGMEM = { // @Group: H_ // @Path: ../libraries/AP_Motors/AP_MotorsHeli.cpp GOBJECT(motors, "H_", AP_MotorsHeli), -#elif FRAME_CONFIG == SINGLE_FRAME - // @Group: H_ - // @Path: ../libraries/AP_Motors/AP_MotorsHeli.cpp - GOBJECT(motors, "MOT_", AP_MotorsSingle), + +#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: H_ + // @Path: ../libraries/AP_Motors/AP_MotorsHeli.cpp + GOBJECT(motors, "MOT_", AP_MotorsSingle), + #else // @Group: MOT_ // @Path: ../libraries/AP_Motors/AP_Motors_Class.cpp