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/darkhorse/darkhorse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'spaghetti-monster/darkhorse') diff --git a/spaghetti-monster/darkhorse/darkhorse.c b/spaghetti-monster/darkhorse/darkhorse.c index 4058c2f..aa37b92 100644 --- a/spaghetti-monster/darkhorse/darkhorse.c +++ b/spaghetti-monster/darkhorse/darkhorse.c @@ -166,12 +166,12 @@ uint8_t any_mode_state(Event event, uint16_t arg, uint8_t *primary, uint8_t *sec // turn on LED when entering the mode if (event == EV_enter_state) { set_any_mode(*primary, *secondary, modes); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // 1 click: off else if (event == EV_1click) { set_state(off_state, 0); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // hold: change brightness (low, med, hi, always starting at low) else if (event == EV_click1_hold) { @@ -187,14 +187,14 @@ uint8_t any_mode_state(Event event, uint16_t arg, uint8_t *primary, uint8_t *sec set_state(hi_mode_state, 0); break; } - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // 2 clicks: toggle primary/secondary level else if (event == EV_2clicks) { *primary ^= 1; set_any_mode(*primary, *secondary, modes); save_config(); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // click-release-hold: change secondary level else if (event == EV_click2_hold) { @@ -204,7 +204,7 @@ uint8_t any_mode_state(Event event, uint16_t arg, uint8_t *primary, uint8_t *sec *primary = 0; set_any_mode(*primary, *secondary, modes); } - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // click, hold, release: save secondary level else if (event == EV_click2_hold_release) { @@ -259,20 +259,20 @@ uint8_t strobe_beacon_state(Event event, uint16_t arg) { // 1 click: off if (event == EV_1click) { set_state(off_state, 0); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // 1 click (initially): cancel current blink // FIXME: this is no longer necessary; FSM does this automatically now if (event == EV_click1_release) { interrupt_nice_delays(); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } // 2 clicks: rotate through blinky modes else if (event == EV_2clicks) { strobe_beacon_mode = (strobe_beacon_mode + 1) & 3; save_config(); interrupt_nice_delays(); - return MISCHIEF_MANAGED; + return EVENT_HANDLED; } return EVENT_NOT_HANDLED; } -- cgit v1.2.3