From e509a9101996d737f8db0cccf2f6aaa7d1b168a9 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Mon, 5 Aug 2024 23:00:32 +0800 Subject: [PATCH] Fix UC6580 ifdefs (#4393) meshtastic/firmware#4319 added autodetect code for UC6580, and removed these ifdefs. However, they were inadvertantly re-added by #4328 . --- src/gps/GPS.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index d6ea2cb08..0d937ae63 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -400,8 +400,6 @@ bool GPS::setup() int msglen = 0; if (!didSerialInit) { -#if !defined(GPS_UC6580) - if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) { // if GPS_BAUDRATE is specified in variant (i.e. not 9600), skip to the specified rate. @@ -424,9 +422,6 @@ bool GPS::setup() } else { gnssModel = GNSS_MODEL_UNKNOWN; } -#else - gnssModel = GNSS_MODEL_UC6580; -#endif if (gnssModel == GNSS_MODEL_MTK) { /* @@ -1797,4 +1792,4 @@ void GPS::toggleGpsMode() enable(); } } -#endif // Exclude GPS \ No newline at end of file +#endif // Exclude GPS