From 21a01c5587b55b73c26e19df14179fa629c789ce Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 21 Feb 2024 15:23:32 +1100 Subject: [PATCH] AP_GPS: remove dead GPS_MINDGPS variable --- Tools/Frame_params/Sub/bluerov2-3_5.params | 1 - Tools/Frame_params/Sub/bluerov2-3_5_2.params | 1 - Tools/Frame_params/Sub/bluerov2-3_5_4.params | 1 - Tools/Frame_params/Sub/bluerov2-4_0_0.params | 4 ++-- Tools/Frame_params/Sub/bluerov2-heavy-3_5_2.params | 1 - Tools/Frame_params/Sub/bluerov2-heavy-3_5_4.params | 1 - Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params | 1 - Tools/autotest/default_params/vee-gull_005.param | 1 - libraries/AP_GPS/AP_GPS.cpp | 8 +------- libraries/AP_GPS/AP_GPS.h | 1 - .../SilentWings/Params/Rolladen-Schneider-LS8b.param | 1 - .../examples/SilentWings/Params/Schleicher-ASW27B.param | 1 - 12 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Tools/Frame_params/Sub/bluerov2-3_5.params b/Tools/Frame_params/Sub/bluerov2-3_5.params index ae960a2c01..9af6af304b 100644 --- a/Tools/Frame_params/Sub/bluerov2-3_5.params +++ b/Tools/Frame_params/Sub/bluerov2-3_5.params @@ -229,7 +229,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.000000000000000000 diff --git a/Tools/Frame_params/Sub/bluerov2-3_5_2.params b/Tools/Frame_params/Sub/bluerov2-3_5_2.params index 5ea9c15b95..6441ea6970 100644 --- a/Tools/Frame_params/Sub/bluerov2-3_5_2.params +++ b/Tools/Frame_params/Sub/bluerov2-3_5_2.params @@ -227,7 +227,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.0 diff --git a/Tools/Frame_params/Sub/bluerov2-3_5_4.params b/Tools/Frame_params/Sub/bluerov2-3_5_4.params index 85d1713ec4..6f6afd1050 100644 --- a/Tools/Frame_params/Sub/bluerov2-3_5_4.params +++ b/Tools/Frame_params/Sub/bluerov2-3_5_4.params @@ -223,7 +223,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.0 diff --git a/Tools/Frame_params/Sub/bluerov2-4_0_0.params b/Tools/Frame_params/Sub/bluerov2-4_0_0.params index a5a21c5343..d2794c79fa 100644 --- a/Tools/Frame_params/Sub/bluerov2-4_0_0.params +++ b/Tools/Frame_params/Sub/bluerov2-4_0_0.params @@ -263,7 +263,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.0 @@ -828,4 +827,5 @@ WPNAV_SPEED,500.0 WPNAV_SPEED_DN,150.0 WPNAV_SPEED_UP,250.0 WP_YAW_BEHAVIOR,4 -XTRACK_ANG_LIM,45 \ No newline at end of file +XTRACK_ANG_LIM,45 + diff --git a/Tools/Frame_params/Sub/bluerov2-heavy-3_5_2.params b/Tools/Frame_params/Sub/bluerov2-heavy-3_5_2.params index b6b10979c1..86aacb1fd7 100644 --- a/Tools/Frame_params/Sub/bluerov2-heavy-3_5_2.params +++ b/Tools/Frame_params/Sub/bluerov2-heavy-3_5_2.params @@ -227,7 +227,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.000000000000000000 diff --git a/Tools/Frame_params/Sub/bluerov2-heavy-3_5_4.params b/Tools/Frame_params/Sub/bluerov2-heavy-3_5_4.params index 69c7b4d8b2..78eb31f289 100644 --- a/Tools/Frame_params/Sub/bluerov2-heavy-3_5_4.params +++ b/Tools/Frame_params/Sub/bluerov2-heavy-3_5_4.params @@ -223,7 +223,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.0 diff --git a/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params b/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params index 88d0826b34..56ec37693d 100644 --- a/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params +++ b/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params @@ -263,7 +263,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0.0 diff --git a/Tools/autotest/default_params/vee-gull_005.param b/Tools/autotest/default_params/vee-gull_005.param index 710889e2d7..2b529f0d22 100644 --- a/Tools/autotest/default_params/vee-gull_005.param +++ b/Tools/autotest/default_params/vee-gull_005.param @@ -227,7 +227,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0 diff --git a/libraries/AP_GPS/AP_GPS.cpp b/libraries/AP_GPS/AP_GPS.cpp index a496df51e6..94e98f0ac1 100644 --- a/libraries/AP_GPS/AP_GPS.cpp +++ b/libraries/AP_GPS/AP_GPS.cpp @@ -158,13 +158,7 @@ const AP_Param::GroupInfo AP_GPS::var_info[] = { AP_GROUPINFO("_AUTO_SWITCH", 3, AP_GPS, _auto_switch, (int8_t)GPSAutoSwitch::USE_BEST), #endif - // @Param: _MIN_DGPS - // @DisplayName: Minimum Lock Type Accepted for DGPS - // @Description: Sets the minimum type of differential GPS corrections required before allowing to switch into DGPS mode. - // @Values: 0:Any,50:FloatRTK,100:IntegerRTK - // @User: Advanced - // @RebootRequired: True - AP_GROUPINFO("_MIN_DGPS", 4, AP_GPS, _min_dgps, 100), + // 4 was _MIN_GPS, removed Feb 2024 // @Param: _SBAS_MODE // @DisplayName: SBAS Mode diff --git a/libraries/AP_GPS/AP_GPS.h b/libraries/AP_GPS/AP_GPS.h index b48bf453a4..1427626957 100644 --- a/libraries/AP_GPS/AP_GPS.h +++ b/libraries/AP_GPS/AP_GPS.h @@ -592,7 +592,6 @@ protected: AP_Int8 _type[GPS_MAX_RECEIVERS]; AP_Int8 _navfilter; AP_Int8 _auto_switch; - AP_Int8 _min_dgps; AP_Int16 _sbp_logmask; AP_Int8 _inject_to; uint32_t _last_instance_swap_ms; diff --git a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param index fa828dfc49..255c14676a 100644 --- a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param +++ b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param @@ -176,7 +176,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0 diff --git a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param index cb6b93e176..2c9a9ae02e 100644 --- a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param +++ b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param @@ -180,7 +180,6 @@ GPS_DELAY_MS2,0 GPS_GNSS_MODE,0 GPS_GNSS_MODE2,0 GPS_INJECT_TO,127 -GPS_MIN_DGPS,100 GPS_MIN_ELEV,-100 GPS_NAVFILTER,8 GPS_POS1_X,0