diff options
| author | Selene ToyKeeper | 2018-11-11 16:20:36 -0700 |
|---|---|---|
| committer | Selene ToyKeeper | 2018-11-11 16:20:36 -0700 |
| commit | 4328934ed1ce704a44fef3e58d1c7090fe7aaf38 (patch) | |
| tree | 7f836bb7e8f6e8aabdceee3a86ac33d3f1531bac /spaghetti-monster/ramping-ui/ramping-ui.c | |
| parent | calibrated Sofirn SP36 config (diff) | |
| parent | Updated RampingIOS V3 to new event API. Applied recent changes from Anduril ... (diff) | |
| download | anduril-4328934ed1ce704a44fef3e58d1c7090fe7aaf38.tar.gz anduril-4328934ed1ce704a44fef3e58d1c7090fe7aaf38.tar.bz2 anduril-4328934ed1ce704a44fef3e58d1c7090fe7aaf38.zip | |
merged event-rework branch; reduces ROM size by ~700 bytes and simplifies event system
Diffstat (limited to 'spaghetti-monster/ramping-ui/ramping-ui.c')
| -rw-r--r-- | spaghetti-monster/ramping-ui/ramping-ui.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spaghetti-monster/ramping-ui/ramping-ui.c b/spaghetti-monster/ramping-ui/ramping-ui.c index e6f571d..234cdf4 100644 --- a/spaghetti-monster/ramping-ui/ramping-ui.c +++ b/spaghetti-monster/ramping-ui/ramping-ui.c @@ -31,12 +31,12 @@ #include "spaghetti-monster.h" // FSM states -uint8_t off_state(EventPtr event, uint16_t arg); -uint8_t steady_state(EventPtr event, uint16_t arg); -uint8_t strobe_state(EventPtr event, uint16_t arg); +uint8_t off_state(Event event, uint16_t arg); +uint8_t steady_state(Event event, uint16_t arg); +uint8_t strobe_state(Event event, uint16_t arg); #ifdef USE_BATTCHECK -uint8_t battcheck_state(EventPtr event, uint16_t arg); -uint8_t tempcheck_state(EventPtr event, uint16_t arg); +uint8_t battcheck_state(Event event, uint16_t arg); +uint8_t tempcheck_state(Event event, uint16_t arg); #endif // brightness control @@ -54,7 +54,7 @@ volatile uint8_t strobe_delay = 67; volatile uint8_t strobe_type = 0; // 0 == party strobe, 1 == tactical strobe -uint8_t off_state(EventPtr event, uint16_t arg) { +uint8_t off_state(Event event, uint16_t arg) { // turn emitter off when entering state if (event == EV_enter_state) { set_level(0); @@ -121,7 +121,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) { } -uint8_t steady_state(EventPtr event, uint16_t arg) { +uint8_t steady_state(Event event, uint16_t arg) { // turn LED on when we first enter the mode if (event == EV_enter_state) { // remember this level, unless it's moon or turbo @@ -243,7 +243,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) { } -uint8_t strobe_state(EventPtr event, uint16_t arg) { +uint8_t strobe_state(Event event, uint16_t arg) { if (event == EV_enter_state) { return MISCHIEF_MANAGED; } @@ -281,7 +281,7 @@ uint8_t strobe_state(EventPtr event, uint16_t arg) { #ifdef USE_BATTCHECK -uint8_t battcheck_state(EventPtr event, uint16_t arg) { +uint8_t battcheck_state(Event event, uint16_t arg) { // 1 click: off if (event == EV_1click) { set_state(off_state, 0); @@ -295,7 +295,7 @@ uint8_t battcheck_state(EventPtr event, uint16_t arg) { return EVENT_NOT_HANDLED; } -uint8_t tempcheck_state(EventPtr event, uint16_t arg) { +uint8_t tempcheck_state(Event event, uint16_t arg) { // 1 click: off if (event == EV_1click) { set_state(off_state, 0); |