Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable auto disarm by default #12346

Merged
merged 1 commit into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ROMFS/px4fmu_common/init.d/airframes/1001_rc_quad_x.hil
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,4 @@ sh /etc/init.d/rc.mc_defaults
set MIXER quad_x
set PWM_OUT 1234

if [ $AUTOCNF = yes ]
then
param set COM_DISARM_LAND 5
fi

param set SYS_HITL 1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ if [ $AUTOCNF = yes ]
then
param set BAT_N_CELLS 3

param set COM_DISARM_LAND 5
param set COM_RC_IN_MODE 1

param set EKF2_AID_MASK 1
Expand Down
2 changes: 0 additions & 2 deletions ROMFS/px4fmu_common/init.d/airframes/13013_deltaquad
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ then
param set BAT_N_CELLS 4
param set BAT_R_INTERNAL 0.0025

param set COM_DISARM_LAND 5

param set CBRK_AIRSPD_CHK 162128
param set CBRK_IO_SAFETY 22027

Expand Down
2 changes: 0 additions & 2 deletions ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ then

param set BAT_N_CELLS 6

param set COM_DISARM_LAND 3

param set FW_AIRSPD_MAX 30
param set FW_AIRSPD_MIN 19
param set FW_AIRSPD_TRIM 23
Expand Down
1 change: 0 additions & 1 deletion ROMFS/px4fmu_common/init.d/airframes/4030_3dr_solo
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ then

# takeoff, land and RTL settings
param set MIS_TAKEOFF_ALT 4
param set COM_DISARM_LAND 1
param set RTL_LAND_DELAY 1
param set RTL_DESCEND_ALT 5
param set RTL_RETURN_ALT 15
Expand Down
3 changes: 0 additions & 3 deletions ROMFS/px4fmu_common/init.d/airframes/4070_aerofc
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ sh /etc/init.d/rc.mc_defaults
if [ $AUTOCNF = yes ]
then
# 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_Z -0.1000
param set EKF2_MIN_OBS_DT 50
Expand Down
2 changes: 1 addition & 1 deletion src/modules/commander/commander_params.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ PARAM_DEFINE_INT32(COM_RC_ARM_HYST, 1000);
* @unit s
* @decimal 2
*/
PARAM_DEFINE_FLOAT(COM_DISARM_LAND, -1.0f);
PARAM_DEFINE_FLOAT(COM_DISARM_LAND, 2.0f);

/**
* Allow arming without GPS
Expand Down