pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 17:42:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Cleanup for Air530z GPS (#4344)

Browse Source 
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 <benmmeadors@gmail.com>
This commit is contained in:
Tom Fifield 2024-07-31 18:58:19 +08:00 committed by GitHub
parent 29fe6e7448
commit ce1eb149ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gps/GPS.cpp
View File

@ -400,12 +400,6 @@ bool GPS::setup()
int msglen = 0; int msglen = 0;
if (!didSerialInit) { 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 !defined(GPS_UC6580)
if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) { if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {
@ -784,7 +778,6 @@ bool GPS::setup()
LOG_INFO("GNSS module configuration saved!\n"); LOG_INFO("GNSS module configuration saved!\n");
} }
} }
#endif
didSerialInit = true; didSerialInit = true;
} }
@ -1191,10 +1184,6 @@ GnssModel_t GPS::probe(int serialSpeed)
_serial_gps->updateBaudRate(serialSpeed); _serial_gps->updateBaudRate(serialSpeed);
} }
#endif #endif
#ifdef GNSS_AIROHA
return GNSS_MODEL_UNKNOWN;
#else
#ifdef GPS_DEBUG #ifdef GPS_DEBUG
for (int i = 0; i < 20; i++) { for (int i = 0; i < 20; i++) {
getACK("$GP", 200); getACK("$GP", 200);
@ -1359,7 +1348,6 @@ GnssModel_t GPS::probe(int serialSpeed)
} }
return GNSS_MODEL_UBLOX; return GNSS_MODEL_UBLOX;
#endif // !GNSS_Airoha
} }
GPS *GPS::createGps() GPS *GPS::createGps()