Merge lp:~pakutrai/flashlight-firmware/fsm into lp:~toykeeper/flashlight-firmware/fsm

[0-8-15 User]

[lp:~pakutrai/flashlight-firmware/fsm]

465. By 0-8-15 User on 2020-01-30

New thermal regulation

Unmerged revisions

465. By 0-8-15 User on 2020-01-30

New thermal regulation

=== modified file 'ToyKeeper/spaghetti-monster/anduril/anduril.c'
--- ToyKeeper/spaghetti-monster/anduril/anduril.c	2019-12-04 09:00:16 +0000
+++ ToyKeeper/spaghetti-monster/anduril/anduril.c	2020-01-30 10:15:24 +0000
@@ -22,11 +22,10 @@
 // Anduril config file name (set it here or define it at the gcc command line)
 //#define CONFIGFILE cfg-blf-q8.h
 
-#define USE_LVP  // FIXME: won't build when this option is turned off
+#define USE_LVP
 
 // parameters for this defined below or per-driver
 #define USE_THERMAL_REGULATION
-#define DEFAULT_THERM_CEIL 45  // try not to get hotter than this
 
 #define USE_FACTORY_RESET
 //#define USE_SOFT_FACTORY_RESET  // only needed on models which can't use hold-button-at-boot
@@ -957,80 +956,41 @@
         if (arg == TICKS_PER_SECOND) ramp_direction = 1;
         #endif
         #ifdef USE_SET_LEVEL_GRADUALLY
-        // make thermal adjustment speed scale with magnitude
-        // also, adjust slower when going up
-        if ((arg & 1) &&
-            ((actual_level < THERM_FASTER_LEVEL) ||
-             (actual_level < gradual_target))) {
-            return MISCHIEF_MANAGED;  // adjust slower when not a high mode
-        }
-        #ifdef THERM_HARD_TURBO_DROP
-        else if ((! (actual_level < THERM_FASTER_LEVEL))
-                && (actual_level > gradual_target)) {
-            gradual_tick();
-        }
-        else {
-        #endif
-        // [int(62*4 / (x**0.8)) for x in (1,2,4,8,16,32,64,128)]
-        //uint8_t intervals[] = {248, 142, 81, 46, 26, 15, 8, 5};
-        // [int(62*4 / (x**0.9)) for x in (1,2,4,8,16,32,64,128)]
-        //uint8_t intervals[] = {248, 132, 71, 38, 20, 10, 5, 3};
-        // [int(62*4 / (x**0.95)) for x in (1,2,4,8,16,32,64,128)]
-        uint8_t intervals[] = {248, 128, 66, 34, 17, 9, 4, 2};
-        uint8_t diff;
-        static uint8_t ticks_since_adjust = 0;
-        if (gradual_target > actual_level) {
-            // rise at half speed (skip half the frames)
-            if (arg & 2) return MISCHIEF_MANAGED;
-            diff = gradual_target - actual_level;
-        } else {
-            diff = actual_level - gradual_target;
-        }
-        ticks_since_adjust ++;
-        // if there's any adjustment to be made, make it
+        int16_t diff = gradual_target - actual_level;
+        static uint16_t ticks_since_adjust = 0;
+        ticks_since_adjust++;
         if (diff) {
-            uint8_t magnitude = 0;
-            #ifndef THERM_HARD_TURBO_DROP
-            // if we're on a really high mode, drop faster
-            if ((actual_level >= THERM_FASTER_LEVEL)
-                && (actual_level > gradual_target)) { magnitude ++; }
-            #endif
+            uint16_t ticks_per_adjust = 256;
+            if (diff < 0) {
+                if (actual_level > THERM_FASTER_LEVEL) {
+                    #ifdef THERM_HARD_TURBO_DROP
+                    ticks_per_adjust >>= 2;
+                    #endif
+                    ticks_per_adjust >>= 2;
+                }
+            } else {
+                // rise at half speed
+                ticks_per_adjust <<= 1;
+            }
             while (diff) {
-                magnitude ++;
-                diff >>= 1;
+                ticks_per_adjust >>= 1;
+                diff /= 2; // must not be shifted right!
             }
-            uint8_t ticks_per_adjust = intervals[magnitude];
             if (ticks_since_adjust > ticks_per_adjust)
             {
                 gradual_tick();
                 ticks_since_adjust = 0;
             }
-            //if (!(arg % ticks_per_adjust)) gradual_tick();
-        }
-        #ifdef THERM_HARD_TURBO_DROP
-        }
-        #endif
+        }
         #endif  // ifdef USE_SET_LEVEL_GRADUALLY
         return MISCHIEF_MANAGED;
     }
     #endif
     #ifdef USE_THERMAL_REGULATION
-    // overheating: drop by an amount proportional to how far we are above the ceiling
     else if (event == EV_temperature_high) {
         #if 0
         blip();
         #endif
-        #ifdef THERM_HARD_TURBO_DROP
-        //if (actual_level > THERM_FASTER_LEVEL) {
-        if (actual_level == MAX_LEVEL) {
-            #ifdef USE_SET_LEVEL_GRADUALLY
-            set_level_gradually(THERM_FASTER_LEVEL);
-            target_level = THERM_FASTER_LEVEL;
-            #else
-            set_level_and_therm_target(THERM_FASTER_LEVEL);
-            #endif
-        } else
-        #endif
         if (actual_level > MIN_THERM_STEPDOWN) {
             int16_t stepdown = actual_level - arg;
             if (stepdown < MIN_THERM_STEPDOWN) stepdown = MIN_THERM_STEPDOWN;
@@ -1043,8 +1003,6 @@
         }
         return MISCHIEF_MANAGED;
     }
