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.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'spaghetti-monster/fsm-states.h') diff --git a/spaghetti-monster/fsm-states.h b/spaghetti-monster/fsm-states.h index 7d9361b..9964bc1 100644 --- a/spaghetti-monster/fsm-states.h +++ b/spaghetti-monster/fsm-states.h @@ -40,6 +40,13 @@ void _set_state(StatePtr new_state, uint16_t arg, int8_t push_state(StatePtr new_state, uint16_t arg); StatePtr pop_state(); uint8_t set_state(StatePtr new_state, uint16_t arg); + +// if loop() needs to change state, use this instead of set_state() +// (because this avoids race conditions) +volatile StatePtr deferred_state; +volatile uint16_t deferred_state_arg; +void set_state_deferred(StatePtr new_state, uint16_t arg); + #ifndef DONT_USE_DEFAULT_STATE uint8_t default_state(Event event, uint16_t arg); #endif -- cgit v1.2.3