mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-11-21 22:47:05 +00:00
GPS: GPS_BAUD_PROBE_LIST as a build flag for any NmeaGpsDriver; enable on Station G2/G3
The probe list was wired only in variants/promicro/target.cpp. It is now the default list of NmeaGpsDriver when GPS_BAUD_PROBE_LIST is set, so a variant enables baud autodetection with a build flag alone. Station G2 and G3 enable it: their Grove UART connector is used with M5Stack Unit GPS modules, which default to 115200.
This commit is contained in:
1 parent
f678f6ac15
commit
ef6ef2e9d2
4 files changed
+16
-7
No files matched your search
@@ -64,6 +64,18 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Optional rates detect() tries after GPS_BAUD_RATE, for GPS modules whose baud rate is
|
||||
// not known in advance (e.g. -D GPS_BAUD_PROBE_LIST=9600,115200,38400). Used by every
|
||||
// NmeaGpsDriver that does not pass its own list.
|
||||
#ifdef GPS_BAUD_PROBE_LIST
|
||||
static const uint32_t NMEA_GPS_PROBE_BAUDS[] = { GPS_BAUD_PROBE_LIST };
|
||||
#define GPS_PROBE_BAUDS NMEA_GPS_PROBE_BAUDS
|
||||
#define GPS_PROBE_COUNT ((uint8_t)(sizeof(NMEA_GPS_PROBE_BAUDS) / sizeof(NMEA_GPS_PROBE_BAUDS[0])))
|
||||
#else
|
||||
#define GPS_PROBE_BAUDS nullptr
|
||||
#define GPS_PROBE_COUNT 0
|
||||
#endif
|
||||
|
||||
#ifndef PIN_GPS_SWITCH
|
||||
#define PIN_GPS_SWITCH (-1)
|
||||
#endif
|
||||
@@ -199,7 +211,7 @@ public:
|
||||
uint32_t baudRate = GPS_BAUD_RATE,
|
||||
int hardwareEnablePin = PIN_GPS_SWITCH,
|
||||
int hardwareEnableActive = GPS_SWITCH_ACTIVE,
|
||||
const uint32_t* probeBauds = nullptr, uint8_t probeCount = 0)
|
||||
const uint32_t* probeBauds = GPS_PROBE_BAUDS, uint8_t probeCount = GPS_PROBE_COUNT)
|
||||
: _hardwareSerial(&serial), _peripheralPower(peripheralPower), _txPin(txPin), _rxPin(rxPin),
|
||||
_resetPin(resetPin), _enablePin(enablePin), _enableActive(enableActive),
|
||||
_resetActive(resetActive), _baudRate(baudRate),
|
||||
|
||||
@@ -12,12 +12,7 @@ VolatileRTCClock fallback_clock;
|
||||
AutoDiscoverRTCClock rtc_clock(fallback_clock);
|
||||
#if ENV_INCLUDE_GPS
|
||||
#include <helpers/sensors/MicroNMEALocationProvider.h>
|
||||
#ifdef GPS_BAUD_PROBE_LIST // e.g. -D GPS_BAUD_PROBE_LIST=9600,38400,115200
|
||||
static const uint32_t gps_probe_bauds[] = { GPS_BAUD_PROBE_LIST };
|
||||
NmeaGpsDriver gps_driver(Serial1, gps_probe_bauds, sizeof(gps_probe_bauds) / sizeof(gps_probe_bauds[0]));
|
||||
#else
|
||||
NmeaGpsDriver gps_driver(Serial1);
|
||||
#endif
|
||||
NmeaGpsDriver gps_driver(Serial1);
|
||||
MicroNMEALocationProvider nmea(gps_driver, &rtc_clock);
|
||||
EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
|
||||
#else
|
||||
|
||||
@@ -25,6 +25,7 @@ build_flags =
|
||||
-D PIN_USER_BTN=38
|
||||
-D PIN_GPS_RX=15
|
||||
-D PIN_GPS_TX=7
|
||||
-D GPS_BAUD_PROBE_LIST=9600,115200,38400 ; Grove UART GPS units (e.g. M5Stack Unit GPS v1.1) default to 115200
|
||||
-D SX126X_DIO2_AS_RF_SWITCH=true
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
|
||||
-D SX126X_CURRENT_LIMIT=140
|
||||
|
||||
@@ -29,6 +29,7 @@ build_flags =
|
||||
-D PIN_USER_BTN=38
|
||||
-D PIN_GPS_RX=15
|
||||
-D PIN_GPS_TX=7
|
||||
-D GPS_BAUD_PROBE_LIST=9600,115200,38400 ; Grove UART GPS units (e.g. M5Stack Unit GPS v1.1) default to 115200
|
||||
-D SX126X_DIO2_AS_RF_SWITCH=true
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
|
||||
-D SX126X_CURRENT_LIMIT=140
|
||||
|
||||
Reference in new issue
Block a user