diff options
| author | Selene ToyKeeper | 2023-11-02 11:05:02 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2023-11-02 11:05:02 -0600 |
| commit | ffd9f90898699df87bf9cb283aaa724774bd91bd (patch) | |
| tree | e8b6a33a5814d0b1adc6c630043650dfc19ee959 /spaghetti-monster/meteor | |
| parent | added a "tactical mode" on "Off -> 6C" (diff) | |
| parent | slightly longer smooth-off animation, to make on and off feel symmetrical (diff) | |
| download | anduril-ffd9f90898699df87bf9cb283aaa724774bd91bd.tar.gz anduril-ffd9f90898699df87bf9cb283aaa724774bd91bd.tar.bz2 anduril-ffd9f90898699df87bf9cb283aaa724774bd91bd.zip | |
merged multi-channel branch with a major refactor and half a year of updates
Diffstat (limited to 'spaghetti-monster/meteor')
| -rw-r--r-- | spaghetti-monster/meteor/meteor.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/spaghetti-monster/meteor/meteor.c b/spaghetti-monster/meteor/meteor.c index 7d854a1..9c1c000 100644 --- a/spaghetti-monster/meteor/meteor.c +++ b/spaghetti-monster/meteor/meteor.c @@ -262,7 +262,7 @@ uint8_t base_on_state(Event event, uint16_t arg, uint8_t *mode, uint8_t *group) // 1 click: off if (event == EV_1click) { set_state(base_off_state, 0); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } #ifdef USE_THERMAL_REGULATION // overheating: drop by an amount proportional to how far we are above the ceiling @@ -312,17 +312,17 @@ uint8_t ui1_on_state(Event event, uint16_t arg) { else if (event == EV_2clicks) { *mode ^= 1; set_any_mode(*mode, group); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // hold: turbo else if (event == EV_hold) { if (arg == 0) set_level(MAX_LEVEL); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // release: exit turbo else if (event == EV_click1_hold_release) { set_any_mode(*mode, group); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } return base_on_state(event, arg, mode, group); } @@ -361,7 +361,7 @@ uint8_t ui2_on_state(Event event, uint16_t arg) { else if (event == EV_2clicks) { *mode ^= 1; set_any_mode(*mode, group); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // hold: rotate through low/mid/high/turbo else if (event == EV_hold) { @@ -371,7 +371,7 @@ uint8_t ui2_on_state(Event event, uint16_t arg) { else if (arg % HOLD_TIMEOUT == 1) { set_any_mode(*mode, group); } - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } return base_on_state(event, arg, mode, group); } @@ -413,7 +413,7 @@ uint8_t ui3_on_state(Event event, uint16_t arg) { /* else if (event == EV_click1_hold) { set_level(levels[*mode]); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } */ // hold: turbo @@ -427,7 +427,7 @@ uint8_t blinky_base_state(Event event, uint16_t arg) { // 1 click: off if (event == EV_1click) { set_state(base_off_state, 0); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } return EVENT_NOT_HANDLED; } |