From 2173d1e3641ca2396a4460e5736823013e1c9357 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 27 Sep 2020 03:26:01 -0600
Subject: reworked nice_delay interrupt system and fixed some old issues:

- added set_state_deferred(), to avoid timing issues when changing state in loop()
  (fixes bug where first button press after version check was sometimes ignored,
   and similar issue after battcheck in simple UI)

- reduced chance of eating first button press after simple UI's battcheck,
  because it spent an extra second waiting after finishing the readout,
  and it wasn't intuitive for a single click to go from "post-battcheck darkness"
  to "off" during that period

- made interrupt_nice_delays() happen every time the state changes, instead of
  having nice_delay() explicitly check for state changes while it waits...
  (because the explicit check was buggy and used more ROM)

- made nice_delay_ms() abort immediately when interrupt is set, instead of waiting
  1ms before it even checks for the interrupt condition...  this makes aborted
  animations end a lot faster, with less visible flickering

- made blink_num() smaller and simpler, because changes listed above make it possible

- slightly changed order of events in main(), to accommodate for changes above

- fixed issue where battcheck would keep trying to blink out numbers while the user
  was holding 10H for voltage config mode

- ... and reduced ROM size by about 38 bytes

---
 spaghetti-monster/fsm-main.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/spaghetti-monster/fsm-main.c b/spaghetti-monster/fsm-main.c
index 790cc68..0457d75 100644
--- a/spaghetti-monster/fsm-main.c
+++ b/spaghetti-monster/fsm-main.c
@@ -139,6 +139,14 @@ int main() {
         // if event queue not empty, empty it
         process_emissions();
 
+        // if loop() tried to change state, process that now
+        StatePtr df = deferred_state;
+        if (df) {
+            set_state(df, deferred_state_arg);
+            deferred_state = NULL;
+            //deferred_state_arg = 0;  // unnecessary
+        }
+
         // enter standby mode if requested
         // (works better if deferred like this)
         if (go_to_standby) {
@@ -164,11 +172,12 @@ int main() {
         // catch up on interrupts
         handle_deferred_interrupts();
 
+        // turn delays back on, if they were off
+        nice_delay_interrupt = 0;
+
         // give the recipe some time slices
         loop();
 
-        // in case we fell through, turn delays back on
-        nice_delay_interrupt = 0;
     }
 }
 
-- 
cgit v1.2.3