From 038dd68e3a69388e9dc1ac6dde7ff3aaaf549934 Mon Sep 17 00:00:00 2001
From: Pierre Kancir <pierre.kancir@azurdrones.com>
Date: Thu, 28 Feb 2019 11:06:37 +0100
Subject: [PATCH] Tools: update RNGFND syntax in parameters files

---
 .../default_params/copter-optflow.parm        | 10 +++---
 .../default_params/copter-rangefinder.parm    | 10 +++---
 .../autotest/default_params/gazebo-iris.parm  |  8 ++---
 .../default_params/vee-gull 005.param         | 36 +++++++++----------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Tools/autotest/default_params/copter-optflow.parm b/Tools/autotest/default_params/copter-optflow.parm
index 59eea70820..2a7096fbaf 100644
--- a/Tools/autotest/default_params/copter-optflow.parm
+++ b/Tools/autotest/default_params/copter-optflow.parm
@@ -2,9 +2,9 @@ ARMING_CHECK -33
 EKF_GPS_TYPE 3
 EK2_GPS_TYPE 3
 FLOW_ENABLE 1
-RNGFND_TYPE 1
-RNGFND_MIN_CM 0
-RNGFND_MAX_CM 4000
-RNGFND_PIN 0
-RNGFND_SCALING 12.12
+RNGFND1_TYPE 1
+RNGFND1_MIN_CM 0
+RNGFND1_MAX_CM 4000
+RNGFND1_PIN 0
+RNGFND1_SCALING 12.12
 SIM_FLOW_ENABLE 1
\ No newline at end of file
diff --git a/Tools/autotest/default_params/copter-rangefinder.parm b/Tools/autotest/default_params/copter-rangefinder.parm
index 9d815a6508..0005a89571 100644
--- a/Tools/autotest/default_params/copter-rangefinder.parm
+++ b/Tools/autotest/default_params/copter-rangefinder.parm
@@ -1,5 +1,5 @@
-RNGFND_TYPE 1
-RNGFND_MIN_CM 0
-RNGFND_MAX_CM 4000
-RNGFND_PIN 0
-RNGFND_SCALING 12.12
\ No newline at end of file
+RNGFND1_TYPE 1
+RNGFND1_MIN_CM 0
+RNGFND1_MAX_CM 4000
+RNGFND1_PIN 0
+RNGFND1_SCALING 12.12
\ No newline at end of file
diff --git a/Tools/autotest/default_params/gazebo-iris.parm b/Tools/autotest/default_params/gazebo-iris.parm
index 6daba34024..9e586a53fd 100644
--- a/Tools/autotest/default_params/gazebo-iris.parm
+++ b/Tools/autotest/default_params/gazebo-iris.parm
@@ -7,7 +7,7 @@ PLND_ENABLED    1
 PLND_TYPE       3
 # SONAR FOR IRLOCK
 SIM_SONAR_SCALE 10
-RNGFND_TYPE 1
-RNGFND_SCALING 10
-RNGFND_PIN 0
-RNGFND_MAX_CM 5000
+RNGFND1_TYPE 1
+RNGFND1_SCALING 10
+RNGFND1_PIN 0
+RNGFND1_MAX_CM 5000
diff --git a/Tools/autotest/default_params/vee-gull 005.param b/Tools/autotest/default_params/vee-gull 005.param
index 0d80a9dfa8..f87614780d 100644
--- a/Tools/autotest/default_params/vee-gull 005.param	
+++ b/Tools/autotest/default_params/vee-gull 005.param	
@@ -505,24 +505,24 @@ RLL2SRV_IMAX,3000
 RLL2SRV_P,0.6
 RLL2SRV_RMAX,0
 RLL2SRV_TCONST,0.5
-RNGFND_ADDR,0
-RNGFND_FUNCTION,0
-RNGFND_GNDCLEAR,10
-RNGFND_LANDING,0
-RNGFND_MAX_CM,700
-RNGFND_MIN_CM,20
-RNGFND_OFFSET,0
-RNGFND_ORIENT,25
-RNGFND_PIN,-1
-RNGFND_POS_X,0
-RNGFND_POS_Y,0
-RNGFND_POS_Z,0
-RNGFND_PWRRNG,0
-RNGFND_RMETRIC,1
-RNGFND_SCALING,3
-RNGFND_SETTLE,0
-RNGFND_STOP_PIN,-1
-RNGFND_TYPE,0
+RNGFND1_ADDR,0
+RNGFND1_FUNCTION,0
+RNGFND1_GNDCLEAR,10
+RNGFND1_LANDING,0
+RNGFND1_MAX_CM,700
+RNGFND1_MIN_CM,20
+RNGFND1_OFFSET,0
+RNGFND1_ORIENT,25
+RNGFND1_PIN,-1
+RNGFND1_POS_X,0
+RNGFND1_POS_Y,0
+RNGFND1_POS_Z,0
+RNGFND1_PWRRNG,0
+RNGFND1_RMETRIC,1
+RNGFND1_SCALING,3
+RNGFND1_SETTLE,0
+RNGFND1_STOP_PIN,-1
+RNGFND1_TYPE,0
 RNGFND2_ADDR,0
 RNGFND2_FUNCTION,0
 RNGFND2_GNDCLEAR,10