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/baton | |
| 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/baton')
| -rw-r--r-- | spaghetti-monster/baton/baton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spaghetti-monster/baton/baton.c b/spaghetti-monster/baton/baton.c index d4725ef..d138297 100644 --- a/spaghetti-monster/baton/baton.c +++ b/spaghetti-monster/baton/baton.c @@ -24,9 +24,9 @@ #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 lockout_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 lockout_state(Event event, uint16_t arg); // brightness control uint8_t memorized_level = 1; @@ -47,7 +47,7 @@ void set_level(uint8_t lvl) { PWM2_LVL = pwm2_levels[lvl]; } -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) { go_to_standby = 1; // sleep while off (lower power use) @@ -86,7 +86,7 @@ uint8_t off_state(EventPtr event, uint16_t arg) { return EVENT_NOT_HANDLED; } -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 @@ -146,7 +146,7 @@ uint8_t steady_state(EventPtr event, uint16_t arg) { return EVENT_NOT_HANDLED; } -uint8_t lockout_state(EventPtr event, uint16_t arg) { +uint8_t lockout_state(Event event, uint16_t arg) { // stay asleep while locked if (event == EV_tick) { PWM1_LVL = 0; PWM2_LVL = 0; // make sure emitters are off |