From 468022abbafa64811f781374fe6c912661369d15 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Mon, 22 Nov 2021 14:46:45 +0100 Subject: [PATCH] ManualControl: correct arm hysteresis parameter name --- src/modules/manual_control/ManualControl.cpp | 6 +++--- src/modules/manual_control/ManualControl.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/manual_control/ManualControl.cpp b/src/modules/manual_control/ManualControl.cpp index acba99d9f2..6fc1a99d03 100644 --- a/src/modules/manual_control/ManualControl.cpp +++ b/src/modules/manual_control/ManualControl.cpp @@ -71,9 +71,9 @@ void ManualControl::Run() updateParams(); - _stick_arm_hysteresis.set_hysteresis_time_from(false, _param_rc_arm_hyst.get() * 1_ms); - _stick_disarm_hysteresis.set_hysteresis_time_from(false, _param_rc_arm_hyst.get() * 1_ms); - _button_hysteresis.set_hysteresis_time_from(false, _param_rc_arm_hyst.get() * 1_ms); + _stick_arm_hysteresis.set_hysteresis_time_from(false, _param_com_rc_arm_hyst.get() * 1_ms); + _stick_disarm_hysteresis.set_hysteresis_time_from(false, _param_com_rc_arm_hyst.get() * 1_ms); + _button_hysteresis.set_hysteresis_time_from(false, _param_com_rc_arm_hyst.get() * 1_ms); _selector.setRcInMode(_param_com_rc_in_mode.get()); _selector.setTimeout(_param_com_rc_loss_t.get() * 1_s); diff --git a/src/modules/manual_control/ManualControl.hpp b/src/modules/manual_control/ManualControl.hpp index d74a4f54fe..a904fbd444 100644 --- a/src/modules/manual_control/ManualControl.hpp +++ b/src/modules/manual_control/ManualControl.hpp @@ -120,7 +120,7 @@ private: (ParamInt) _param_com_rc_in_mode, (ParamFloat) _param_com_rc_loss_t, (ParamFloat) _param_com_rc_stick_ov, - (ParamInt) _param_rc_arm_hyst, + (ParamInt) _param_com_rc_arm_hyst, (ParamBool) _param_com_arm_swisbtn, (ParamInt) _param_fltmode_1, (ParamInt) _param_fltmode_2,