Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
6652809490
|
@ -350,6 +350,10 @@ private:
|
||||||
LOG_DEBUG(GwLog::DEBUG, "failed to parse RMC %s", msg.line);
|
LOG_DEBUG(GwLog::DEBUG, "failed to parse RMC %s", msg.line);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (status != 'A' && status != 'a'){
|
||||||
|
LOG_DEBUG(GwLog::DEBUG, "invalid status %c for RMC %s",status, msg.line);
|
||||||
|
return;
|
||||||
|
}
|
||||||
tN2kMsg n2kMsg;
|
tN2kMsg n2kMsg;
|
||||||
if (
|
if (
|
||||||
UD(GPST) &&
|
UD(GPST) &&
|
||||||
|
@ -750,6 +754,10 @@ private:
|
||||||
LOG_DEBUG(GwLog::DEBUG, "failed to parse GGA %s", msg.line);
|
LOG_DEBUG(GwLog::DEBUG, "failed to parse GGA %s", msg.line);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (GPSQualityIndicator == 0){
|
||||||
|
LOG_DEBUG(GwLog::DEBUG, "quality 0 (no fix) for GGA %s", msg.line);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (! updateDouble(boatData->GPST,GPSTime,msg.sourceId)) return;
|
if (! updateDouble(boatData->GPST,GPSTime,msg.sourceId)) return;
|
||||||
if (! updateDouble(boatData->LAT,Latitude,msg.sourceId)) return;
|
if (! updateDouble(boatData->LAT,Latitude,msg.sourceId)) return;
|
||||||
if (! updateDouble(boatData->LON,Longitude,msg.sourceId)) return;
|
if (! updateDouble(boatData->LON,Longitude,msg.sourceId)) return;
|
||||||
|
|
|
@ -20,12 +20,11 @@ extra_configs=
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps =
|
lib_deps =
|
||||||
ttlappalainen/NMEA2000-library @ ^4.17.2
|
ttlappalainen/NMEA2000-library @ 4.17.2
|
||||||
#ttlappalainen/NMEA2000_esp32 @ ^1.0.3
|
ttlappalainen/NMEA0183 @ 1.7.1
|
||||||
ttlappalainen/NMEA0183 @ ^1.7.1
|
bblanchon/ArduinoJson@6.18.5
|
||||||
bblanchon/ArduinoJson@^6.18.5
|
ottowinter/ESPAsyncWebServer-esphome@2.0.1
|
||||||
ottowinter/ESPAsyncWebServer-esphome@^2.0.1
|
fastled/FastLED @ 3.4.0
|
||||||
fastled/FastLED @ ^3.4.0
|
|
||||||
board_build.embed_files =
|
board_build.embed_files =
|
||||||
lib/generated/index.html.gz
|
lib/generated/index.html.gz
|
||||||
lib/generated/index.js.gz
|
lib/generated/index.js.gz
|
||||||
|
|
Loading…
Reference in New Issue