fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-04 05:10:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove COM_RC_ARM_HYST

Browse Source 
I've never anyone seen change that value and break the familiar user experience.
This commit is contained in:
Matthias Grob
2025-11-26 15:40:37 +01:00
committed by Jacob Dahl
parent 575fa0850b
commit c8286d4bba
5 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander_params.c
+1 -14
View File
@@ -198,18 +198,6 @@ PARAM_DEFINE_INT32(COM_HOME_IN_AIR, 0);
*/
PARAM_DEFINE_INT32(COM_RC_IN_MODE, 3);
/**
* Manual control input arm/disarm command duration
*
* The default value of 1000 requires the stick to be held in the arm or disarm position for 1 second.
*
* @group Commander
* @min 100
* @max 1500
* @unit ms
*/
PARAM_DEFINE_INT32(COM_RC_ARM_HYST, 1000);
/**
* Time-out for auto disarm after landing
*
@@ -260,8 +248,7 @@ PARAM_DEFINE_INT32(COM_ARM_WO_GPS, 1);
* Arm switch is a momentary button
*
* 0: Arming/disarming triggers on switch transition.
* 1: Arming/disarming triggers when holding the momentary button down
* for COM_RC_ARM_HYST like the stick gesture.
* 1: Arming/disarming triggers when holding the momentary button down like the stick gesture.
*
* @group Commander
* @boolean
src/modules/manual_control/ManualControl.cpp
+3 -3
View File
@@ -309,9 +309,9 @@ void ManualControl::updateParams()
{
ModuleParams::updateParams();
_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_arm_hysteresis.set_hysteresis_time_from(false, _param_com_rc_arm_hyst.get() * 1_ms);
_stick_arm_hysteresis.set_hysteresis_time_from(false, 1_s);
_stick_disarm_hysteresis.set_hysteresis_time_from(false, 1_s);
_button_arm_hysteresis.set_hysteresis_time_from(false, 1_s);
_stick_kill_hysteresis.set_hysteresis_time_from(false, _param_man_kill_gest_t.get() * 1_s);
_selector.setRcInMode(_param_com_rc_in_mode.get());
src/modules/manual_control/ManualControl.hpp
-1
View File
@@ -148,7 +148,6 @@ private:
(ParamFloat<px4::params::COM_RC_STICK_OV>) _param_com_rc_stick_ov,
(ParamBool<px4::params::MAN_ARM_GESTURE>) _param_man_arm_gesture,
(ParamFloat<px4::params::MAN_KILL_GEST_T>) _param_man_kill_gest_t,
(ParamInt<px4::params::COM_RC_ARM_HYST>) _param_com_rc_arm_hyst,
(ParamBool<px4::params::COM_ARM_SWISBTN>) _param_com_arm_swisbtn,
(ParamInt<px4::params::COM_FLTMODE1>) _param_fltmode_1,
(ParamInt<px4::params::COM_FLTMODE2>) _param_fltmode_2,