diff --git a/libraries/AP_JSButton/AP_JSButton.cpp b/libraries/AP_JSButton/AP_JSButton.cpp index f9a1fed56c..bd2983045f 100644 --- a/libraries/AP_JSButton/AP_JSButton.cpp +++ b/libraries/AP_JSButton/AP_JSButton.cpp @@ -5,14 +5,14 @@ const AP_Param::GroupInfo JSButton::var_info[] = { // @Param: FUNCTION // @DisplayName: Function for button // @Description: Set to 0 to disable or choose a function - // @Values: 0:Disabled,1:shift,2:arm_toggle,3:arm,4:disarm,5:mode_toggle,6:enter_mode_1,7:enter_mode_2,8:enter_mode_3,9:enter_mode_4,10:enter_mode_5,11:enter_mode_6,21:mount_center,22:mount_tilt_up,23:mount_tilt_down,24:camera_trigger,25:camera_source_toggle,26:mount_pan_right,27:mount_pan_left,31:lights1_cycle,32:lights1_brighter,33:lights1_dimmer,34:lights2_cycle,35:lights2_brighter,36:lights2_dimmer,41:gain_toggle,42:gain_inc,43:gain_dec,44:trim_roll_inc,45:trim_roll_dec,46:trim_pitch_inc,47:trim_pitch_dec,48:input_hold_toggle,51:relay_1_on,52:relay_1_off,53:relay_1_toggle,54:relay_2_on,55:relay_2_off,56:relay_2_toggle,61:servo_1_inc,62:servo_1_dec,63:servo_1_center,64:servo_2_inc,65:servo_2_dec,66:servo_2_center,67:servo_3_inc,68:servo_3_dec,69:servo_3_center,91:custom_1,92:custom_2,93:custom_3,94:custom_4,95:custom_5,96:custom_6 + // @Values: 0:Disabled,1:shift,2:arm_toggle,3:arm,4:disarm,5:mode_toggle,6:enter_mode_1,7:enter_mode_2,8:enter_mode_3,9:enter_mode_4,10:enter_mode_5,11:enter_mode_6,21:mount_center,22:mount_tilt_up,23:mount_tilt_down,24:camera_trigger,25:camera_source_toggle,26:mount_pan_right,27:mount_pan_left,31:lights1_cycle,32:lights1_brighter,33:lights1_dimmer,34:lights2_cycle,35:lights2_brighter,36:lights2_dimmer,41:gain_toggle,42:gain_inc,43:gain_dec,44:trim_roll_inc,45:trim_roll_dec,46:trim_pitch_inc,47:trim_pitch_dec,48:input_hold_toggle,51:relay_1_on,52:relay_1_off,53:relay_1_toggle,54:relay_2_on,55:relay_2_off,56:relay_2_toggle,61:servo_1_inc,62:servo_1_dec,63:servo_1_min,64:servo_1_max,65:servo_1_center,66:servo_2_inc,67:servo_2_dec,68:servo_2_min,69:servo_2_max,70:servo_2_center,71:servo_3_inc,72:servo_3_dec,73:servo_3_min,74:servo_3_max,75:servo_3_center,91:custom_1,92:custom_2,93:custom_3,94:custom_4,95:custom_5,96:custom_6 // @User: Standard AP_GROUPINFO("FUNCTION", 1, JSButton, _function, 0), // @Param: SFUNCTION // @DisplayName: Function for button when the shift mode is toggled on // @Description: Set to 0 to disable or choose a function - // @Values: 0:Disabled,1:shift,2:arm_toggle,3:arm,4:disarm,5:mode_toggle,6:enter_mode_1,7:enter_mode_2,8:enter_mode_3,9:enter_mode_4,10:enter_mode_5,11:enter_mode_6,21:mount_center,22:mount_tilt_up,23:mount_tilt_down,24:camera_trigger,25:camera_source_toggle,26:mount_pan_right,27:mount_pan_left,31:lights1_cycle,32:lights1_brighter,33:lights1_dimmer,34:lights2_cycle,35:lights2_brighter,36:lights2_dimmer,41:gain_toggle,42:gain_inc,43:gain_dec,44:trim_roll_inc,45:trim_roll_dec,46:trim_pitch_inc,47:trim_pitch_dec,48:input_hold_toggle,51:relay_1_on,52:relay_1_off,53:relay_1_toggle,54:relay_2_on,55:relay_2_off,56:relay_2_toggle,61:servo_1_inc,62:servo_1_dec,63:servo_1_center,64:servo_2_inc,65:servo_2_dec,66:servo_2_center,67:servo_3_inc,68:servo_3_dec,69:servo_3_center,91:custom_1,92:custom_2,93:custom_3,94:custom_4,95:custom_5,96:custom_6 + // @Values: 0:Disabled,1:shift,2:arm_toggle,3:arm,4:disarm,5:mode_toggle,6:enter_mode_1,7:enter_mode_2,8:enter_mode_3,9:enter_mode_4,10:enter_mode_5,11:enter_mode_6,21:mount_center,22:mount_tilt_up,23:mount_tilt_down,24:camera_trigger,25:camera_source_toggle,26:mount_pan_right,27:mount_pan_left,31:lights1_cycle,32:lights1_brighter,33:lights1_dimmer,34:lights2_cycle,35:lights2_brighter,36:lights2_dimmer,41:gain_toggle,42:gain_inc,43:gain_dec,44:trim_roll_inc,45:trim_roll_dec,46:trim_pitch_inc,47:trim_pitch_dec,48:input_hold_toggle,51:relay_1_on,52:relay_1_off,53:relay_1_toggle,54:relay_2_on,55:relay_2_off,56:relay_2_toggle,61:servo_1_inc,62:servo_1_dec,63:servo_1_min,64:servo_1_max,65:servo_1_center,66:servo_2_inc,67:servo_2_dec,68:servo_2_min,69:servo_2_max,70:servo_2_center,71:servo_3_inc,72:servo_3_dec,73:servo_3_min,74:servo_3_max,75:servo_3_center,91:custom_1,92:custom_2,93:custom_3,94:custom_4,95:custom_5,96:custom_6 // @User: Standard AP_GROUPINFO("SFUNCTION", 2, JSButton, _sfunction, 0), diff --git a/libraries/AP_JSButton/AP_JSButton.h b/libraries/AP_JSButton/AP_JSButton.h index f276f0a4a6..2b4d947132 100644 --- a/libraries/AP_JSButton/AP_JSButton.h +++ b/libraries/AP_JSButton/AP_JSButton.h @@ -52,15 +52,24 @@ public: k_relay_2_off = 55, ///< trigger relay off k_relay_2_toggle = 56, ///< trigger relay toggle // 57-60 reserved for future functions - k_servo_1_inc = 61, ///< increase servo 1 output - k_servo_1_dec = 62, ///< decrease servo 1 output - k_servo_1_center = 63, ///< center servo 1 output - k_servo_2_inc = 64, ///< increase servo 2 output - k_servo_2_dec = 65, ///< decrease servo 2 output - k_servo_2_center = 66, ///< center servo 2 output - k_servo_3_inc = 67, ///< increase servo 3 output - k_servo_3_dec = 68, ///< decrease servo 3 output - k_servo_3_center = 69, ///< center servo 3 output + k_servo_1_inc = 61, ///< increase servo output + k_servo_1_dec = 62, ///< decrease servo output + k_servo_1_min = 63, ///< center servo + k_servo_1_max = 64, ///< set servo output to minimum (SERVOn_MIN) + k_servo_1_center = 65, ///< set servo output to maximum (SERVOn_MAX) + + k_servo_2_inc = 66, + k_servo_2_dec = 67, + k_servo_2_min = 68, + k_servo_2_max = 69, + k_servo_2_center = 70, + + k_servo_3_inc = 71, + k_servo_3_dec = 72, + k_servo_3_min = 73, + k_servo_3_max = 74, + k_servo_3_center = 75, + // 70-89 reserved for future functions k_custom_1 = 91, ///< custom user button 1 k_custom_2 = 92, ///< custom user button 2