From 3bf052387709ab2fcffcacf91dec7302f7c0e50c Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 29 Jun 2023 02:44:53 -0600 Subject: Removed references to Harry Potter, because J.K. Rowling is the figurehead of a hate group and I don't want to condone that in any way. I liked a 2-word phrase she wrote once, "mischief managed", but that was decades ago... and now she is the face of a transphobic movement known as TERFs. She turned out to be a pretty terrible person who uses her massive wealth and influence to spread hate and oppress people. To be clear: Trans rights are human rights. ... and anyone who has a problem with that has no place in this project. Patch suggested by SiteRelEnby, and TBH it's embarrassing that I didn't remove the phrase sooner. It seemed fun and innocent in 2017 when this project started, but ... things changed. https://github.com/SiteRelEnby/anduril2/commit/a1cee423b4e0e16909a90d5c3e6a7b70df30d755 --- spaghetti-monster/meteor/meteor.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'spaghetti-monster/meteor/meteor.c') 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; } -- cgit v1.2.3