From 8b59e880614455bd7bc7d8595de847dd6fe9b5b2 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 01:52:50 -0700
Subject: refactored how interrupts work...   set a flag and return
 immediately,   then handle the actual logic later during a less-critical code
 path Enables smarter responses to standby wakeups. Seems to fix missed button
 presses during standby,   and most of the too-fast sleep ticks. Also
 eliminated waits from button state measurement, so it can happen easier
 during standby.   (also eliminates the chance of an infinite loop on
 extra-noisy hardware) Also might improve timing-sensitive interrupts like
 attiny85 PWM channel 4,   or a PWM-DSM hybrid technique I'd like to try.

BUT this change also appears to break the thermal sensor, so that needs to be fixed.

---
 spaghetti-monster/fsm-adc.c     | 45 ++++++++++++++++++++++++++++++++---------
 spaghetti-monster/fsm-adc.h     |  8 +++++++-
 spaghetti-monster/fsm-events.c  |  3 +++
 spaghetti-monster/fsm-main.c    | 21 +++++++++++++++++++
 spaghetti-monster/fsm-main.h    |  2 ++
 spaghetti-monster/fsm-pcint.c   | 21 +++++++------------
 spaghetti-monster/fsm-pcint.h   |  1 +
 spaghetti-monster/fsm-standby.c | 19 +++++++++++++----
 spaghetti-monster/fsm-wdt.c     | 22 +++++++++++++-------
 spaghetti-monster/fsm-wdt.h     |  4 ++--
 10 files changed, 108 insertions(+), 38 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 6832e32..1fc5472 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -113,15 +113,44 @@ static inline uint8_t calc_voltage_divider(uint16_t value) {
 #else
 #define ADC_CYCLES_PER_SECOND 8
 #endif
-// TODO: is this better done in main() or WDT()?
+
+// save the measurement result, set a flag to show something happened,
+// and count how many times we've triggered since last counter reset
 ISR(ADC_vect) {
-    // For some reason, the ADC interrupt is getting called a *lot*
-    // more often than it should be, like it's auto-triggering after each
-    // measurement, but I don't know why, or how to turn that off...
-    // So, skip every call except when explicitly requested.
+    #if 0  // the fancy method is probably not even needed
+    // count up but wrap around from 255 to 128; not 255 to 0
+    // TODO: find a way to do this faster if possible
+    uint8_t val = irq_adc;  // cache volatile value
+    irq_adc = (val + 1) | (val & 0b10000000);
+    #else
+    irq_adc ++;
+    #endif
+    adc_value = ADC;  // save this for later use
+}
+
+void ADC_inner() {
+    // ignore the first measurement; the docs say it's junk
+    if (irq_adc < 2) {
+        ADC_start_measurement();  // start a second measurement
+        return;
+    }
+
+    // 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;
+
+    // if we're actually runnning, reset the status flags / counters
+    irq_adc = 0;
     adcint_enable = 0;
 
+    #ifdef TICK_DURING_STANDBY
+        // in sleep mode, turn off after just one measurement
+        // (having the ADC on raises standby power by about 250 uA)
+        // (and the usual standby level is only ~20 uA)
+        if (go_to_standby) ADC_off();
+    #endif
+
+    // what is being measured? 0/1 = battery voltage, 2/3 = temperature
     static uint8_t adc_step = 0;
 
     // LVP declarations
@@ -155,7 +184,7 @@ ISR(ADC_vect) {
     #define ADC_STEPS 2
     #endif
 
-    uint16_t measurement = ADC;  // latest 10-bit ADC reading
+    uint16_t measurement = adc_value;  // latest 10-bit ADC reading
 
     #ifdef USE_PSEUDO_RAND
     // real-world entropy makes this a true random, not pseudo
@@ -376,10 +405,6 @@ ISR(ADC_vect) {
         #endif
     #endif
 
-    #ifdef TICK_DURING_STANDBY
-        // if we were asleep, go back to sleep
-        if (go_to_standby) ADC_off();
-    #endif
 }
 
 #ifdef USE_BATTCHECK
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 274fb4d..acb3da6 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -38,9 +38,15 @@
 #define VOLTAGE_FUDGE_FACTOR 5
 #endif
 #endif
+
+volatile uint8_t irq_adc = 0;  // ADC interrupt happened?
+uint16_t adc_value;  // last ADC measurement
+uint8_t adcint_enable = 0;  // is the current ADC result needed?
+void ADC_inner();  // do the actual ADC-related calculations
+
 volatile uint8_t voltage = 0;
-volatile uint8_t adcint_enable;  // kludge, because adc auto-retrigger won't turn off
 void low_voltage();
+
 #ifdef USE_BATTCHECK
 void battcheck();
 #ifdef BATTCHECK_VpT
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index 3e9a12d..e125e84 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -145,6 +145,9 @@ uint8_t nice_delay_ms(uint16_t ms) {
         _delay_loop_2(BOGOMIPS*98/100);
         #endif  // ifdef USE_DYNAMIC_UNDERCLOCKING
 
+        // run pending system processes while we wait
+        handle_deferred_interrupts();
+
         if ((nice_delay_interrupt) || (old_state != current_state)) {
             return 0;  // state changed; abort
         }
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index e537a9e..a898f41 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -160,6 +160,9 @@ int main() {
             standby_mode();
         }
 
+        // catch up on interrupts
+        handle_deferred_interrupts();
+
         // give the recipe some time slices
         loop();
 
@@ -168,4 +171,22 @@ int main() {
     }
 }
 
+
+void handle_deferred_interrupts() {
+    /*
+    if (irq_pcint) {  // button pressed or released
+        // nothing to do here
+        // (PCINT only matters during standby)
+    }
+    */
+    if (irq_adc) {  // ADC done measuring
+        ADC_inner();
+        // irq_adc = 0;  // takes care of itself
+    }
+    if (irq_wdt) {  // the clock ticked
+        WDT_inner();
+        // irq_wdt = 0;  // takes care of itself
+    }
+}
+
 #endif
diff --git a/spaghetti-monster/fsm-main.h b/spaghetti-monster/fsm-main.h
index cc469d7..55ae2ff 100644
--- a/spaghetti-monster/fsm-main.h
+++ b/spaghetti-monster/fsm-main.h
@@ -21,5 +21,7 @@
 #define FSM_MAIN_H
 
 int main();
+// needs to run frequently to execute the logic for WDT and ADC and stuff
+void handle_deferred_interrupts();
 
 #endif
diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c
index 4928980..a4a496a 100644
--- a/spaghetti-monster/fsm-pcint.c
+++ b/spaghetti-monster/fsm-pcint.c
@@ -24,19 +24,9 @@
 #include <util/delay_basic.h>
 
 uint8_t button_is_pressed() {
-    // remember the past 32 measurements
-    static uint32_t readings = 0;
-    // take at least one new measurement,
-    // and wait for measurements to settle to all zeroes or all ones
-    do {
-        // shift past readings and add current value
-        readings = (readings << 1) | ((SWITCH_PORT & (1<<SWITCH_PIN)) == 0);
-        // wait a moment
-        _delay_loop_2(BOGOMIPS/16);  // up to 2ms to stabilize
-    }
-    while ((readings != 0) && (readings != 0xFFFFFFFF));
-    button_last_state = readings;
-    return readings;
+    uint8_t value = ((SWITCH_PORT & (1<<SWITCH_PIN)) == 0);
+    button_last_state = value;
+    return value;
 }
 
 inline void PCINT_on() {
@@ -75,7 +65,10 @@ inline void PCINT_off() {
 
 //void button_change_interrupt() {
 #if (ATTINY == 25) || (ATTINY == 45) || (ATTINY == 85) || (ATTINY == 1634)
-EMPTY_INTERRUPT(PCINT0_vect);
+//EMPTY_INTERRUPT(PCINT0_vect);
+ISR(PCINT0_vect) {
+    irq_pcint = 1;
+}
 #else
     #error Unrecognized MCU type
 #endif
diff --git a/spaghetti-monster/fsm-pcint.h b/spaghetti-monster/fsm-pcint.h
index ec3ae4b..a7f3733 100644
--- a/spaghetti-monster/fsm-pcint.h
+++ b/spaghetti-monster/fsm-pcint.h
@@ -20,6 +20,7 @@
 #ifndef FSM_PCINT_H
 #define FSM_PCINT_H
 
+volatile uint8_t irq_pcint = 0;  // pin change interrupt happened?
 //static volatile uint8_t button_was_pressed;
 #define BP_SAMPLES 32
 volatile uint8_t button_last_state;
diff --git a/spaghetti-monster/fsm-standby.c b/spaghetti-monster/fsm-standby.c
index 44b047a..4124d92 100644
--- a/spaghetti-monster/fsm-standby.c
+++ b/spaghetti-monster/fsm-standby.c
@@ -42,13 +42,15 @@ void sleep_until_eswitch_pressed()
     // make sure switch isn't currently pressed
     while (button_is_pressed()) {}
     empty_event_sequence();  // cancel pending input on suspend
-    //PCINT_since_WDT = 0;  // ensure PCINT won't ignore itself
 
     PCINT_on();  // wake on e-switch event
 
     #ifdef TICK_DURING_STANDBY
+    // detect which type of event caused a wake-up
+    irq_adc = 0;
+    irq_wdt = 0;
+    irq_pcint = 0;
     while (go_to_standby) {
-        f_wdt = 0;  // detect if WDT was what caused a wake-up
     #else
         go_to_standby = 0;
     #endif
@@ -65,10 +67,19 @@ void sleep_until_eswitch_pressed()
         sleep_disable();
 
     #ifdef TICK_DURING_STANDBY
-        // determine what woke us up... WDT or PCINT
-        if (! f_wdt) {  // PCINT went off; wake up
+        // determine what woke us up...
+        if (irq_pcint) {  // button pressed; wake up
             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
+        }
+        if (irq_wdt) {  // generate a sleep tick
+            WDT_inner();
+        }
     }
     #endif
 
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index 6e61e87..3cb7d86 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -82,11 +82,23 @@ inline void WDT_off()
 
 // clock tick -- this runs every 16ms (62.5 fps)
 ISR(WDT_vect) {
+    irq_wdt = 1;  // WDT event happened
+}
+
+void WDT_inner() {
+    irq_wdt = 0;  // WDT event handled; reset flag
+
     static uint8_t adc_trigger = 0;
 
-    #ifdef TICK_DURING_STANDBY
-    f_wdt = 1;  // WDT event happened
+    // detect and emit button change events (even during standby)
+    uint8_t was_pressed = button_last_state;
+    uint8_t pressed = button_is_pressed();
+    if (was_pressed != pressed) {
+        go_to_standby = 0;
+        PCINT_inner(pressed);
+    }
 
+    #ifdef TICK_DURING_STANDBY
     static uint16_t sleep_counter = 0;
     // handle standby mode specially
     if (go_to_standby) {
@@ -107,11 +119,6 @@ ISR(WDT_vect) {
     else { sleep_counter = 0; }
     #endif
 
-    // detect and emit button change events
-    uint8_t was_pressed = button_last_state;
-    uint8_t pressed = button_is_pressed();
-    if (was_pressed != pressed) PCINT_inner(pressed);
-
     // cache this here to reduce ROM size, because it's volatile
     uint16_t ticks_since_last = ticks_since_last_event;
  
@@ -178,6 +185,7 @@ ISR(WDT_vect) {
         if (go_to_standby) ADC_on();
         #endif
         ADC_start_measurement();
+        irq_adc = 0;
         adcint_enable = 1;
     }
     #endif
diff --git a/spaghetti-monster/fsm-wdt.h b/spaghetti-monster/fsm-wdt.h
index 78fe791..d127551 100644
--- a/spaghetti-monster/fsm-wdt.h
+++ b/spaghetti-monster/fsm-wdt.h
@@ -25,9 +25,9 @@
 void WDT_on();
 inline void WDT_off();
 
-#ifdef TICK_DURING_STANDBY
-volatile uint8_t f_wdt = 0;
+volatile uint8_t irq_wdt = 0;  // WDT interrupt happened?
 
+#ifdef TICK_DURING_STANDBY
   #if defined(USE_INDICATOR_LED) || defined(USE_AUX_RGB_LEDS)
   // measure battery charge while asleep
   #define USE_SLEEP_LVP
-- 
cgit v1.2.3


From d4a899d99a366c09f5e38eb9ef71e538e4def2c1 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 01:56:29 -0700
Subject: started refactoring ADC code to split voltage and temperature into
 their own functions

---
 spaghetti-monster/fsm-adc.c | 432 +++++++++++++++++++++++---------------------
 spaghetti-monster/fsm-adc.h |   6 +-
 2 files changed, 226 insertions(+), 212 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 1fc5472..ddf4c65 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -114,6 +114,12 @@ static inline uint8_t calc_voltage_divider(uint16_t value) {
 #define ADC_CYCLES_PER_SECOND 8
 #endif
 
+#ifdef USE_THERMAL_REGULATION
+#define ADC_STEPS 4
+#else
+#define ADC_STEPS 2
+#endif
+
 // save the measurement result, set a flag to show something happened,
 // and count how many times we've triggered since last counter reset
 ISR(ADC_vect) {
@@ -153,8 +159,51 @@ void ADC_inner() {
     // what is being measured? 0/1 = battery voltage, 2/3 = temperature
     static uint8_t adc_step = 0;
 
-    // LVP declarations
+    #ifdef USE_PSEUDO_RAND
+    // real-world entropy makes this a true random, not pseudo
+    pseudo_rand_seed += adc_value;
+    #endif
+
+    #if defined(TICK_DURING_STANDBY) && defined(USE_SLEEP_LVP)
+    // only measure battery voltage while asleep
+    if (go_to_standby) adc_step = 1;
+    else
+    #endif
+
+    adc_step = (adc_step + 1) & (ADC_STEPS-1);
+
     #ifdef USE_LVP
+    if (adc_step == 1) {  // voltage
+        ADC_voltage_handler();
+    }
+    #endif
+
+    #ifdef USE_THERMAL_REGULATION
+    else if (adc_step == 3) {  // temperature
+        ADC_temperature_handler();
+    }
+    #endif
+
+    // set the correct type of measurement for next time
+    #ifdef USE_THERMAL_REGULATION
+        #ifdef USE_LVP
+        if (adc_step < 2) set_admux_voltage();
+        else set_admux_therm();
+        #else
+        set_admux_therm();
+        #endif
+    #else
+        #ifdef USE_LVP
+        set_admux_voltage();
+        #endif
+    #endif
+
+}
+
+
+#ifdef USE_LVP
+static inline void ADC_voltage_handler() {
+    // LVP declarations
     #ifdef USE_LVP_AVG
     #define NUM_VOLTAGE_VALUES 4
     static int16_t voltage_values[NUM_VOLTAGE_VALUES];
@@ -163,15 +212,78 @@ void ADC_inner() {
     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_value;  // latest 10-bit ADC reading
+
+    #ifdef USE_LVP_AVG
+    // prime on first execution
+    if (voltage == 0) {
+        for(uint8_t i=0; i<NUM_VOLTAGE_VALUES; i++)
+            voltage_values[i] = measurement;
+        voltage = 42;  // the answer to life, the universe, and the voltage of a full li-ion cell
+    } else {
+        uint16_t total = 0;
+        uint8_t i;
+        for(i=0; i<NUM_VOLTAGE_VALUES-1; i++) {
+            voltage_values[i] = voltage_values[i+1];
+            total += voltage_values[i];
+        }
+        voltage_values[i] = measurement;
+        total += measurement;
+        total = total >> 2;
+
+        #ifdef USE_VOLTAGE_DIVIDER
+        voltage = calc_voltage_divider(total);
+        #else
+        voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
+        #endif
+    }
+    #else  // no USE_LVP_AVG
+        #ifdef USE_VOLTAGE_DIVIDER
+        voltage = calc_voltage_divider(measurement);
+        #else
+        // calculate actual voltage: volts * 10
+        // ADC = 1.1 * 1024 / volts
+        // volts = 1.1 * 1024 / ADC
+        //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
     #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;
+        }
+    }
+}
+#endif
 
+
+#ifdef USE_THERMAL_REGULATION
+static inline void ADC_temperature_handler() {
     // thermal declarations
-    #ifdef USE_THERMAL_REGULATION
     #ifndef THERMAL_UPDATE_SPEED
     #define THERMAL_UPDATE_SPEED 2
     #endif
     #define NUM_THERMAL_VALUES_HISTORY 8
-    #define ADC_STEPS 4
     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;
@@ -180,232 +292,132 @@ void ADC_inner() {
     #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
-    #else
-    #define ADC_STEPS 2
-    #endif
 
     uint16_t measurement = adc_value;  // latest 10-bit ADC reading
 
-    #ifdef USE_PSEUDO_RAND
-    // real-world entropy makes this a true random, not pseudo
-    pseudo_rand_seed += measurement;
-    #endif
-
-    #if defined(TICK_DURING_STANDBY) && defined(USE_SLEEP_LVP)
-    // only measure battery voltage while asleep
-    if (go_to_standby) adc_step = 1;
-    else
-    #endif
-
-    adc_step = (adc_step + 1) & (ADC_STEPS-1);
-
-    #ifdef USE_LVP
-    // voltage
-    if (adc_step == 1) {
-        #ifdef USE_LVP_AVG
-        // prime on first execution
-        if (voltage == 0) {
-            for(uint8_t i=0; i<NUM_VOLTAGE_VALUES; i++)
-                voltage_values[i] = measurement;
-            voltage = 42;  // the answer to life, the universe, and the voltage of a full li-ion cell
-        } else {
-            uint16_t total = 0;
-            uint8_t i;
-            for(i=0; i<NUM_VOLTAGE_VALUES-1; i++) {
-                voltage_values[i] = voltage_values[i+1];
-                total += voltage_values[i];
-            }
-            voltage_values[i] = measurement;
-            total += measurement;
-            total = total >> 2;
-
-            #ifdef USE_VOLTAGE_DIVIDER
-            voltage = calc_voltage_divider(total);
-            #else
-            voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
-            #endif
-        }
-        #else  // no USE_LVP_AVG
-            #ifdef USE_VOLTAGE_DIVIDER
-            voltage = calc_voltage_divider(measurement);
-            #else
-            // calculate actual voltage: volts * 10
-            // ADC = 1.1 * 1024 / volts
-            // volts = 1.1 * 1024 / ADC
-            //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
-        #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;
-            }
+    // Convert ADC units to Celsius (ish)
+    int16_t temp = measurement - 275 + THERM_CAL_OFFSET + (int16_t)therm_cal_offset;
+
+    // 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 --;
         }
     }
-    #endif  // ifdef USE_LVP
 
+    // guess what the temperature will be in a few seconds
+    int16_t pt;
+    {
+        int16_t diff;
+        int16_t t = temperature;
 
-    #ifdef USE_THERMAL_REGULATION
-    // temperature
-    else if (adc_step == 3) {
-        // Convert ADC units to Celsius (ish)
-        int16_t temp = measurement - 275 + THERM_CAL_OFFSET + (int16_t)therm_cal_offset;
-
-        // 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 --;
+        // 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 15
+        #elif (THERMAL_UPDATE_SPEED == 2)  // new value every 2s
+        #define THERM_HISTORY_STEP_MAX 7
+        #elif (THERMAL_UPDATE_SPEED == 1)  // new value every 1s
+        #define THERM_HISTORY_STEP_MAX 3
+        #elif (THERMAL_UPDATE_SPEED == 0)  // new value every 0.5s
+        #define THERM_HISTORY_STEP_MAX 1
+        #endif
+        if (0 == (history_step & THERM_HISTORY_STEP_MAX)) {
+            // 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 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 15
-            #elif (THERMAL_UPDATE_SPEED == 2)  // new value every 2s
-            #define THERM_HISTORY_STEP_MAX 7
-            #elif (THERMAL_UPDATE_SPEED == 1)  // new value every 1s
-            #define THERM_HISTORY_STEP_MAX 3
-            #elif (THERMAL_UPDATE_SPEED == 0)  // new value every 0.5s
-            #define THERM_HISTORY_STEP_MAX 1
-            #endif
-            if (0 == (history_step & THERM_HISTORY_STEP_MAX)) {
-                // 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);
+        // 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
-        }
+    // 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);
-                }
+    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);
-                }
+        // 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);
             }
         }
     }
-    #endif  // ifdef USE_THERMAL_REGULATION
-
-
-    // set the correct type of measurement for next time
-    #ifdef USE_THERMAL_REGULATION
-        #ifdef USE_LVP
-        if (adc_step < 2) set_admux_voltage();
-        else set_admux_therm();
-        #else
-        set_admux_therm();
-        #endif
-    #else
-        #ifdef USE_LVP
-        set_admux_voltage();
-        #endif
-    #endif
-
 }
+#endif
+
 
 #ifdef USE_BATTCHECK
 #ifdef BATTCHECK_4bars
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index acb3da6..5f4d0c8 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -44,6 +44,7 @@ uint16_t adc_value;  // last ADC measurement
 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;
 void low_voltage();
 
@@ -56,7 +57,7 @@ void battcheck();
 #define USE_BLINK_DIGIT
 #endif
 #endif
-#endif
+#endif  // ifdef USE_LVP
 
 
 #ifdef USE_THERMAL_REGULATION
@@ -85,7 +86,8 @@ int8_t therm_cal_offset = 0;
 //void low_temperature();
 //void high_temperature();
 volatile uint8_t reset_thermal_history = 1;
-#endif
+static inline void ADC_temperature_handler();
+#endif  // ifdef USE_THERMAL_REGULATION
 
 
 inline void ADC_on();
-- 
cgit v1.2.3


From ae082e6331d75c2cbe339290fbce4e79c2aa2ede Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 18:00:54 -0700
Subject: fixed ADC code; measures and behaves correctly now, and is easier to
 read... ... but factory reset's auto-calibrate still doesn't get the right
 values for some reason (manual calibration works, but not auto)

---
 spaghetti-monster/fsm-adc.c | 76 ++++++++++++++++++++++-----------------------
 spaghetti-monster/fsm-adc.h |  4 ++-
 spaghetti-monster/fsm-wdt.c |  2 +-
 3 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index ddf4c65..d447189 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -30,6 +30,7 @@ inline void set_admux_therm() {
     #else
         #error Unrecognized MCU type
     #endif
+    adc_channel = 1;
 }
 
 inline void set_admux_voltage() {
@@ -52,6 +53,7 @@ inline void set_admux_voltage() {
     #else
         #error Unrecognized MCU type
     #endif
+    adc_channel = 0;
 }
 
 inline void ADC_start_measurement() {
@@ -115,38 +117,37 @@ static inline uint8_t calc_voltage_divider(uint16_t value) {
 #endif
 
 #ifdef USE_THERMAL_REGULATION
-#define ADC_STEPS 4
-#else
 #define ADC_STEPS 2
+#else
+#define ADC_STEPS 1
 #endif
 
-// save the measurement result, set a flag to show something happened,
-// and count how many times we've triggered since last counter reset
+// happens every time the ADC sampler finishes a measurement
 ISR(ADC_vect) {
-    #if 0  // the fancy method is probably not even needed
-    // count up but wrap around from 255 to 128; not 255 to 0
-    // TODO: find a way to do this faster if possible
-    uint8_t val = irq_adc;  // cache volatile value
-    irq_adc = (val + 1) | (val & 0b10000000);
-    #else
-    irq_adc ++;
+    #ifdef USE_PSEUDO_RAND
+    // real-world entropy makes this a true random, not pseudo
+    pseudo_rand_seed += ADCL;
     #endif
-    adc_value = ADC;  // save this for later use
+
+    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();
 }
 
 void ADC_inner() {
-    // ignore the first measurement; the docs say it's junk
-    if (irq_adc < 2) {
-        ADC_start_measurement();  // start a second measurement
-        return;
-    }
+    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;
 
-    // if we're actually runnning, reset the status flags / counters
-    irq_adc = 0;
+    // disable after one iteration
     adcint_enable = 0;
 
     #ifdef TICK_DURING_STANDBY
@@ -156,41 +157,37 @@ void ADC_inner() {
         if (go_to_standby) ADC_off();
     #endif
 
-    // what is being measured? 0/1 = battery voltage, 2/3 = temperature
+    // what is being measured? 0 = battery voltage, 1 = temperature
     static uint8_t adc_step = 0;
 
-    #ifdef USE_PSEUDO_RAND
-    // real-world entropy makes this a true random, not pseudo
-    pseudo_rand_seed += adc_value;
-    #endif
-
-    #if defined(TICK_DURING_STANDBY) && defined(USE_SLEEP_LVP)
-    // only measure battery voltage while asleep
-    if (go_to_standby) adc_step = 1;
-    else
-    #endif
-
-    adc_step = (adc_step + 1) & (ADC_STEPS-1);
-
     #ifdef USE_LVP
-    if (adc_step == 1) {  // voltage
+    if (0 == adc_step) {  // voltage
         ADC_voltage_handler();
     }
     #endif
 
     #ifdef USE_THERMAL_REGULATION
-    else if (adc_step == 3) {  // temperature
+    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 (adc_step < 2) set_admux_voltage();
+        if (0 == adc_step) set_admux_voltage();
         else set_admux_therm();
         #else
-        set_admux_therm();
+        //set_admux_therm();
+        #error "USE_THERMAL_REGULATION set without USE_LVP"
         #endif
     #else
         #ifdef USE_LVP
@@ -198,6 +195,7 @@ void ADC_inner() {
         #endif
     #endif
 
+    irq_adc_stable = 0;  // first result is unstable
 }
 
 
@@ -213,7 +211,7 @@ static inline void ADC_voltage_handler() {
     #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_value;  // latest 10-bit ADC reading
+    uint16_t measurement = adc_values[0];  // latest 10-bit ADC reading
 
     #ifdef USE_LVP_AVG
     // prime on first execution
@@ -293,7 +291,7 @@ static inline void ADC_temperature_handler() {
     #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
 
-    uint16_t measurement = adc_value;  // latest 10-bit ADC reading
+    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;
diff --git a/spaghetti-monster/fsm-adc.h b/spaghetti-monster/fsm-adc.h
index 5f4d0c8..6e39750 100644
--- a/spaghetti-monster/fsm-adc.h
+++ b/spaghetti-monster/fsm-adc.h
@@ -40,7 +40,9 @@
 #endif
 
 volatile uint8_t irq_adc = 0;  // ADC interrupt happened?
-uint16_t adc_value;  // last ADC measurement
+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
 
diff --git a/spaghetti-monster/fsm-wdt.c b/spaghetti-monster/fsm-wdt.c
index 3cb7d86..beab1a2 100644
--- a/spaghetti-monster/fsm-wdt.c
+++ b/spaghetti-monster/fsm-wdt.c
@@ -185,7 +185,7 @@ void WDT_inner() {
         if (go_to_standby) ADC_on();
         #endif
         ADC_start_measurement();
-        irq_adc = 0;
+        irq_adc_stable = 0;
         adcint_enable = 1;
     }
     #endif
-- 
cgit v1.2.3


From 81ed77d88c999f9c2368718047d0969fef44e534 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 18:28:52 -0700
Subject: fixed factory reset (wasn't running interrupt logic since it's
 deferred now) (also fixed issue where nice_delay_ms() was aborted during
 setup()) (and adjusted the timing to make factory reset similar to the speed
 it was before this change)

---
 spaghetti-monster/anduril/anduril.c | 10 +++++-----
 spaghetti-monster/fsm-events.c      | 12 ++++++------
 spaghetti-monster/fsm-main.c        |  1 -
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 48f4ac1..19d61b7 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -2356,7 +2356,7 @@ void rgb_led_update(uint8_t mode, uint8_t arg) {
 void factory_reset() {
     // display a warning for a few seconds before doing the actual reset,
     // so the user has time to abort if they want
-    #define SPLODEY_TIME 3000
+    #define SPLODEY_TIME 2500
     #define SPLODEY_STEPS 64
     #define SPLODEY_TIME_PER_STEP (SPLODEY_TIME/SPLODEY_STEPS)
     uint8_t bright;
@@ -2364,9 +2364,9 @@ void factory_reset() {
     // wind up to an explosion
     for (bright=0; bright<SPLODEY_STEPS; bright++) {
         set_level(bright);
-        delay_4ms(SPLODEY_TIME_PER_STEP/2/4);
+        nice_delay_ms(SPLODEY_TIME_PER_STEP/2);
         set_level(bright>>1);
-        delay_4ms(SPLODEY_TIME_PER_STEP/2/4);
+        nice_delay_ms(SPLODEY_TIME_PER_STEP/2);
         if (! button_is_pressed()) {
             reset = 0;
             break;
@@ -2387,14 +2387,14 @@ void factory_reset() {
         bright = MAX_LEVEL;
         for (; bright > 0; bright--) {
             set_level(bright);
-            delay_4ms(SPLODEY_TIME_PER_STEP/6/4);
+            nice_delay_ms(SPLODEY_TIME_PER_STEP/8);
         }
     }
     // explosion cancelled, fade away
     else {
         for (; bright > 0; bright--) {
             set_level(bright);
-            delay_4ms(SPLODEY_TIME_PER_STEP/3/4);
+            nice_delay_ms(SPLODEY_TIME_PER_STEP/3);
         }
     }
 }
diff --git a/spaghetti-monster/fsm-events.c b/spaghetti-monster/fsm-events.c
index e125e84..a1b013a 100644
--- a/spaghetti-monster/fsm-events.c
+++ b/spaghetti-monster/fsm-events.c
@@ -110,7 +110,7 @@ uint8_t nice_delay_ms(uint16_t ms) {
     /*  // delay_zero() implementation
     if (ms == 0) {
         CLKPR = 1<<CLKPCE; CLKPR = 0;  // full speed
-        _delay_loop_2(BOGOMIPS*98/100/3);
+        _delay_loop_2(BOGOMIPS*95/100/3);
         return 1;
     }
     */
@@ -120,15 +120,15 @@ uint8_t nice_delay_ms(uint16_t ms) {
         uint8_t level = actual_level;  // volatile, avoid repeat access
         if (level < QUARTERSPEED_LEVEL) {
             clock_prescale_set(clock_div_4);
-            _delay_loop_2(BOGOMIPS*98/100/4);
+            _delay_loop_2(BOGOMIPS*95/100/4);
         }
         //else if (level < HALFSPEED_LEVEL) {
         //    clock_prescale_set(clock_div_2);
-        //    _delay_loop_2(BOGOMIPS*98/100/2);
+        //    _delay_loop_2(BOGOMIPS*95/100/2);
         //}
         else {
             clock_prescale_set(clock_div_1);
-            _delay_loop_2(BOGOMIPS*98/100);
+            _delay_loop_2(BOGOMIPS*95/100);
         }
         // restore regular clock speed
         clock_prescale_set(clock_div_1);
@@ -136,13 +136,13 @@ uint8_t nice_delay_ms(uint16_t ms) {
         // underclock MCU to save power
         clock_prescale_set(clock_div_4);
         // wait
-        _delay_loop_2(BOGOMIPS*98/100/4);
+        _delay_loop_2(BOGOMIPS*95/100/4);
         // restore regular clock speed
         clock_prescale_set(clock_div_1);
         #endif  // ifdef USE_RAMPING
         #else
         // wait
-        _delay_loop_2(BOGOMIPS*98/100);
+        _delay_loop_2(BOGOMIPS*95/100);
         #endif  // ifdef USE_DYNAMIC_UNDERCLOCKING
 
         // run pending system processes while we wait
diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index a898f41..c9ab69b 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -123,7 +123,6 @@ int main() {
     #else
     delay_4ms(1);
     #endif
-    empty_event_sequence();
 
     // fallback for handling a few things
     #ifndef DONT_USE_DEFAULT_STATE
-- 
cgit v1.2.3


From 221371a13918c745d397fdd9b5c1cb8cb76c62a2 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 19:09:22 -0700
Subject: added a lowpass filter for battery voltage measurements (but only on
 attiny1634 devices, since it costs a bit of space and isn't strictly
 necessary)

---
 spaghetti-monster/anduril/cfg-emisar-d4s.h  |  4 ++
 spaghetti-monster/anduril/cfg-emisar-d4v2.h |  3 ++
 spaghetti-monster/fsm-adc.c                 | 59 +++++++++++------------------
 3 files changed, 29 insertions(+), 37 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h
index 230ac7c..a9ac5f0 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4s.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h
@@ -46,3 +46,7 @@
 #define THERMAL_WARNING_SECONDS 3
 #define THERMAL_UPDATE_SPEED 2
 #define THERM_PREDICTION_STRENGTH 4
+
+// attiny1634 has enough space to smooth out voltage readings
+#define USE_VOLTAGE_LOWPASS
+
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.h
index b83c65c..0db1062 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4v2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.h
@@ -49,3 +49,6 @@
 #define USE_TENCLICK_THERMAL_CONFIG
 
 #define THERM_CAL_OFFSET 5
+
+// attiny1634 has enough space to smooth out voltage readings
+#define USE_VOLTAGE_LOWPASS
diff --git a/spaghetti-monster/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index d447189..c859539 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -201,11 +201,6 @@ void ADC_inner() {
 
 #ifdef USE_LVP
 static inline void ADC_voltage_handler() {
-    // LVP declarations
-    #ifdef USE_LVP_AVG
-    #define NUM_VOLTAGE_VALUES 4
-    static int16_t voltage_values[NUM_VOLTAGE_VALUES];
-    #endif
     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
@@ -213,40 +208,30 @@ static inline void ADC_voltage_handler() {
 
     uint16_t measurement = adc_values[0];  // latest 10-bit ADC reading
 
-    #ifdef USE_LVP_AVG
-    // prime on first execution
-    if (voltage == 0) {
-        for(uint8_t i=0; i<NUM_VOLTAGE_VALUES; i++)
-            voltage_values[i] = measurement;
-        voltage = 42;  // the answer to life, the universe, and the voltage of a full li-ion cell
-    } else {
-        uint16_t total = 0;
-        uint8_t i;
-        for(i=0; i<NUM_VOLTAGE_VALUES-1; i++) {
-            voltage_values[i] = voltage_values[i+1];
-            total += voltage_values[i];
-        }
-        voltage_values[i] = measurement;
-        total += measurement;
-        total = total >> 2;
+    #ifdef USE_VOLTAGE_LOWPASS
+        static uint16_t prev_measurement = 0;
 
-        #ifdef USE_VOLTAGE_DIVIDER
-        voltage = calc_voltage_divider(total);
-        #else
-        voltage = (uint16_t)(1.1*1024*10)/total + VOLTAGE_FUDGE_FACTOR;
-        #endif
-    }
-    #else  // no USE_LVP_AVG
-        #ifdef USE_VOLTAGE_DIVIDER
-        voltage = calc_voltage_divider(measurement);
-        #else
-        // calculate actual voltage: volts * 10
-        // ADC = 1.1 * 1024 / volts
-        // volts = 1.1 * 1024 / ADC
-        //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
+        // 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
+
+    #ifdef USE_VOLTAGE_DIVIDER
+    voltage = calc_voltage_divider(measurement);
+    #else
+    // calculate actual voltage: volts * 10
+    // ADC = 1.1 * 1024 / volts
+    // volts = 1.1 * 1024 / ADC
+    //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) {
-- 
cgit v1.2.3


From 69788279c4bac4508d363634e680abf999e6d631 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 19:28:32 -0700
Subject: oops, put voltage lowpass on the wrong D4S

---
 spaghetti-monster/anduril/cfg-emisar-d4s.h   | 3 ---
 spaghetti-monster/anduril/cfg-emisar-d4sv2.h | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h
index a9ac5f0..6fe95a6 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4s.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h
@@ -47,6 +47,3 @@
 #define THERMAL_UPDATE_SPEED 2
 #define THERM_PREDICTION_STRENGTH 4
 
-// attiny1634 has enough space to smooth out voltage readings
-#define USE_VOLTAGE_LOWPASS
-
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
index acc9101..c47e774 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
@@ -61,3 +61,7 @@
 
 // seems relevant on attiny1634
 #define THERM_CAL_OFFSET 5
+
+// attiny1634 has enough space to smooth out voltage readings
+#define USE_VOLTAGE_LOWPASS
+
-- 
cgit v1.2.3


From c8a74e625ea00efc3fd9923e9204e3f32eda4091 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 14 Nov 2019 19:35:33 -0700
Subject: turned off muggle mode on Q8 and MF01S, to make builds small enough
 again

---
 spaghetti-monster/anduril/cfg-blf-q8.h          | 5 +++++
 spaghetti-monster/anduril/cfg-mateminco-mf01s.h | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'spaghetti-monster')

diff --git a/spaghetti-monster/anduril/cfg-blf-q8.h b/spaghetti-monster/anduril/cfg-blf-q8.h
index 970fedb..166b10e 100644
--- a/spaghetti-monster/anduril/cfg-blf-q8.h
+++ b/spaghetti-monster/anduril/cfg-blf-q8.h
@@ -13,6 +13,11 @@
 // lockout: blinking (3)
 #define INDICATOR_LED_DEFAULT_MODE ((3<<2) + 2)
 
+// doesn't quite fit
+#ifdef USE_MUGGLE_MODE
+#undef USE_MUGGLE_MODE
+#endif
+
 // copied from Emisar D4 ramp
 // ../../bin/level_calc.py 1 65 7135 1 0.8 150
 // ... mixed with this:
diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h
index 0585b38..2af1305 100644
--- a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h
+++ b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h
@@ -14,6 +14,12 @@
 #define INDICATOR_LED_DEFAULT_MODE ((3<<2) + 1)
 
 
+// doesn't quite fit
+#ifdef USE_MUGGLE_MODE
+#undef USE_MUGGLE_MODE
+#endif
+
+
 // don't blink during ramp, it's irrelevant and annoying on this light
 #define BLINK_AT_RAMP_CEILING
 #undef BLINK_AT_RAMP_MIDDLE
-- 
cgit v1.2.3