pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-14 17:12:08 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

always use gps.isConnected to check for GPS, it is the only thing

Browse Source 
guaranteed to be fresh and accurate
This commit is contained in:
geeksville 2020-03-27 12:32:18 -07:00
parent cc3bac7ea0
commit a0c97825e8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MeshService.cpp
View File

@ -151,7 +151,7 @@ void MeshService::handleFromRadio(MeshPacket *mp)
mp->rx_time = gps.getValidTime(); // store the arrival timestamp for the phone mp->rx_time = gps.getValidTime(); // store the arrival timestamp for the phone
// If it is a position packet, perhaps set our clock (if we don't have a GPS of our own, otherwise wait for that to work) // If it is a position packet, perhaps set our clock (if we don't have a GPS of our own, otherwise wait for that to work)
if (!myNodeInfo.has_gps) if (!gps.isConnected)
handleIncomingPosition(mp); handleIncomingPosition(mp);
else { else {
DEBUG_MSG("Ignoring incoming time, because we have a GPS\n"); DEBUG_MSG("Ignoring incoming time, because we have a GPS\n");
@ -263,7 +263,7 @@ void MeshService::sendToMesh(MeshPacket *p)
// nodes shouldn't trust it anyways) Note: for now, we allow a device with a local GPS to include the time, so that gpsless // nodes shouldn't trust it anyways) Note: for now, we allow a device with a local GPS to include the time, so that gpsless
// devices can get time. // devices can get time.
if (p->has_payload && p->payload.which_variant == SubPacket_position_tag) { if (p->has_payload && p->payload.which_variant == SubPacket_position_tag) {
if (!myNodeInfo.has_gps) { if (!gps.isConnected) {
DEBUG_MSG("Stripping time %u from position send\n", p->payload.variant.position.time); DEBUG_MSG("Stripping time %u from position send\n", p->payload.variant.position.time);
p->payload.variant.position.time = 0; p->payload.variant.position.time = 0;
} else } else

2
src/screen.cpp
View File

@ -393,7 +393,7 @@ static void drawDebugInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16
snprintf(batStr, sizeof(batStr), "Batt %x%%", (isCharging << 1) + isUSBPowered); snprintf(batStr, sizeof(batStr), "Batt %x%%", (isCharging << 1) + isUSBPowered);
static char gpsStr[20]; static char gpsStr[20];
if (myNodeInfo.has_gps) if (gps.isConnected)
snprintf(gpsStr, sizeof(gpsStr), "GPS %d%%", snprintf(gpsStr, sizeof(gpsStr), "GPS %d%%",
75); // FIXME, use something based on hdop 75); // FIXME, use something based on hdop
else else