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-states.c | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/spaghetti-monster/fsm-states.c b/spaghetti-monster/fsm-states.c
index f91dc4b..4d9ac08 100644
--- a/spaghetti-monster/fsm-states.c
+++ b/spaghetti-monster/fsm-states.c
@@ -39,6 +39,9 @@ void _set_state(StatePtr new_state, uint16_t arg,
     current_state = new_state;
     // call new state-enter hook (don't use stack)
     if (new_state != NULL) current_state(enter_event, arg);
+
+    // since state changed, stop any animation in progress
+    interrupt_nice_delays();
 }
 
 int8_t push_state(StatePtr new_state, uint16_t arg) {
@@ -79,6 +82,11 @@ uint8_t set_state(StatePtr new_state, uint16_t arg) {
     return push_state(new_state, arg);
 }
 
+void set_state_deferred(StatePtr new_state, uint16_t arg) {
+    deferred_state = new_state;
+    deferred_state_arg = arg;
+}
+
 #ifndef DONT_USE_DEFAULT_STATE
 // bottom state on stack
 // handles default actions for LVP, thermal regulation, etc
-- 
cgit v1.2.3