From f9da41fcf289eaff8b199feedc035b6f2f261a1b Mon Sep 17 00:00:00 2001 From: Matthias Grob <maetugr@gmail.com> Date: Thu, 15 Dec 2016 21:27:48 +0100 Subject: [PATCH] fixed rebase errors in arm switch implementation --- src/modules/sensors/rc_update.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/sensors/rc_update.cpp b/src/modules/sensors/rc_update.cpp index 0a4a1921e0..b4b30065ce 100644 --- a/src/modules/sensors/rc_update.cpp +++ b/src/modules/sensors/rc_update.cpp @@ -95,6 +95,7 @@ void RCUpdate::update_rc_functions() _rc.function[rc_channels_s::RC_CHANNELS_FUNCTION_ACRO] = _parameters.rc_map_acro_sw - 1; _rc.function[rc_channels_s::RC_CHANNELS_FUNCTION_OFFBOARD] = _parameters.rc_map_offboard_sw - 1; _rc.function[rc_channels_s::RC_CHANNELS_FUNCTION_KILLSWITCH] = _parameters.rc_map_kill_sw - 1; + _rc.function[rc_channels_s::RC_CHANNELS_FUNCTION_ARMSWITCH] = _parameters.rc_map_arm_sw - 1; _rc.function[rc_channels_s::RC_CHANNELS_FUNCTION_TRANSITION] = _parameters.rc_map_trans_sw - 1; _rc.function[rc_channels_s::RC_CHANNELS_FUNCTION_GEAR] = _parameters.rc_map_gear_sw - 1; @@ -414,7 +415,7 @@ RCUpdate::rc_poll(const ParameterHandles ¶meter_handles) _parameters.rc_offboard_th, _parameters.rc_offboard_inv); manual.kill_switch = get_rc_sw2pos_position(rc_channels_s::RC_CHANNELS_FUNCTION_KILLSWITCH, _parameters.rc_killswitch_th, _parameters.rc_killswitch_inv); - manual.arm_switch = get_rc_sw2pos_position(rc_channels_s::RC_CHANNELS_FUNCTION_KILLSWITCH, + manual.arm_switch = get_rc_sw2pos_position(rc_channels_s::RC_CHANNELS_FUNCTION_ARMSWITCH, _parameters.rc_armswitch_th, _parameters.rc_armswitch_inv); manual.transition_switch = get_rc_sw2pos_position(rc_channels_s::RC_CHANNELS_FUNCTION_TRANSITION, _parameters.rc_trans_th, _parameters.rc_trans_inv); -- GitLab