-    // underheating: increase slowly if we're lower than the target
-    //               (proportional to how low we are)
     else if (event == EV_temperature_low) {
         #if 0
         blip();
@@ -1598,11 +1556,13 @@
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
+    #ifdef USE_BATTCHECK
     // 2 clicks: battcheck mode
     else if (event == EV_2clicks) {
         set_state(battcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
+    #endif
     // 4 clicks: thermal config mode
     else if (event == EV_4clicks) {
         push_state(thermal_config_state, 0);
@@ -1628,7 +1588,7 @@
         set_state(sos_state, 0);
         #elif defined(USE_THERMAL_REGULATION)
         set_state(tempcheck_state, 0);
-        #else
+        #elif defined(USE_BATTCHECK)
         set_state(battcheck_state, 0);
         #endif
         return MISCHIEF_MANAGED;
@@ -2010,6 +1970,7 @@
         return MISCHIEF_MANAGED;
     }
     #endif
+    #ifdef USE_LVP
     // low voltage is handled specially in muggle mode
     else if(event == EV_voltage_low) {
         uint8_t lvl = (actual_level >> 1) + (actual_level >> 2);
@@ -2020,6 +1981,7 @@
         }
         return MISCHIEF_MANAGED;
     }
+    #endif
 
     return EVENT_NOT_HANDLED;
 }

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d18.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d18.h	2019-11-25 04:35:40 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d18.h	2020-01-30 10:15:24 +0000
@@ -42,5 +42,3 @@
 
 // stop panicking at about ~40% power or ~5000 lm
 #define THERM_FASTER_LEVEL 125
-// optional, makes initial turbo step-down faster so first peak isn't as hot
-//#define THERM_HARD_TURBO_DROP

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4.h	2019-08-05 07:40:20 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4.h	2020-01-30 10:15:24 +0000
@@ -24,8 +24,4 @@
 
 // stop panicking at ~30% power or ~1200 lm
 #define THERM_FASTER_LEVEL 105
-// respond to thermal changes faster
-#define THERMAL_WARNING_SECONDS 3
-#define THERMAL_UPDATE_SPEED 1
-#define THERM_PREDICTION_STRENGTH 4
 

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4s.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4s.h	2019-11-15 02:28:32 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4s.h	2020-01-30 10:15:24 +0000
@@ -42,8 +42,3 @@
 #ifdef THERM_HARD_TURBO_DROP
 #undef THERM_HARD_TURBO_DROP
 #endif
-
-#define THERMAL_WARNING_SECONDS 3
-#define THERMAL_UPDATE_SPEED 2
-#define THERM_PREDICTION_STRENGTH 4
-

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4sv2-219.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4sv2-219.h	2019-08-29 10:57:54 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4sv2-219.h	2020-01-30 10:15:24 +0000
@@ -8,3 +8,6 @@
 #define PWM1_LEVELS 1,1,2,2,3,3,4,5,5,6,7,8,9,10,11,12,13,17,18,19,20,21,22,24,26,28,30,33,35,38,41,44,47,50,54,57,61,65,69,74,79,84,89,94,100,106,113,119,126,134,142,150,158,167,176,186,196,207,218,230,242,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255
 #define PWM2_LEVELS 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,16,21,25,30,35,41,46,52,58,64,71,77,84,92,99,107,115,124,133,142,151,161,172,182,193,205,217,229,242,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255
 #define PWM3_LEVELS 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,4,6,7,9,10,12,13,15,17,18,20,22,24,26,28,30,33,35,37,40,43,45,48,50,53,56,59,62,65,69,72,76,80,83,87,91,95,99,104,108,113,117,123,127,132,138,143,148,154,160,166,172,178,185,192
+
+#undef THERM_LOOKAHEAD
+#define THERM_LOOKAHEAD 3

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4sv2.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4sv2.h	2019-11-15 02:28:32 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4sv2.h	2020-01-30 10:15:24 +0000
@@ -42,16 +42,6 @@
 // stop panicking at ~50% power or ~2000 lm
 #define THERM_FASTER_LEVEL 130
 
-// no need to be extra-careful on this light
-#ifdef THERM_HARD_TURBO_DROP
-#undef THERM_HARD_TURBO_DROP
-#endif
-
-// respond to thermal changes faster
-#define THERMAL_WARNING_SECONDS 3
-#define THERMAL_UPDATE_SPEED 2
-#define THERM_PREDICTION_STRENGTH 4
-
 // easier access to thermal config mode, for Emisar
 #define USE_TENCLICK_THERMAL_CONFIG
 
@@ -59,9 +49,7 @@
 #undef BLINK_AT_RAMP_MIDDLE
 #endif
 
+#define THERM_LOOKAHEAD 6
+
 // seems relevant on attiny1634
 #define THERM_CAL_OFFSET 5
-
-// attiny1634 has enough space to smooth out voltage readings
-#define USE_VOLTAGE_LOWPASS
-

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4v2-219.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4v2-219.h	2019-08-05 07:40:20 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4v2-219.h	2020-01-30 10:15:24 +0000
@@ -6,3 +6,6 @@
 #undef PWM2_LEVELS
 #define PWM1_LEVELS 1,1,2,2,3,3,4,4,5,6,7,8,9,10,12,13,14,15,17,19,20,22,24,26,29,31,34,36,39,42,45,48,51,55,59,62,66,70,75,79,84,89,93,99,104,110,115,121,127,134,140,147,154,161,168,176,184,192,200,209,217,226,236,245,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255
 #define PWM2_LEVELS 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,3,5,6,6,8,9,10,11,12,14,15,16,18,18,20,21,23,24,26,27,29,30,32,33,36,37,39,41,43,44,46,48,50,52,54,56,58,61,63,65,67,70,72,74,77,79,82,84,86,89,92,95,97,100,103,106,108,111,114,117,120,124,127,130,133,137,140,144,147,151,154,157,161,165,169,172,176,180,184,188,192
+
+#undef THERM_LOOKAHEAD
+#define THERM_LOOKAHEAD 4

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4v2.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4v2.h	2019-11-24 23:21:40 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-emisar-d4v2.h	2020-01-30 10:15:24 +0000
@@ -37,22 +37,12 @@
 #define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
 #define RAMP_DISCRETE_STEPS 7
 
-// optional, makes initial turbo step-down faster so first peak isn't as hot
-// the D4 runs very very hot, so be extra careful
-//#define THERM_HARD_TURBO_DROP
-
 // stop panicking at ~30% power or ~1200 lm
 #define THERM_FASTER_LEVEL 105
-// respond to thermal changes faster
-#define THERMAL_WARNING_SECONDS 3
-#define THERMAL_UPDATE_SPEED 1
-#define THERM_PREDICTION_STRENGTH 4
-//#define THERM_RESPONSE_MAGNITUDE 128
 
 // easier access to thermal config mode, for Emisar
 #define USE_TENCLICK_THERMAL_CONFIG
 
+#define THERM_LOOKAHEAD 6
+
 #define THERM_CAL_OFFSET 5
-
-// attiny1634 has enough space to smooth out voltage readings
-#define USE_VOLTAGE_LOWPASS

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-ff-pl47.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-ff-pl47.h	2019-05-22 20:42:02 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-ff-pl47.h	2020-01-30 10:15:24 +0000
@@ -61,11 +61,6 @@
 // regulate down faster when the FET is active, slower otherwise
 #define THERM_FASTER_LEVEL 135  // throttle back faster when high
 
-// play it safe, don't try to regulate above the recommended safe level
-#ifdef THERM_HARD_TURBO_DROP
-#undef THERM_HARD_TURBO_DROP
-#endif
-
 // don't do this
 #undef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_CEILING

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-ff-pl47g2.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-ff-pl47g2.h	2019-12-11 07:59:20 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-ff-pl47g2.h	2020-01-30 10:15:24 +0000
@@ -49,11 +49,6 @@
 // regulate down faster when the FET is active, slower otherwise
 #define THERM_FASTER_LEVEL 135  // throttle back faster when high
 
-// hard drop doesn't seem to be needed on this light
-#ifdef THERM_HARD_TURBO_DROP
-#undef THERM_HARD_TURBO_DROP
-#endif
-
 // don't do this
 #undef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_CEILING

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-ff-rot66.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-ff-rot66.h	2019-05-23 00:23:25 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-ff-rot66.h	2020-01-30 10:15:24 +0000
@@ -38,9 +38,6 @@
 // regulate down faster when the FET is active, slower otherwise
 #define THERM_FASTER_LEVEL 130  // throttle back faster when high
 
-// play it safe, don't try to regulate above the recommended safe level
-//#define THERM_HARD_TURBO_DROP
-
 // don't do this
 #undef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_CEILING

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h	2019-11-25 04:35:40 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h	2020-01-30 10:15:24 +0000
@@ -48,8 +48,3 @@
 
 #define USE_TENCLICK_THERMAL_CONFIG  // by request
 #define THERM_FASTER_LEVEL 130  // throttle back faster when high
-//#define THERM_HARD_TURBO_DROP  // this light is massively overpowered
-#define THERMAL_WARNING_SECONDS 1  // FIXME: increase by 2 after merging newer code
-//#define THERMAL_UPDATE_SPEED 1
-//#define THERM_PREDICTION_STRENGTH 4
-

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-mateminco-mf01s.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-mateminco-mf01s.h	2019-11-25 04:35:40 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-mateminco-mf01s.h	2020-01-30 10:15:24 +0000
@@ -41,5 +41,3 @@
 
 #define USE_TENCLICK_THERMAL_CONFIG  // by request
 #define THERM_FASTER_LEVEL 125  // throttle back faster when high (>6000 lm)
-#define THERM_HARD_TURBO_DROP  // this light is massively overpowered
-

=== modified file 'ToyKeeper/spaghetti-monster/anduril/cfg-sofirn-sp36.h'
--- ToyKeeper/spaghetti-monster/anduril/cfg-sofirn-sp36.h	2019-03-18 10:06:37 +0000
+++ ToyKeeper/spaghetti-monster/anduril/cfg-sofirn-sp36.h	2020-01-30 10:15:24 +0000
@@ -28,10 +28,3 @@
 #undef THERM_FASTER_LEVEL
 #endif
 #define THERM_FASTER_LEVEL 130
-
-// be extra-careful at high levels
-// (or not... this host seems to heat up pretty slowly)
-//#ifndef THERM_HARD_TURBO_DROP
-//#define THERM_HARD_TURBO_DROP
-//#endif
-

=== modified file 'ToyKeeper/spaghetti-monster/fsm-adc.c'
--- ToyKeeper/spaghetti-monster/fsm-adc.c	2019-12-18 01:17:58 +0000
+++ ToyKeeper/spaghetti-monster/fsm-adc.c	2020-01-30 10:15:24 +0000
@@ -20,6 +20,7 @@
 #ifndef FSM_ADC_C
 #define FSM_ADC_C
 
+#include <stdlib.h>
 
 static inline void set_admux_therm() {
     #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 1634)
@@ -30,7 +31,6 @@
     #else
         #error Unrecognized MCU type
     #endif
-    adc_channel = 1;
 }
 
 inline void set_admux_voltage() {
@@ -53,7 +53,6 @@
     #else
         #error Unrecognized MCU type
     #endif
-    adc_channel = 0;
 }
 
 inline void ADC_start_measurement() {
@@ -64,6 +63,14 @@
     #endif
 }
 
+inline void ADC_stop_measurement() {
+    #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 841) || (ATTINY == 1634)
+        ADCSRA &= ~(1 << ADIF | 1 << ADIE);
+    #else
+        #error unrecognized MCU type
+    #endif
+}
+
 // set up ADC for reading battery voltage
 inline void ADC_on()
 {
@@ -98,57 +105,63 @@
     ADCSRA &= ~(1<<ADEN); //ADC off
 }
 
-#ifdef USE_VOLTAGE_DIVIDER
-static inline uint8_t calc_voltage_divider(uint16_t value) {
-    // use 9.7 fixed-point to get sufficient precision
-    uint16_t adc_per_volt = ((ADC_44<<7) - (ADC_22<<7)) / (44-22);
-    // incoming value is 8.2 fixed-point, so shift it 2 bits less
-    uint8_t result = ((value<<5) / adc_per_volt) + VOLTAGE_FUDGE_FACTOR;
-    return result;
-}
-#endif
-
-// Each full cycle runs 15.6X per second with just voltage enabled,
-// or 7.8X per second with voltage and temperature.
-#if defined(USE_LVP) && defined(USE_THERMAL_REGULATION)
-#define ADC_CYCLES_PER_SECOND 8
-#else
-#define ADC_CYCLES_PER_SECOND 16
-#endif
-
-#ifdef USE_THERMAL_REGULATION
-#define ADC_STEPS 2
-#else
-#define ADC_STEPS 1
-#endif
-
 // happens every time the ADC sampler finishes a measurement
 ISR(ADC_vect) {
-    #ifdef USE_PSEUDO_RAND
-    // real-world entropy makes this a true random, not pseudo
-    pseudo_rand_seed += ADCL;
-    #endif
-
-    if (irq_adc_stable) {  // skip first result; it's junk
-        adc_values[adc_channel] = ADC;  // save this for later use
-        irq_adc = 1;  // a value was saved, so trigger deferred logic
-    }
-    irq_adc_stable = 1;
-
-    // start another measurement
-    // (is explicit because it otherwise doesn't seem to happen during standby mode)
-    ADC_start_measurement();
+    #define ADC_PLUS_BITS 8 // oversampling strength
+    static uint8_t  adc_stable = 0;
+    static uint16_t adc_sum_counter = 0;
+    static uint32_t adc_sum = 0;
+
+    ADC_start_measurement(); // mandatory in standby mode
+
+    if (!adc_stable) {
+        adc_stable = 1;
+        #ifdef USE_PSEUDO_RAND
+        // real-world entropy makes this a true random, not pseudo
+        pseudo_rand_seed += ADCL;
+        #endif
+        return;
+    }
+
+    if (adc_sum_counter < 10 * (1 << ADC_PLUS_BITS)) {
+        adc_sum += ADC; // latest 10-bit ADC reading
+        adc_sum_counter++;
+        if (!go_to_standby) return;
+    }
+    adc_10x = go_to_standby ? ADC * 10 : adc_sum >> ADC_PLUS_BITS;
+    adc_sum_counter = adc_sum = 0;
+
+    adc_stable = 0; // set the dirty flag for the next sequence
+    irq_adc = 1; // enough samples accumulated, trigger deferred logic
+
+    ADC_stop_measurement(); // abort free running mode
 }
 
 void ADC_inner() {
     irq_adc = 0;  // event handled
 
-    // the ADC triggers repeatedly when it's on, but we only want one value
-    // (so ignore everything after the first value, until it's manually reset)
-    if (! adcint_enable) return;
+    // what is being measured? 0 = battery voltage, 1 = temperature
+    static uint8_t adc_type = 0;
 
-    // disable after one iteration
-    adcint_enable = 0;
+    if (!adc_type) {  // voltage
+        #if defined(USE_LVP) || defined(USE_SLEEP_LVP) || defined(USE_BATTCHECK)
+            ADC_voltage_handler();
+        #endif
+        #ifdef USE_THERMAL_REGULATION
+            if (!go_to_standby) {  // only measure battery voltage while asleep
+                set_admux_therm();
+                adc_type = 1;
+            }
+        #endif
+    } else {  // temperature
+        #ifdef USE_THERMAL_REGULATION
+            ADC_temperature_handler();
+            #if defined(USE_LVP) || defined(USE_SLEEP_LVP) || defined(USE_BATTCHECK)
+            set_admux_voltage();
+            #endif
+            adc_type = 0; // always skip one cycle, even if we don't measure battery voltage
+        #endif
+    }
 
     #ifdef TICK_DURING_STANDBY
         // in sleep mode, turn off after just one measurement
@@ -156,74 +169,17 @@
         // (and the usual standby level is only ~20 uA)
         if (go_to_standby) ADC_off();
     #endif
-
-    // what is being measured? 0 = battery voltage, 1 = temperature
-    static uint8_t adc_step = 0;
-
-    #ifdef USE_LVP
-    if (0 == adc_step) {  // voltage
-        ADC_voltage_handler();
-    }
-    #endif
-
-    #ifdef USE_THERMAL_REGULATION
-    else if (1 == adc_step) {  // temperature
-        ADC_temperature_handler();
-    }
-    #endif
-
-    #if defined(TICK_DURING_STANDBY) && defined(USE_SLEEP_LVP)
-    // only measure battery voltage while asleep
-    if (go_to_standby) adc_step = 0;
-    else
-    #endif
-
-    adc_step = (adc_step + 1) & (ADC_STEPS-1);
-
-    // set the correct type of measurement for next time
-    #ifdef USE_THERMAL_REGULATION
-        #ifdef USE_LVP
-        if (0 == adc_step) set_admux_voltage();
-        else set_admux_therm();
-        #else
-        //set_admux_therm();
-        #error "USE_THERMAL_REGULATION set without USE_LVP"
-        #endif
-    #else
-        #ifdef USE_LVP
-        set_admux_voltage();
-        #endif
-    #endif
-
-    irq_adc_stable = 0;  // first result is unstable
 }
 
-
-#ifdef USE_LVP
+#if defined(USE_LVP) || defined(USE_SLEEP_LVP) || defined(USE_BATTCHECK)
+// Runs once per second (unless in standby)
 static inline void ADC_voltage_handler() {
-    static uint8_t lvp_timer = 0;
-    static uint8_t lvp_lowpass = 0;
-    #define LVP_TIMER_START (VOLTAGE_WARNING_SECONDS*ADC_CYCLES_PER_SECOND)  // N seconds between LVP warnings
-    #define LVP_LOWPASS_STRENGTH ADC_CYCLES_PER_SECOND  // lowpass for one second
-
-    uint16_t measurement = adc_values[0];  // latest 10-bit ADC reading
-
-    #ifdef USE_VOLTAGE_LOWPASS
-        static uint16_t prev_measurement = 0;
-
-        // prime on first execution, or while asleep
-        if (go_to_standby || (! prev_measurement)) prev_measurement = measurement;
-
-        // only allow raw value to go up or down by 1 per iteration
-        if (measurement > prev_measurement) measurement = prev_measurement + 1;
-        else if (measurement < prev_measurement) measurement = prev_measurement - 1;
-
-        // remember for later
-        prev_measurement = measurement;
-    #endif  // no USE_VOLTAGE_LOWPASS
-
+    uint16_t measurement = (adc_10x + 5) / 10;
     #ifdef USE_VOLTAGE_DIVIDER
-    voltage = calc_voltage_divider(measurement);
+    // use 9.7 fixed-point to get sufficient precision
+    uint16_t adc_per_volt = ((ADC_44<<7) - (ADC_22<<7)) / (44-22);
+    // incoming value is 8.2 fixed-point, so shift it 2 bits less
+    voltage = ((measurement<<5) / adc_per_volt) + VOLTAGE_FUDGE_FACTOR;
     #else
     // calculate actual voltage: volts * 10
     // ADC = 1.1 * 1024 / volts
@@ -231,178 +187,70 @@
     //voltage = (uint16_t)(1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR;
     voltage = ((uint16_t)(2*1.1*1024*10)/measurement + VOLTAGE_FUDGE_FACTOR) >> 1;
     #endif
-
-    // if low, callback EV_voltage_low / EV_voltage_critical
-    //         (but only if it has been more than N ticks since last call)
-    if (lvp_timer) {
-        lvp_timer --;
-    } else {  // it has been long enough since the last warning
-        if (voltage < VOLTAGE_LOW) {
-            if (lvp_lowpass < LVP_LOWPASS_STRENGTH) {
-                lvp_lowpass ++;
-            } else {
-                // try to send out a warning
-                //uint8_t err = emit(EV_voltage_low, 0);
-                //uint8_t err = emit_now(EV_voltage_low, 0);
-                emit(EV_voltage_low, 0);
-                //if (!err) {
-                    // on successful warning, reset counters
-                    lvp_timer = LVP_TIMER_START;
-                    lvp_lowpass = 0;
-                //}
-            }
-        } else {
-            // voltage not low?  reset count
-            lvp_lowpass = 0;
-        }
+    #if defined(USE_LVP) || defined(USE_SLEEP_LVP)
+    if (voltage < VOLTAGE_LOW) {
+        emit(EV_voltage_low, 0);
     }
+    #endif  // ifdef USE_LVP
 }
 #endif
 
 
 #ifdef USE_THERMAL_REGULATION
+// Runs once per second (unless in standby)
 static inline void ADC_temperature_handler() {
-    // thermal declarations
-    #ifndef THERMAL_UPDATE_SPEED
-    #define THERMAL_UPDATE_SPEED 2
+    #define NUM_HISTORY_TEMPS 4 // hardcoded, not intended to be changed
+    #ifndef THERM_LOOKAHEAD
+    #define THERM_LOOKAHEAD 5 // might be lowered with lower power to mass ratios
     #endif
-    #define NUM_THERMAL_VALUES_HISTORY 8
-    static uint8_t history_step = 0;  // don't update history as often
-    static int16_t temperature_history[NUM_THERMAL_VALUES_HISTORY];
-    static uint8_t temperature_timer = 0;
-    static uint8_t overheat_lowpass = 0;
-    static uint8_t underheat_lowpass = 0;
-    #define TEMPERATURE_TIMER_START ((THERMAL_WARNING_SECONDS-2)*ADC_CYCLES_PER_SECOND)  // N seconds between thermal regulation events
-    #define OVERHEAT_LOWPASS_STRENGTH (ADC_CYCLES_PER_SECOND*2)  // lowpass for 2 seconds
-    #define UNDERHEAT_LOWPASS_STRENGTH (ADC_CYCLES_PER_SECOND*2)  // lowpass for 2 seconds
-
-    // TODO: left-shift this so the lowpass can get higher resolution
-    // TODO: increase the sampling rate, to keep the lowpass from lagging
-    uint16_t measurement = adc_values[1];  // latest 10-bit ADC reading
-
-    // Convert ADC units to Celsius (ish)
-    int16_t temp = measurement - 275 + THERM_CAL_OFFSET + (int16_t)therm_cal_offset;
+    const  int16_t temp_target = therm_ceil * 10 - 5;
+    static int16_t temp_history[NUM_HISTORY_TEMPS];
+    static uint8_t temp_history_index = 0;
+    static uint8_t temp_record_offset = 0;
+    static int16_t temp_offset_100x = 0;
+
+    int16_t temp_10x = adc_10x + 10 * (THERM_CAL_OFFSET + therm_cal_offset - 275);
+    temperature = (temp_10x + 5) / 10; // save temperature C (ish) for later use in the ui
 
     // prime on first execution
     if (reset_thermal_history) {
         reset_thermal_history = 0;
-        temperature = temp;
-        for(uint8_t i=0; i<NUM_THERMAL_VALUES_HISTORY; i++)
-            temperature_history[i] = temp;
-    } else {  // update our current temperature estimate
-        // crude lowpass filter
-        // (limit rate of change to 1 degree per measurement)
-        if (temp > temperature) {
-            temperature ++;
-        } else if (temp < temperature) {
-            temperature --;
-        }
-    }
-
-    // guess what the temperature will be in a few seconds
-    int16_t pt;
-    {
-        int16_t diff;
-        int16_t t = temperature;
-
-        // algorithm tweaking; not really intended to be modified
-        // how far ahead should we predict?
-        #ifndef THERM_PREDICTION_STRENGTH
-        #define THERM_PREDICTION_STRENGTH 4
-        #endif
-        // how proportional should the adjustments be?  (not used yet)
-        #ifndef THERM_RESPONSE_MAGNITUDE
-        #define THERM_RESPONSE_MAGNITUDE 128
-        #endif
-        // acceptable temperature window size in C
-        #define THERM_WINDOW_SIZE 5
-        // highest temperature allowed
-        #define THERM_CEIL ((int16_t)therm_ceil)
-        // bottom of target temperature window
-        #define THERM_FLOOR (THERM_CEIL - THERM_WINDOW_SIZE)
-
-        // if it's time to rotate the thermal history, do it
-        history_step ++;
-        #if (THERMAL_UPDATE_SPEED == 4)  // new value every 4s
-        #define THERM_HISTORY_STEP_MAX (4*ADC_CYCLES_PER_SECOND)
-        #elif (THERMAL_UPDATE_SPEED == 2)  // new value every 2s
-        #define THERM_HISTORY_STEP_MAX (2*ADC_CYCLES_PER_SECOND)
-        #elif (THERMAL_UPDATE_SPEED == 1)  // new value every 1s
-        #define THERM_HISTORY_STEP_MAX (ADC_CYCLES_PER_SECOND)
-        #elif (THERMAL_UPDATE_SPEED == 0)  // new value every 0.5s
-        #define THERM_HISTORY_STEP_MAX (ADC_CYCLES_PER_SECOND/2)
-        #endif
-        if (THERM_HISTORY_STEP_MAX == history_step) {
-            history_step = 0;
-            // rotate measurements and add a new one
-            for (uint8_t i=0; i<NUM_THERMAL_VALUES_HISTORY-1; i++) {
-                temperature_history[i] = temperature_history[i+1];
-            }
-            temperature_history[NUM_THERMAL_VALUES_HISTORY-1] = t;
-        }
-
-        // guess what the temp will be several seconds in the future
-        // diff = rate of temperature change
-        //diff = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] - temperature_history[0];
-        diff = t - temperature_history[0];
-        // slight bias toward zero; ignore very small changes (noise)
-        for (uint8_t z=0; z<3; z++) {
-            if (diff < 0) diff ++;
-            if (diff > 0) diff --;
-        }
-        // projected_temperature = current temp extended forward by amplified rate of change
-        //projected_temperature = temperature_history[NUM_THERMAL_VALUES_HISTORY-1] + (diff<<THERM_PREDICTION_STRENGTH);
-        pt = projected_temperature = t + (diff<<THERM_PREDICTION_STRENGTH);
-    }
-
-    // cancel counters if appropriate
-    if (pt > THERM_FLOOR) {
-        underheat_lowpass = 0;  // we're probably not too cold
-    }
-    if (pt < THERM_CEIL) {
-        overheat_lowpass = 0;  // we're probably not too hot
-    }
-
-    if (temperature_timer) {
-        temperature_timer --;
-    } else {  // it has been long enough since the last warning
-
-        // Too hot?
-        if (pt > THERM_CEIL) {
-            if (overheat_lowpass < OVERHEAT_LOWPASS_STRENGTH) {
-                overheat_lowpass ++;
-            } else {
-                // reset counters
-                overheat_lowpass = 0;
-                temperature_timer = TEMPERATURE_TIMER_START;
-                // how far above the ceiling?
-                //int16_t howmuch = (pt - THERM_CEIL) * THERM_RESPONSE_MAGNITUDE / 128;
-                int16_t howmuch = pt - THERM_CEIL;
-                // try to send out a warning
-                emit(EV_temperature_high, howmuch);
-            }
-        }
-
-        // Too cold?
-        else if (pt < THERM_FLOOR) {
-            if (underheat_lowpass < UNDERHEAT_LOWPASS_STRENGTH) {
-                underheat_lowpass ++;
-            } else {
-                // reset counters
-                underheat_lowpass = 0;
-                temperature_timer = TEMPERATURE_TIMER_START;
-                // how far below the floor?
-                //int16_t howmuch = (THERM_FLOOR - pt) * THERM_RESPONSE_MAGNITUDE / 128;
-                int16_t howmuch = THERM_FLOOR - pt;
-                // try to send out a warning (unless voltage is low)
-                // (LVP and underheat warnings fight each other)
-                if (voltage > VOLTAGE_LOW)
-                    emit(EV_temperature_low, howmuch);
-            }
-        }
+        temp_record_offset = 0;
+        temp_offset_100x = 0;
+        for (uint8_t i=0; i<NUM_HISTORY_TEMPS; i++)
+            temp_history[i] = temp_10x;
+    }
+
+    int16_t temp_slope = temp_10x - temp_history[temp_history_index];
+    temp_history[temp_history_index] = temp_10x;
+    temp_history_index = (temp_history_index + 1) % NUM_HISTORY_TEMPS;
+
+    int16_t predicted_temp = temp_10x + temp_slope * THERM_LOOKAHEAD;
+    int16_t offset = predicted_temp - temp_target + temp_offset_100x / 10;
+
+    if (offset > 5 && temp_slope >= 0) {
+        temp_record_offset = 5;
+        int16_t howmuch = (offset / 6) + (temp_slope >> 1);
+        emit(EV_temperature_high, howmuch);
+    } else if (temp_record_offset) {
+        temp_record_offset--;
+        int16_t to_100x = 4 * (temp_target - temp_10x);
+        if (!temp_record_offset && to_100x > temp_offset_100x) {
+            temp_offset_100x = to_100x;
+        }
+    } else if ((offset < -15 && temp_slope < -15) || (temp_slope <= 0 && offset < -50)) {
+        #ifdef USE_LVP
+        if (voltage > VOLTAGE_LOW)
+        #endif
+        {
+            int16_t howmuch = (-offset / 12) + (-temp_slope >> 1);
+            emit(EV_temperature_low, howmuch);
+        }
+    } else if (temp_offset_100x > 0) {
+        temp_offset_100x--;
     }
 }
-#endif
+#endif  // ifdef USE_THERMAL_REGULATION
 
 
 #ifdef USE_BATTCHECK

=== modified file 'ToyKeeper/spaghetti-monster/fsm-adc.h'
--- ToyKeeper/spaghetti-monster/fsm-adc.h	2019-11-15 01:00:54 +0000
+++ ToyKeeper/spaghetti-monster/fsm-adc.h	2020-01-30 10:15:24 +0000
@@ -21,11 +21,17 @@
 #define FSM_ADC_H
 
 
-#ifdef USE_LVP
-// default 5 seconds between low-voltage warning events
-#ifndef VOLTAGE_WARNING_SECONDS
-#define VOLTAGE_WARNING_SECONDS 5
-#endif
+volatile uint16_t adc_10x = 0; // oversampled ADC result
+volatile uint8_t irq_adc = 0; // new ADC result available?
+void ADC_inner();  // do the actual ADC-related calculations
+
+inline void ADC_on();
+inline void ADC_off();
+inline void ADC_start_measurement();
+inline void ADC_stop_measurement();
+
+
+#if defined(USE_LVP) || defined(USE_BATTCHECK) || defined(USE_AUX_RGB_LEDS)
 // low-battery threshold in volts * 10
 #ifndef VOLTAGE_LOW
 #define VOLTAGE_LOW 29
@@ -38,18 +44,11 @@
 #define VOLTAGE_FUDGE_FACTOR 5
 #endif
 #endif
-
-volatile uint8_t irq_adc = 0;  // ADC interrupt happened?
-volatile uint8_t irq_adc_stable = 0;  // have we passed the 1st junk value yet?
-uint8_t adc_channel = 0;  // 0=voltage, 1=temperature
-uint16_t adc_values[2];  // last ADC measurements (0=voltage, 1=temperature)
-uint8_t adcint_enable = 0;  // is the current ADC result needed?
-void ADC_inner();  // do the actual ADC-related calculations
-
 static inline void ADC_voltage_handler();
-volatile uint8_t voltage = 0;
+uint8_t voltage = 0;
+#ifdef USE_LVP
 void low_voltage();
-
+#endif
 #ifdef USE_BATTCHECK
 void battcheck();
 #ifdef BATTCHECK_VpT
@@ -63,9 +62,8 @@
 
 
 #ifdef USE_THERMAL_REGULATION
-// default 5 seconds between thermal regulation events
-#ifndef THERMAL_WARNING_SECONDS
-#define THERMAL_WARNING_SECONDS 5
+#ifndef USE_BLINK_NUM
+#define USE_BLINK_NUM
 #endif
 // try to keep temperature below 45 C
 #ifndef DEFAULT_THERM_CEIL
@@ -79,22 +77,12 @@
 #ifndef THERM_CAL_OFFSET
 #define THERM_CAL_OFFSET 0
 #endif
-// temperature now, in C (ish) * 2  (14.1 fixed-point)
-volatile int16_t temperature;
-// temperature in a few seconds, in C (ish) * 2  (14.1 fixed-point)
-volatile int16_t projected_temperature;  // Fight the future!
+int8_t temperature = 0; // C (ish)
 uint8_t therm_ceil = DEFAULT_THERM_CEIL;
 int8_t therm_cal_offset = 0;
-//void low_temperature();
-//void high_temperature();
-volatile uint8_t reset_thermal_history = 1;
+uint8_t reset_thermal_history = 1;
 static inline void ADC_temperature_handler();
 #endif  // ifdef USE_THERMAL_REGULATION
 
 
-inline void ADC_on();
-inline void ADC_off();
-inline void ADC_start_measurement();
-
-
 #endif

=== modified file 'ToyKeeper/spaghetti-monster/fsm-misc.c'
--- ToyKeeper/spaghetti-monster/fsm-misc.c	2019-10-15 08:34:47 +0000
+++ ToyKeeper/spaghetti-monster/fsm-misc.c	2020-01-30 10:15:24 +0000
@@ -40,7 +40,7 @@
 }
 #endif
 
-#if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
+#if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT) || defined(USE_VERSION_CHECK)
 #define BLINK_SPEED 1000
 uint8_t blink_digit(uint8_t num) {
     //StatePtr old_state = current_state;

=== modified file 'ToyKeeper/spaghetti-monster/fsm-misc.h'
--- ToyKeeper/spaghetti-monster/fsm-misc.h	2019-09-06 10:38:00 +0000
+++ ToyKeeper/spaghetti-monster/fsm-misc.h	2020-01-30 10:15:24 +0000
@@ -24,7 +24,7 @@
 void auto_clock_speed();
 #endif
 
-#if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT)
+#if defined(USE_BLINK_NUM) || defined(USE_BLINK_DIGIT) || defined(USE_VERSION_CHECK)
 #ifndef BLINK_BRIGHTNESS
 #define BLINK_BRIGHTNESS (MAX_LEVEL/6)
 #endif

=== modified file 'ToyKeeper/spaghetti-monster/fsm-standby.c'
--- ToyKeeper/spaghetti-monster/fsm-standby.c	2019-11-20 22:29:51 +0000
+++ ToyKeeper/spaghetti-monster/fsm-standby.c	2020-01-30 10:15:24 +0000
@@ -73,7 +73,6 @@
             go_to_standby = 0;
         }
         if (irq_adc) {  // ADC done measuring
-            adcint_enable = 1;
             ADC_inner();
             //ADC_off();  // takes care of itself
             //irq_adc = 0;  // takes care of itself

=== modified file 'ToyKeeper/spaghetti-monster/fsm-wdt.c'
--- ToyKeeper/spaghetti-monster/fsm-wdt.c	2019-11-19 07:06:41 +0000
+++ ToyKeeper/spaghetti-monster/fsm-wdt.c	2020-01-30 10:15:24 +0000
@@ -86,10 +86,12 @@
 }
 
 void WDT_inner() {
+    #if defined(USE_LVP) || defined(USE_SLEEP_LVP) || defined(USE_THERMAL_REGULATION)
+    static uint8_t adc_trigger = 0;
+    #endif
+
     irq_wdt = 0;  // WDT event handled; reset flag
 
-    static uint8_t adc_trigger = 0;
-
     // cache this here to reduce ROM size, because it's volatile
     uint16_t ticks_since_last = ticks_since_last_event;
     // increment, but loop from max back to half
@@ -119,9 +121,9 @@
         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 & 0x7f)) return;
