Skip to content

fix bugs I noticed while testing a virgin tbeam #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
geeksville merged 4 commits into from
Apr 5, 2020
Merged

fix bugs I noticed while testing a virgin tbeam #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1cb45a
string typo
geeksville Apr 5, 2020
07a8972
NEO-6M gps with empty backup batteries give super invalid times
geeksville Apr 5, 2020
63e1a3f
always set time from GPS if we can
geeksville Apr 5, 2020
2e82bf3
Merge remote-tracking branch 'root/master'
geeksville Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/GPS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

HardwareSerial _serial_gps(GPS_SERIAL_NUM);

RTC_DATA_ATTR bool timeSetFromGPS; // We only reset our time once per _boot_ after that point just run from the internal clock
// (even across sleeps)
bool timeSetFromGPS; // We try to set our time from GPS each time we wake from sleep

GPS gps;

Expand Down Expand Up @@ -176,8 +175,10 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
tv.tv_usec = 0; // time.centisecond() * (10 / 1000);

DEBUG_MSG("Got time from GPS month=%d, year=%d, unixtime=%ld\n", t.tm_mon, t.tm_year, tv.tv_sec);

perhapsSetRTC(&tv);
if (t.tm_year < 0 || t.tm_year >= 300)
DEBUG_MSG("Ignoring invalid GPS time\n");
else
perhapsSetRTC(&tv);
}

if ((fixtype >= 3 && fixtype <= 4) && ublox.getP()) // rd fixes only
Expand Down
2 changes: 1 addition & 1 deletion src/MeshRadio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ void MeshRadio::loop()
// into CustomRF95
uint32_t now = millis();
if (lastTxStart != 0 && (now - lastTxStart) > TX_WATCHDOG_TIMEOUT && radioIf.mode() == RHGenericDriver::RHModeTx) {
DEBUG_MSG("ERROR! Bug! Tx packet took too long to send, forcing radio into rx mode");
DEBUG_MSG("ERROR! Bug! Tx packet took too long to send, forcing radio into rx mode\n");
radioIf.setModeRx();
if (radioIf.sendingPacket) { // There was probably a packet we were trying to send, free it
radioIf.pool.release(radioIf.sendingPacket);
Expand Down