Skip to content

Commit fdf3c68

Browse files
committed
SITL/examples: update to use ARMING_SKIPCHK in params
These conversions were done by spirit rather than literally. Note that the webots python params get several more checks enabled but the one disabled now matches the comment.
1 parent a7c2533 commit fdf3c68

File tree

10 files changed

+10
-11
lines changed

10 files changed

+10
-11
lines changed

libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CRUISE_ALT_FLOOR,0.00
2222
RTL_ALTITUDE,100.00
2323
ALT_OFFSET,0
2424
ARMING_ACCTHRESH,0.75
25-
ARMING_CHECK,0
25+
ARMING_SKIPCHK,-1
2626
ARMING_REQUIRE,0
2727
ARMING_RUDDER,1
2828
ARMING_VOLT_MIN,0

libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CRUISE_ALT_FLOOR,0.00
2222
RTL_ALTITUDE,100.00
2323
ALT_OFFSET,0
2424
ARMING_ACCTHRESH,0.75
25-
ARMING_CHECK,0
25+
ARMING_SKIPCHK,-1
2626
ARMING_REQUIRE,0
2727
ARMING_RUDDER,1
2828
ARMING_VOLT_MIN,0

libraries/SITL/examples/Webots/quadPlus.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ ATC_RAT_RLL_I 0.0300000
1313
ATC_RAT_PIT_D 0.003
1414
ATC_RAT_RLL_D 0.003
1515
ATC_RAT_YAW_D 0.0000100
16-
ARMING_CHECK 33554398
16+
ARMING_SKIPCHK 32

libraries/SITL/examples/Webots/quadPlus2.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ATC_RAT_RLL_I 0.0300000
1414
ATC_RAT_PIT_D 0.003
1515
ATC_RAT_RLL_D 0.003
1616
ATC_RAT_YAW_D 0.0000100
17-
ARMING_CHECK 33554398
17+
ARMING_SKIPCHK 32

libraries/SITL/examples/Webots/quadX.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ ATC_RAT_RLL_I 0.0300000
1313
ATC_RAT_PIT_D 0.003
1414
ATC_RAT_RLL_D 0.003
1515
ATC_RAT_YAW_D 0.0000100
16-
ARMING_CHECK 33554398
16+
ARMING_SKIPCHK 32

libraries/SITL/examples/Webots/quadX2.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ATC_RAT_RLL_I 0.0300000
1414
ATC_RAT_PIT_D 0.003
1515
ATC_RAT_RLL_D 0.003
1616
ATC_RAT_YAW_D 0.0000100
17-
ARMING_CHECK 33554398
17+
ARMING_SKIPCHK 32
1818
SIM_WIND_DIR 90.0
1919
SIM_WIND_SPD 5.0
2020
SIM_WIND_TURB 0.0

libraries/SITL/examples/Webots_Python/params/blueboat.parm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ SERVO3_FUNCTION 0
66
SERVO4_FUNCTION 0
77

88
AHRS_EKF_TYPE 10
9-
#ARMING_CHECK 1045534
10-
ARMING_CHECK 0
9+
ARMING_SKIPCHK -1
1110
MOT_THST_EXPO 0
1211
MOT_THST_HOVER 0.5
1312

libraries/SITL/examples/Webots_Python/params/crazyflie.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ATC_RAT_RLL_D 0.0003
1717
ATC_RAT_YAW_D 0.000001
1818

1919
AHRS_EKF_TYPE 10 # Use sim AHRS
20-
ARMING_CHECK 1045534 # No RC requirements
20+
ARMING_SKIPCHK 64 # No RC requirements
2121
MOT_THST_EXPO 0 # No motor exponential
2222
SCHED_LOOP_RATE 300
2323
INS_GYR_CAL 0

libraries/SITL/examples/Webots_Python/params/iris.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ATC_RAT_RLL_D 0.0003
1717
ATC_RAT_YAW_D 0.000001
1818

1919
AHRS_EKF_TYPE 10 # Use sim AHRS
20-
ARMING_CHECK 1045534 # No RC requirements
20+
ARMING_SKIPCHK 64 # No RC requirements
2121
MOT_THST_EXPO 0 # No motor exponential
2222
SCHED_LOOP_RATE 300
2323
INS_GYR_CAL 0

libraries/SITL/examples/Webots_Python/params/pioneer3at.parm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SERVO3_FUNCTION 74 # (Throttle Right)
66
SERVO4_FUNCTION 74
77

88
AHRS_EKF_TYPE 10 # Use sim AHRS
9-
ARMING_CHECK 1045534 # No RC requirements
9+
ARMING_SKIPCHK 64 # No RC requirements
1010
MOT_THST_EXPO 0 # No motor exponential
1111
SCHED_LOOP_RATE 300
1212
INS_GYR_CAL 0

0 commit comments

Comments
 (0)