aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster/baton
diff options
context:
space:
mode:
authorSelene ToyKeeper2023-11-02 11:05:02 -0600
committerSelene ToyKeeper2023-11-02 11:05:02 -0600
commitffd9f90898699df87bf9cb283aaa724774bd91bd (patch)
treee8b6a33a5814d0b1adc6c630043650dfc19ee959 /spaghetti-monster/baton
parentadded a "tactical mode" on "Off -> 6C" (diff)
parentslightly longer smooth-off animation, to make on and off feel symmetrical (diff)
downloadanduril-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/baton')
-rw-r--r--spaghetti-monster/baton/baton.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/spaghetti-monster/baton/baton.c b/spaghetti-monster/baton/baton.c
index 8a80134..e672755 100644
--- a/spaghetti-monster/baton/baton.c
+++ b/spaghetti-monster/baton/baton.c
@@ -152,12 +152,12 @@ uint8_t lockout_state(Event event, uint16_t arg) {
PWM1_LVL = 0; PWM2_LVL = 0; // make sure emitters are off
// sleep 1 second after user stops pressing buttons
if (arg > TICKS_PER_SECOND) { go_to_standby = 1; }
- return MISCHIEF_MANAGED;
+ return EVENT_HANDLED;
}
// 4 clicks: exit, and turn on at "low" level
else if (event == EV_4clicks) {
set_state(steady_state, 1);
- return MISCHIEF_MANAGED;
+ return EVENT_HANDLED;
}
return EVENT_NOT_HANDLED;
}