commander_params: enable automatic disarming after land detection by default

This commit is contained in:
Matthias Grob
2019-06-27 06:46:45 +01:00
parent 9986a88697
commit aaad71faab
7 changed files with 1 additions and 15 deletions
@@ -13,9 +13,4 @@ sh /etc/init.d/rc.mc_defaults
set MIXER quad_x set MIXER quad_x
set PWM_OUT 1234 set PWM_OUT 1234
if [ $AUTOCNF = yes ]
then
param set COM_DISARM_LAND 5
fi
param set SYS_HITL 1 param set SYS_HITL 1
@@ -14,7 +14,6 @@ if [ $AUTOCNF = yes ]
then then
param set BAT_N_CELLS 3 param set BAT_N_CELLS 3
param set COM_DISARM_LAND 5
param set COM_RC_IN_MODE 1 param set COM_RC_IN_MODE 1
param set EKF2_AID_MASK 1 param set EKF2_AID_MASK 1
@@ -25,8 +25,6 @@ then
param set BAT_N_CELLS 4 param set BAT_N_CELLS 4
param set BAT_R_INTERNAL 0.0025 param set BAT_R_INTERNAL 0.0025
param set COM_DISARM_LAND 5
param set CBRK_AIRSPD_CHK 162128 param set CBRK_AIRSPD_CHK 162128
param set CBRK_IO_SAFETY 22027 param set CBRK_IO_SAFETY 22027
@@ -25,8 +25,6 @@ then
param set BAT_N_CELLS 6 param set BAT_N_CELLS 6
param set COM_DISARM_LAND 3
param set FW_AIRSPD_MAX 30 param set FW_AIRSPD_MAX 30
param set FW_AIRSPD_MIN 19 param set FW_AIRSPD_MIN 19
param set FW_AIRSPD_TRIM 23 param set FW_AIRSPD_TRIM 23
@@ -32,7 +32,6 @@ then
# takeoff, land and RTL settings # takeoff, land and RTL settings
param set MIS_TAKEOFF_ALT 4 param set MIS_TAKEOFF_ALT 4
param set COM_DISARM_LAND 1
param set RTL_LAND_DELAY 1 param set RTL_LAND_DELAY 1
param set RTL_DESCEND_ALT 5 param set RTL_DESCEND_ALT 5
param set RTL_RETURN_ALT 15 param set RTL_RETURN_ALT 15
@@ -22,9 +22,6 @@ sh /etc/init.d/rc.mc_defaults
if [ $AUTOCNF = yes ] if [ $AUTOCNF = yes ]
then then
# Set all params here, then disable autoconfig # Set all params here, then disable autoconfig
param set COM_DISARM_LAND 3
param set EKF2_GPS_POS_X -0.0600 param set EKF2_GPS_POS_X -0.0600
param set EKF2_GPS_POS_Z -0.1000 param set EKF2_GPS_POS_Z -0.1000
param set EKF2_MIN_OBS_DT 50 param set EKF2_MIN_OBS_DT 50
+1 -1
View File
@@ -273,7 +273,7 @@ PARAM_DEFINE_INT32(COM_RC_ARM_HYST, 1000);
* @unit s * @unit s
* @decimal 2 * @decimal 2
*/ */
PARAM_DEFINE_FLOAT(COM_DISARM_LAND, -1.0f); PARAM_DEFINE_FLOAT(COM_DISARM_LAND, 2.0f);
/** /**
* Allow arming without GPS * Allow arming without GPS