From 5fbaa4f13658297bdbf8a8447f4137e3ed3c3fe4 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Tue, 5 Jul 2022 16:32:11 +0900
Subject: [PATCH] SITL: integrate PRX parameter rename

---
 libraries/SITL/SIM_PS_LightWare_SF45B.h          | 2 +-
 libraries/SITL/SIM_PS_RPLidarA2.h                | 2 +-
 libraries/SITL/SIM_PS_TeraRangerTower.h          | 2 +-
 libraries/SITL/examples/Airsim/lidar.parm        | 2 +-
 libraries/SITL/examples/Morse/quad_scanner.parm  | 2 +-
 libraries/SITL/examples/Morse/rover_scanner.parm | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/SITL/SIM_PS_LightWare_SF45B.h b/libraries/SITL/SIM_PS_LightWare_SF45B.h
index 99a5ab9ceb..68ec7961e3 100644
--- 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
diff --git a/libraries/SITL/SIM_PS_RPLidarA2.h b/libraries/SITL/SIM_PS_RPLidarA2.h
index 2c1912b8eb..558a33590a 100644
--- 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
diff --git a/libraries/SITL/SIM_PS_TeraRangerTower.h b/libraries/SITL/SIM_PS_TeraRangerTower.h
index b124a5ebcb..8d4dc7c9b5 100644
--- 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
diff --git a/libraries/SITL/examples/Airsim/lidar.parm b/libraries/SITL/examples/Airsim/lidar.parm
index e94d134fe8..9c167f7ef4 100644
--- 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
diff --git a/libraries/SITL/examples/Morse/quad_scanner.parm b/libraries/SITL/examples/Morse/quad_scanner.parm
index e11b2c5c37..b07df845f4 100644
--- 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
diff --git a/libraries/SITL/examples/Morse/rover_scanner.parm b/libraries/SITL/examples/Morse/rover_scanner.parm
index dec2bcbd9b..a594c4bf55 100644
--- 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