Motors_Heli: nest heli params

This commit is contained in:
Randy Mackay 2015-05-08 10:28:43 +09:00
parent 68b05a4ca2
commit edfa206bb8

View File

@ -26,7 +26,8 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = { const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = {
// variables from parent vehicle
AP_NESTEDGROUPINFO(AP_Motors, 0),
// @Param: SV1_POS // @Param: SV1_POS
// @DisplayName: Servo 1 Position // @DisplayName: Servo 1 Position
@ -161,16 +162,12 @@ const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = {
// @User: Standard // @User: Standard
AP_GROUPINFO("RSC_MODE", 16, AP_MotorsHeli, _rsc_mode, AP_MOTORS_HELI_RSC_MODE_CH8_PASSTHROUGH), AP_GROUPINFO("RSC_MODE", 16, AP_MotorsHeli, _rsc_mode, AP_MOTORS_HELI_RSC_MODE_CH8_PASSTHROUGH),
// 17 was RSC_RAMP_RATE which has been replaced by RSC_RAMP_TIME
// @Param: FLYBAR_MODE // @Param: FLYBAR_MODE
// @DisplayName: Flybar Mode Selector // @DisplayName: Flybar Mode Selector
// @Description: Flybar present or not. Affects attitude controller used during ACRO flight mode // @Description: Flybar present or not. Affects attitude controller used during ACRO flight mode
// @Range: 0:NoFlybar 1:Flybar // @Range: 0:NoFlybar 1:Flybar
// @User: Standard // @User: Standard
AP_GROUPINFO("FLYBAR_MODE", 18, AP_MotorsHeli, _flybar_mode, AP_MOTORS_HELI_NOFLYBAR), AP_GROUPINFO("FLYBAR_MODE", 17, AP_MotorsHeli, _flybar_mode, AP_MOTORS_HELI_NOFLYBAR),
// 19,20 - was STAB_COL_MIN, STAB_COL_MAX now moved to main code's parameter list
// @Param: LAND_COL_MIN // @Param: LAND_COL_MIN
// @DisplayName: Landing Collective Minimum // @DisplayName: Landing Collective Minimum
@ -179,7 +176,7 @@ const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = {
// @Units: pwm // @Units: pwm
// @Increment: 1 // @Increment: 1
// @User: Standard // @User: Standard
AP_GROUPINFO("LAND_COL_MIN", 21, AP_MotorsHeli, _land_collective_min, AP_MOTORS_HELI_LAND_COLLECTIVE_MIN), AP_GROUPINFO("LAND_COL_MIN", 18, AP_MotorsHeli, _land_collective_min, AP_MOTORS_HELI_LAND_COLLECTIVE_MIN),
// @Param: RSC_RAMP_TIME // @Param: RSC_RAMP_TIME
// @DisplayName: RSC Ramp Time // @DisplayName: RSC Ramp Time
@ -187,7 +184,7 @@ const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = {
// @Range: 0 60 // @Range: 0 60
// @Units: Seconds // @Units: Seconds
// @User: Standard // @User: Standard
AP_GROUPINFO("RSC_RAMP_TIME", 22, AP_MotorsHeli,_rsc_ramp_time, AP_MOTORS_HELI_RSC_RAMP_TIME), AP_GROUPINFO("RSC_RAMP_TIME", 19, AP_MotorsHeli,_rsc_ramp_time, AP_MOTORS_HELI_RSC_RAMP_TIME),
// @Param: RSC_RUNUP_TIME // @Param: RSC_RUNUP_TIME
// @DisplayName: RSC Runup Time // @DisplayName: RSC Runup Time
@ -195,7 +192,7 @@ const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = {
// @Range: 0 60 // @Range: 0 60
// @Units: Seconds // @Units: Seconds
// @User: Standard // @User: Standard
AP_GROUPINFO("RSC_RUNUP_TIME", 23, AP_MotorsHeli,_rsc_runup_time, AP_MOTORS_HELI_RSC_RUNUP_TIME), AP_GROUPINFO("RSC_RUNUP_TIME", 20, AP_MotorsHeli,_rsc_runup_time, AP_MOTORS_HELI_RSC_RUNUP_TIME),
// @Param: TAIL_SPEED // @Param: TAIL_SPEED
// @DisplayName: Direct Drive VarPitch Tail ESC speed // @DisplayName: Direct Drive VarPitch Tail ESC speed
@ -204,7 +201,7 @@ const AP_Param::GroupInfo AP_MotorsHeli::var_info[] PROGMEM = {
// @Units: PWM // @Units: PWM
// @Increment: 1 // @Increment: 1
// @User: Standard // @User: Standard
AP_GROUPINFO("TAIL_SPEED", 24, AP_MotorsHeli, _direct_drive_tailspeed, AP_MOTOR_HELI_DDTAIL_DEFAULT), AP_GROUPINFO("TAIL_SPEED", 21, AP_MotorsHeli, _direct_drive_tailspeed, AP_MOTOR_HELI_DDTAIL_DEFAULT),
AP_GROUPEND AP_GROUPEND
}; };