Merge branch 'meshtastic:master' into master

This commit is contained in:
Mictronics 2024-01-27 09:11:09 +01:00 committed by GitHub
commit c5e963615f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -16,7 +16,7 @@
#define GPS_RESET_MODE HIGH
#endif
#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(aLinuxInputImpl)
#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
HardwareSerial *GPS::_serial_gps = &Serial1;
#else
HardwareSerial *GPS::_serial_gps = NULL;
@ -1286,4 +1286,4 @@ int32_t GPS::disable()
setAwake(false);
return INT32_MAX;
}
}