From ce1eb149ac0b2e326010a850e7a4d3488d7390d9 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Wed, 31 Jul 2024 18:58:19 +0800 Subject: [PATCH] Cleanup for Air530z GPS (#4344) It turns out that the Air530z is a GNSS_MODEL_MTK. Our existing code detects and configures it properly. This patch removes a couple of AIROHA ifdefs since they are not required for a working GPS. Co-authored-by: Ben Meadors --- src/gps/GPS.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 091b4e6bcf..d6ea2cb08a 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -400,12 +400,6 @@ bool GPS::setup() int msglen = 0; if (!didSerialInit) { -#ifdef GNSS_AIROHA - if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) { - probe(GPS_BAUDRATE); - LOG_INFO("GPS setting to %d.\n", GPS_BAUDRATE); - } -#else #if !defined(GPS_UC6580) if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) { @@ -784,7 +778,6 @@ bool GPS::setup() LOG_INFO("GNSS module configuration saved!\n"); } } -#endif didSerialInit = true; } @@ -1191,10 +1184,6 @@ GnssModel_t GPS::probe(int serialSpeed) _serial_gps->updateBaudRate(serialSpeed); } #endif -#ifdef GNSS_AIROHA - - return GNSS_MODEL_UNKNOWN; -#else #ifdef GPS_DEBUG for (int i = 0; i < 20; i++) { getACK("$GP", 200); @@ -1359,7 +1348,6 @@ GnssModel_t GPS::probe(int serialSpeed) } return GNSS_MODEL_UBLOX; -#endif // !GNSS_Airoha } GPS *GPS::createGps() @@ -1809,4 +1797,4 @@ void GPS::toggleGpsMode() enable(); } } -#endif // Exclude GPS +#endif // Exclude GPS \ No newline at end of file