DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpsread.cpp: fix centiseconds if no PPS present

Browse Source
This commit is contained in:
cyberman54 2022-02-12 18:15:19 +01:00
parent bc4f2fbb95
commit 2d786967ea
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gpsread.cpp
View File

@ -91,7 +91,7 @@ void setTimePulse() {
void disableNmea() { void disableNmea() {
// for tinygps++ we need only $GPGGA and $GPRMC // tinygps++ processes only $GPGGA/$GNGGA and $GPRMC/$GNRMC
// thus, we disable all other NMEA messages // thus, we disable all other NMEA messages
// Array of two bytes for CFG-MSG packets payload. // Array of two bytes for CFG-MSG packets payload.
@ -234,6 +234,9 @@ time_t get_gpstime(uint16_t *msec) {
ESP_LOGD(TAG, "no PPS from GPS"); ESP_LOGD(TAG, "no PPS from GPS");
return 0; return 0;
} }
#else
// best guess top of second
*msec = gps.time.age() + gps.time.centisecond() * 10;
#endif #endif
return t; return t;
@ -249,26 +252,15 @@ void gps_loop(void *pvParameters) {
_ASSERT((uint32_t)pvParameters == 1); // FreeRTOS check _ASSERT((uint32_t)pvParameters == 1); // FreeRTOS check
while (1) {
while (cfg.payloadmask & GPS_DATA) {
// feed GPS decoder with serial NMEA data from GPS device // feed GPS decoder with serial NMEA data from GPS device
while (GPS_Serial.available()) { while (1) {
if (gps.encode(GPS_Serial.read())) { while (cfg.payloadmask & GPS_DATA) {
// show NMEA data, very noisy, for debugging GPS while (GPS_Serial.available())
// ESP_LOGV( gps.encode(GPS_Serial.read());
// TAG,
// "GPS NMEA data: chars %u / passed %u / failed: %u / with fix:
// %u", gps.charsProcessed(), gps.passedChecksum(),
// gps.failedChecksum(), gps.sentencesWithFix());
delay(5); // yield after each sentence to crack NMEA burst
}
} // read from serial buffer loop
delay(5); delay(5);
} }
delay(1000); delay(1000);
} // infinite while loop } // infinite while loop