+        if (0 != (ticks_since_last & 0x1ff) && voltage) return;
 
-        adc_trigger = 255;  // make sure a measurement will happen
+        adc_trigger = 0;  // make sure a measurement will happen
         ADC_on();  // enable ADC voltage measurement functions temporarily
         #endif
     }
@@ -177,14 +179,11 @@
     }
     #endif
 
-    #if defined(USE_LVP) || defined(USE_THERMAL_REGULATION)
-    // start a new ADC measurement every 4 ticks
-    adc_trigger ++;
-    if (0 == (adc_trigger & 3)) {
+    #if defined(USE_LVP) || defined(USE_SLEEP_LVP) || defined(USE_THERMAL_REGULATION)
+    if (!adc_trigger) {
         ADC_start_measurement();
-        irq_adc_stable = 0;
-        adcint_enable = 1;
     }
+    adc_trigger = (adc_trigger + 1) % (TICKS_PER_SECOND / 2);
     #endif
 }
 

=== modified file 'ToyKeeper/spaghetti-monster/spaghetti-monster.txt'
--- ToyKeeper/spaghetti-monster/spaghetti-monster.txt	2018-11-11 23:01:40 +0000
+++ ToyKeeper/spaghetti-monster/spaghetti-monster.txt	2020-01-30 10:15:24 +0000
@@ -120,17 +120,16 @@
     LVP and thermal regulation:
 
       - EV_voltage_low: Sent whenever the input power drops below the 
