From cd2f2f96eb84167c2dc43d206dbd4efc7916d9c2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Thu, 3 Dec 2020 19:13:33 +1100
Subject: [PATCH] rename barometer parameters to BARO prefix

---
 AntennaTracker/Parameters.cpp  | 7 +++----
 ArduCopter/Parameters.cpp      | 4 ++--
 ArduPlane/Parameters.cpp       | 6 ++----
 ArduSub/Parameters.cpp         | 4 ++--
 Rover/Parameters.cpp           | 6 ++----
 Tools/AP_Periph/Parameters.cpp | 4 ++--
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/AntennaTracker/Parameters.cpp b/AntennaTracker/Parameters.cpp
index 37b1975226..5467399206 100644
--- a/AntennaTracker/Parameters.cpp
+++ b/AntennaTracker/Parameters.cpp
@@ -213,11 +213,10 @@ const AP_Param::Info Tracker::var_info[] = {
     // @User: Standard
     GSCALAR(pitch_max,               "PITCH_MAX",	PITCH_MAX_DEFAULT),
 
-    // barometer ground calibration. The GND_ prefix is chosen for
-    // compatibility with previous releases of ArduPlane
-    // @Group: GND_
+    // barometer library
+    // @Group: BARO
     // @Path: ../libraries/AP_Baro/AP_Baro.cpp
-    GOBJECT(barometer, "GND_", AP_Baro),
+    GOBJECT(barometer, "BARO", AP_Baro),
 
     // @Group: COMPASS_
     // @Path: ../libraries/AP_Compass/AP_Compass.cpp
diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp
index bf21f092fc..99ff0c9cce 100644
--- a/ArduCopter/Parameters.cpp
+++ b/ArduCopter/Parameters.cpp
@@ -582,9 +582,9 @@ const AP_Param::Info Copter::var_info[] = {
     GOBJECT(sitl, "SIM_", SITL::SITL),
 #endif
 
-    // @Group: GND_
+    // @Group: BARO
     // @Path: ../libraries/AP_Baro/AP_Baro.cpp
-    GOBJECT(barometer, "GND_", AP_Baro),
+    GOBJECT(barometer, "BARO", AP_Baro),
 
     // GPS driver
     // @Group: GPS_
diff --git a/ArduPlane/Parameters.cpp b/ArduPlane/Parameters.cpp
index cfd33e5362..ef80250909 100644
--- a/ArduPlane/Parameters.cpp
+++ b/ArduPlane/Parameters.cpp
@@ -857,11 +857,9 @@ const AP_Param::Info Plane::var_info[] = {
     // @User: Advanced
     ASCALAR(crash_detection_enable,         "CRASH_DETECT",   0),
 
-    // barometer ground calibration. The GND_ prefix is chosen for
-    // compatibility with previous releases of ArduPlane
-    // @Group: GND_
+    // @Group: BARO
     // @Path: ../libraries/AP_Baro/AP_Baro.cpp
-    GOBJECT(barometer, "GND_", AP_Baro),
+    GOBJECT(barometer, "BARO", AP_Baro),
 
     // GPS driver
     // @Group: GPS_
diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp
index 360b7f3856..da023cde39 100644
--- a/ArduSub/Parameters.cpp
+++ b/ArduSub/Parameters.cpp
@@ -500,9 +500,9 @@ const AP_Param::Info Sub::var_info[] = {
     GOBJECT(sitl, "SIM_", SITL::SITL),
 #endif
 
-    // @Group: GND_
+    // @Group: BARO
     // @Path: ../libraries/AP_Baro/AP_Baro.cpp
-    GOBJECT(barometer, "GND_", AP_Baro),
+    GOBJECT(barometer, "BARO", AP_Baro),
 
     // GPS driver
     // @Group: GPS_
diff --git a/Rover/Parameters.cpp b/Rover/Parameters.cpp
index a270cf96fc..91229c2025 100644
--- a/Rover/Parameters.cpp
+++ b/Rover/Parameters.cpp
@@ -236,11 +236,9 @@ const AP_Param::Info Rover::var_info[] = {
     // @Path: ../libraries/AP_Scheduler/AP_Scheduler.cpp
     GOBJECT(scheduler, "SCHED_", AP_Scheduler),
 
-    // barometer ground calibration. The GND_ prefix is chosen for
-    // compatibility with previous releases of ArduPlane
-    // @Group: GND_
+    // @Group: BARO
     // @Path: ../libraries/AP_Baro/AP_Baro.cpp
-    GOBJECT(barometer, "GND_", AP_Baro),
+    GOBJECT(barometer, "BARO", AP_Baro),
 
     // @Group: RELAY_
     // @Path: ../libraries/AP_Relay/AP_Relay.cpp
diff --git a/Tools/AP_Periph/Parameters.cpp b/Tools/AP_Periph/Parameters.cpp
index 1003277e53..f5e35bd8c6 100644
--- a/Tools/AP_Periph/Parameters.cpp
+++ b/Tools/AP_Periph/Parameters.cpp
@@ -66,9 +66,9 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
 
 #ifdef HAL_PERIPH_ENABLE_BARO
     // Baro driver
-    // @Group: BARO_
+    // @Group: BARO
     // @Path: ../../libraries/AP_Baro/AP_Baro.cpp
-    GOBJECT(baro, "BARO_", AP_Baro),
+    GOBJECT(baro, "BARO", AP_Baro),
     GSCALAR(baro_enable, "BARO_ENABLE", 1),
 #endif