SITL: integrate PRX parameter rename

3 years ago · 5fbaa4f136
6 changed files with 6 additions and 6 deletions
--- a/libraries/SITL/SIM_PS_LightWare_SF45B.h
+++ b/libraries/SITL/SIM_PS_LightWare_SF45B.h
@ -18,7 +18,7 @@
 ./Tools/autotest/sim_vehicle.py --gdb --debug -v ArduCopter -A --uartF=sim:sf45b --speedup=1 -l 51.8752066,14.6487840,54.15,0
 param set SERIAL5_PROTOCOL 11  # proximity
-param set PRX_TYPE 8  # s45b
+param set PRX1_TYPE 8  # s45b
 reboot
 arm throttle
--- a/libraries/SITL/SIM_PS_RPLidarA2.h
+++ b/libraries/SITL/SIM_PS_RPLidarA2.h
@ -18,7 +18,7 @@
 ./Tools/autotest/sim_vehicle.py --gdb --debug -v ArduCopter -A --uartF=sim:rplidara2 --speedup=1 -l 51.8752066,14.6487840,54.15,0 --map
 param set SERIAL5_PROTOCOL 11
-param set PRX_TYPE 5
+param set PRX1_TYPE 5
 reboot
 arm throttle
--- a/libraries/SITL/SIM_PS_TeraRangerTower.h
+++ b/libraries/SITL/SIM_PS_TeraRangerTower.h
@ -18,7 +18,7 @@
 ./Tools/autotest/sim_vehicle.py --gdb --debug -v ArduCopter -A --uartF=sim:terarangertower --speedup=1 -l 51.8752066,14.6487840,54.15,0
 param set SERIAL5_PROTOCOL 11
-param set PRX_TYPE 3  # terarangertower
+param set PRX1_TYPE 3  # terarangertower
 reboot
 arm throttle
--- a/libraries/SITL/examples/Airsim/lidar.parm
+++ b/libraries/SITL/examples/Airsim/lidar.parm
@ -1,4 +1,4 @@
-PRX_TYPE         12
+PRX1_TYPE        12
 OA_TYPE          1
 OA_LOOKAHEAD     10
 OA_MARGIN_MAX    3
--- a/libraries/SITL/examples/Morse/quad_scanner.parm
+++ b/libraries/SITL/examples/Morse/quad_scanner.parm
@ -27,7 +27,7 @@ ATC_RAT_YAW_P    0.933841
 # setup laser scanner
-PRX_TYPE 2
+PRX1_TYPE 2
 AVOID_ENABLE 7
 AVOID_MARGIN 1.0
 OA_MARGIN_MAX 0.6
--- a/libraries/SITL/examples/Morse/rover_scanner.parm
+++ b/libraries/SITL/examples/Morse/rover_scanner.parm
@ -4,7 +4,7 @@ SERVO1_FUNCTION 73
 SERVO3_FUNCTION 74
 # setup laser scanner
-PRX_TYPE 2
+PRX1_TYPE 2
 AVOID_ENABLE 7
 AVOID_MARGIN 0.5
 OA_MARGIN_MAX 0.6