rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-06 18:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug #376 - wip time only mode now works

Browse Source
This commit is contained in:
Kevin Hester
2020-10-06 06:27:46 +08:00
parent f6861a8fe2
commit ef146fc0b5
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/software/gps-todo.txt
View File

@@ -3,14 +3,8 @@ gps todo - bug 376
for taiwan region: for taiwan region:
bin/run.sh --set region 8 bin/run.sh --set region 8
fix poll interval for sending commands to ublox
change defaults to 2 min change defaults to 2 min
properly handle time only modes
force gps sleep when in LightSleep and force wake only once <- confirm
fix has_gps based on new logic fix has_gps based on new logic
have loop methods return allowable sleep time (from their perspective) have loop methods return allowable sleep time (from their perspective)

2
proto

Submodule proto updated: 0d4ad90e4a...aa018c38de

13
src/gps/GPS.cpp
View File

@@ -147,10 +147,6 @@ uint32_t GPS::getWakeTime() const
{ {
uint32_t t = radioConfig.preferences.gps_attempt_time; uint32_t t = radioConfig.preferences.gps_attempt_time;
auto op = getGpsOp();
if ((timeSetFromGPS && op == GpsOperation_GpsOpTimeOnly) || (op == GpsOperation_GpsOpDisabled))
t = UINT32_MAX; // Sleep forever now
if (t == UINT32_MAX) if (t == UINT32_MAX)
return t; // already maxint return t; // already maxint
@@ -168,12 +164,15 @@ uint32_t GPS::getSleepTime() const
{ {
uint32_t t = radioConfig.preferences.gps_update_interval; uint32_t t = radioConfig.preferences.gps_update_interval;
auto op = getGpsOp();
if ((timeSetFromGPS && op == GpsOperation_GpsOpTimeOnly) || (op == GpsOperation_GpsOpDisabled))
t = UINT32_MAX; // Sleep forever now
if (t == UINT32_MAX) if (t == UINT32_MAX)
return t; // already maxint return t; // already maxint
// fixme check modes
if (t == 0) if (t == 0)
t = 30; // 2 mins t = 2 * 60; // 2 mins
t *= 1000; t *= 1000;
@@ -242,7 +241,7 @@ void GPS::loop()
void GPS::forceWake(bool on) void GPS::forceWake(bool on)
{ {
if (on) { if (on) {
DEBUG_MSG("llowing GPS lock\n"); DEBUG_MSG("Allowing GPS lock\n");
// lastSleepStartMsec = 0; // Force an update ASAP // lastSleepStartMsec = 0; // Force an update ASAP
wakeAllowed = true; wakeAllowed = true;
} else { } else {