From 66416a5289dd994b02f4b0f4d917f220224c3e15 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 18 Oct 2017 10:22:19 +1100 Subject: [PATCH] Copter: make toymode parameter descriptions consistent Also correct "home button" -> "left (Mode button)" --- ArduCopter/toy_mode.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ArduCopter/toy_mode.cpp b/ArduCopter/toy_mode.cpp index 4dc124ac14..9b38af28fa 100644 --- a/ArduCopter/toy_mode.cpp +++ b/ArduCopter/toy_mode.cpp @@ -42,56 +42,56 @@ const AP_Param::GroupInfo ToyMode::var_info[] = { // @Param: _ACTION1 // @DisplayName: Tmode action 1 - // @Description: This is the action taken for the left action button + // @Description: This is the action taken when the left action button is pressed // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_ACTION1", 4, ToyMode, actions[0], ACTION_TOGGLE_VIDEO), // @Param: _ACTION2 // @DisplayName: Tmode action 2 - // @Description: This is the action taken for the right action button + // @Description: This is the action taken when the right action button is pressed // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_ACTION2", 5, ToyMode, actions[1], ACTION_TAKE_PHOTO), // @Param: _ACTION3 // @DisplayName: Tmode action 3 - // @Description: This is the action taken for the power button + // @Description: This is the action taken when the power button is pressed // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_ACTION3", 6, ToyMode, actions[2], ACTION_DISARM), // @Param: _ACTION4 // @DisplayName: Tmode action 4 - // @Description: This is the action taken for the left action button while the mode button is pressed + // @Description: This is the action taken when the left action button is pressed while the left (Mode) button is held down // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_ACTION4", 7, ToyMode, actions[3], ACTION_NONE), // @Param: _ACTION5 // @DisplayName: Tmode action 5 - // @Description: This is the action taken for the right action button while the mode button is pressed + // @Description: This is the action taken when the right action is pressed while the left (Mode) button is held down // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_ACTION5", 8, ToyMode, actions[4], ACTION_NONE), // @Param: _ACTION6 // @DisplayName: Tmode action 6 - // @Description: This is the action taken for the power button while the mode button is pressed + // @Description: This is the action taken when the power button is pressed while the left (Mode) button is held down // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_ACTION6", 9, ToyMode, actions[5], ACTION_NONE), // @Param: _LEFT // @DisplayName: Tmode left action - // @Description: This is the action taken for the left button (mode button) being pressed + // @Description: This is the action taken when the left (Mode) button is pressed // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_LEFT", 10, ToyMode, actions[6], ACTION_TOGGLE_MODE), // @Param: _LEFT_LONG // @DisplayName: Tmode left long action - // @Description: This is the action taken for a long press of the left button (home button) + // @Description: This is the action taken when the left (Mode) button is long-pressed // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest,24:ModeFlowHold // @User: Standard AP_GROUPINFO("_LEFT_LONG", 11, ToyMode, actions[7], ACTION_NONE), @@ -105,7 +105,7 @@ const AP_Param::GroupInfo ToyMode::var_info[] = { // @Param: _RIGHT // @DisplayName: Tmode right action - // @Description: This is the action taken for the right button (RTL) being pressed + // @Description: This is the action taken when the right (Return) button is pressed // @Values: 0:None,1:TakePhoto,2:ToggleVideo,3:ModeAcro,4:ModeAltHold,5:ModeAuto,6:ModeLoiter,7:ModeRTL,8:ModeCircle,9:ModeLand,10:ModeDrift,11:ModeSport,12:ModeAutoTune,13:ModePosHold,14:ModeBrake,15:ModeThrow,16:Flip,17:ModeStabilize,18:Disarm,19:ToggleMode,20:Arm-Land-RTL,21:ToggleSimpleMode,22:ToggleSuperSimpleMode,23:MotorLoadTest // @User: Standard AP_GROUPINFO("_RIGHT", 13, ToyMode, actions[8], ACTION_ARM_LAND_RTL),