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-pcint.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'spaghetti-monster/fsm-pcint.c')

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
-- 
cgit v1.2.3


From ed6a02bc0ba93b9ef3139a545225b611fc4c99dc Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 19 Nov 2019 00:06:41 -0700
Subject: cleaned up WDT code a bit, reduced total size, fixed bug where
 ticks_since_last could have the wrong value sometimes, reduced power use in
 sleep mode very slightly by skipping button-handling code while asleep

---
 spaghetti-monster/fsm-pcint.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'spaghetti-monster/fsm-pcint.c')

diff --git a/spaghetti-monster/fsm-pcint.c b/spaghetti-monster/fsm-pcint.c
index a4a496a..1ba1c15 100644
--- a/spaghetti-monster/fsm-pcint.c
+++ b/spaghetti-monster/fsm-pcint.c
@@ -97,8 +97,7 @@ void PCINT_inner(uint8_t pressed) {
         pushed = push_event(B_RELEASE);
     }
 
-    // check if sequence matches any defined sequences
-    // if so, send event to current state callback
+    // send event to the current state callback
     if (pushed) {
         button_last_state = pressed;
         emit_current_event(0);
-- 
cgit v1.2.3