merged multi-channel branch with a major refactor and half a year of updates

1 files changed, 10 insertions, 24 deletions

diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index ea2efac..64f006e 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -1,24 +1,8 @@
-/*
- * fsm-wdt.c: WDT (Watch Dog Timer) functions for SpaghettiMonster.
- *
- * Copyright (C) 2017 Selene ToyKeeper
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FSM_WDT_C
-#define FSM_WDT_C
+// fsm-wdt.c: WDT (Watch Dog Timer) functions for SpaghettiMonster.
+// Copyright (C) 2017-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
 
 #include <avr/interrupt.h>
 #include <avr/wdt.h>
@@ -138,10 +122,13 @@ void WDT_inner() {
         #ifndef USE_SLEEP_LVP
         return;  // no sleep LVP needed if nothing drains power while off
         #else
-        // stop here, usually...  but proceed often enough for sleep LVP to work
-        if (0 != (ticks_since_last & 0x3f)) return;
+        // stop here, usually...  except during the first few seconds asleep, 
+        // and once in a while afterward for sleep LVP
+        if ((ticks_since_last > (8 * SLEEP_TICKS_PER_SECOND))
+            && (0 != (ticks_since_last & 0x0f))) return;
 
         adc_trigger = 0;  // make sure a measurement will happen
+        adc_active_now = 1;  // use ADC noise reduction sleep mode
         ADC_on();  // enable ADC voltage measurement functions temporarily
         #endif
     }
@@ -208,4 +195,3 @@ void WDT_inner() {
     #endif
 }
 
-#endif