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

don't sleep if user pressed button recently

Browse Source
This commit is contained in:
geeksville
2020-02-12 14:29:35 -08:00
parent cbe2b8cafa
commit 56f884cd10
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.ino
View File

@@ -434,7 +434,7 @@ void loop()
// if user presses button for more than 3 secs, discard our network prefs and reboot (FIXME, use a debounce lib instead of this boilerplate)
static bool wasPressed = false;
static uint32_t minPressMs; // what tick should we call this press long enough
static uint32_t lastPingMs;
static uint32_t lastPingMs, lastPressMs;
if (!digitalRead(BUTTON_PIN))
{
if (!wasPressed)
@@ -444,6 +444,7 @@ void loop()
wasPressed = true;
uint32_t now = millis();
lastPressMs = now;
minPressMs = now + 3000;
if (now - lastPingMs > 60 * 1000)
@@ -470,8 +471,8 @@ void loop()
#endif
#ifdef MINWAKE_MSECS
// Don't deepsleep if we have USB power
if (millis() > MINWAKE_MSECS && !isCharging)
// Don't deepsleep if we have USB power or if the user as pressed a button recently
if (millis() - lastPressMs > MINWAKE_MSECS && !isCharging)
{
sleep();
}