Merge pull request #10214 from iNavFlight/mmosca-ublox-satinfo

[GPS] UBLOX and UBLOX7 have been merged into UBLOX
iNavFlight · Jul 10, 2024 · 6139c20 · 6139c20
2 parents 76d18b2 + e6e903a
commit 6139c20
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/src/main/fc/settings.yaml b/src/main/fc/settings.yaml
@@ -42,7 +42,7 @@ tables:
     values: ["VELNED", "TURNRATE","ADAPTIVE"]
     enum: imu_inertia_comp_method_e
   - name: gps_provider
-    values: ["UBLOX", "UBLOX7", "MSP", "FAKE"]
+    values: ["UBLOX", "MSP", "FAKE"]
     enum: gpsProvider_e
   - name: gps_sbas_mode
     values: ["AUTO", "EGNOS", "WAAS", "MSAS", "GAGAN", "SPAN", "NONE"]

diff --git a/src/main/io/gps.c b/src/main/io/gps.c
@@ -102,13 +102,6 @@ static gpsProviderDescriptor_t gpsProviders[GPS_PROVIDER_COUNT] = {
     { false, 0, NULL, NULL },
 #endif
 
-    /* UBLOX7PLUS binary */
-#ifdef USE_GPS_PROTO_UBLOX
-    { false, MODE_RXTX, &gpsRestartUBLOX, &gpsHandleUBLOX },
-#else
-    { false, 0,  NULL, NULL },
-#endif
-
     /* MSP GPS */
 #ifdef USE_GPS_PROTO_MSP
     { true, 0, &gpsRestartMSP, &gpsHandleMSP },

diff --git a/src/main/io/gps.h b/src/main/io/gps.h
@@ -34,7 +34,6 @@
 
 typedef enum {
     GPS_UBLOX = 0,
-    GPS_UBLOX7PLUS,
     GPS_MSP,
     GPS_FAKE,
     GPS_PROVIDER_COUNT

diff --git a/src/main/io/gps_ublox.c b/src/main/io/gps_ublox.c
@@ -1224,7 +1224,7 @@ STATIC_PROTOTHREAD(gpsProtocolStateThread)
         ptSemaphoreWait(semNewDataReady);
         gpsProcessNewSolutionData(false);
 
-        if ((gpsState.gpsConfig->autoConfig) && (gpsState.gpsConfig->provider == GPS_UBLOX || gpsState.gpsConfig->provider == GPS_UBLOX7PLUS)) {
+        if (gpsState.gpsConfig->autoConfig) {
             if ((millis() - gpsState.lastCapaPoolMs) > GPS_CAPA_INTERVAL) {
                 gpsState.lastCapaPoolMs = millis();
 
@@ -1271,7 +1271,7 @@ void gpsHandleUBLOX(void)
 
 bool isGpsUblox(void)
 {
-    if(gpsState.gpsPort != NULL && (gpsState.gpsConfig->provider == GPS_UBLOX || gpsState.gpsConfig->provider == GPS_UBLOX7PLUS)) {
+    if(gpsState.gpsPort != NULL && (gpsState.gpsConfig->provider == GPS_UBLOX)) {
         return true;
     }