-        VOLTAGE_LOW threshold.  Minimum of VOLTAGE_WARNING_SECONDS 
-        between events.
+        VOLTAGE_LOW threshold.  Minimum of one second between events.
 
       - EV_temperature_high: Sent whenever the MCU's projected temperature 
-        is higher than therm_ceil.  Minimum of THERMAL_WARNING_SECONDS 
+        is higher than therm_ceil.  Minimum of one second 
         between events.  The 'arg' indicates how far the temperature 
         exceeds the limit.
 
       - EV_temperature_low: Sent whenever the MCU's projected temperature 
         is lower than (therm_ceil - THERMAL_WINDOW_SIZE).  Minimum of 
-        THERMAL_WARNING_SECONDS between events.  The 'arg' indicates how 
+        one second between events.  The 'arg' indicates how 
         far the temperature exceeds the limit.
 
     Button presses:
@@ -290,16 +289,11 @@
         to compensate for voltage drop across the reverse-polarity 
         diode.
 
-      - VOLTAGE_WARNING_SECONDS: How long to wait between LVP events.
-
     - USE_THERMAL_REGULATION: Enable thermal regulation
 
       - DEFAULT_THERM_CEIL: Set the temperature limit to use by default 
         when the user hasn't configured anything.
 
-      - THERMAL_WARNING_SECONDS: How long to wait between temperature 
-        events.
-
     - USE_RAMPING: Enable smooth ramping helpers.
 
       - RAMP_LENGTH: Pick a pre-defined ramp by length.  Defined sizes