merged multi-channel branch with a major refactor and half a year of updates

1 files changed, 90 insertions, 90 deletions

diff --git a/spaghetti-monster/fireflies-ui/fireflies-ui.c b/spaghetti-monster/fireflies-ui/fireflies-ui.c
index 93a3180..34f8293 100644
--- a/spaghetti-monster/fireflies-ui/fireflies-ui.c
+++ b/spaghetti-monster/fireflies-ui/fireflies-ui.c
@@ -460,7 +460,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         #endif
         // sleep while off  (lower power use)
         go_to_standby = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // go back to sleep eventually if we got bumped but didn't leave "off" state
     else if (event == EV_tick) {
@@ -470,7 +470,7 @@ uint8_t off_state(Event event, uint16_t arg) {
             indicator_led(indicator_led_mode & 0x03);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(TICK_DURING_STANDBY) && defined(USE_INDICATOR_LED)
     // blink the indicator LED, maybe
@@ -478,13 +478,13 @@ uint8_t off_state(Event event, uint16_t arg) {
         if ((indicator_led_mode & 0b00000011) == 0b00000011) {
             indicator_blink(arg);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold (initially): go to lowest level (floor), but allow abort for regular click
     else if (event == EV_click1_press) {
         set_level(nearest_level(1));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: go to lowest level
     else if (event == EV_click1_hold) {
@@ -500,75 +500,75 @@ uint8_t off_state(Event event, uint16_t arg) {
         if (arg >= (!ramp_style) * HOLD_TIMEOUT) {  // more consistent
             set_state(steady_state, 1);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold, release quickly: go to lowest level (floor)
     else if (event == EV_click1_hold_release) {
         set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click (before timeout): go to memorized level, but allow abort for double click
     else if (event == EV_click1_release) {
         set_level(nearest_level(memorized_level));
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: regular mode
     else if (event == EV_1click) {
         set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: go to highest level (ceiling) (for ramping down)
     else if (event == EV_click2_hold) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: highest mode (ceiling)
     else if (event == EV_2clicks) {
         set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks (initial press): off, to prep for later events
     else if (event == EV_click3_press) {
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_BATTCHECK
     // 3 clicks: battcheck mode / blinky mode group 1
     else if (event == EV_3clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // click, click, long-click: strobe mode
     #ifdef USE_STROBE_STATE
     else if (event == EV_click3_hold) {
         set_state(strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #elif defined(USE_BORING_STROBE_STATE)
     else if (event == EV_click3_hold) {
         set_state(boring_strobe_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 4 clicks: soft lockout
     else if (event == EV_4clicks) {
         blink_confirm(2);
         set_state(lockout_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 5 clicks: momentary mode
     else if (event == EV_5clicks) {
         blink_confirm(1);
         set_state(momentary_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_MUGGLE_MODE
     // 6 clicks: muggle mode
     else if (event == EV_6clicks) {
         blink_confirm(1);
         set_state(muggle_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_INDICATOR_LED
@@ -586,19 +586,19 @@ uint8_t off_state(Event event, uint16_t arg) {
         indicator_led_mode = (indicator_led_mode & 0b11111100) | mode;
         indicator_led(mode);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 8 clicks: temperature check
     else if (event == EV_8clicks) {
         set_state(tempcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_TENCLICK_THERMAL_CONFIG
     // 10 clicks: thermal config mode
     else if (event == EV_10clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -637,12 +637,12 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_REVERSING
         ramp_direction = 1;
         #endif
-        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;
     }
     // 2 clicks: go to/from highest level
     else if (event == EV_2clicks) {
@@ -659,7 +659,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             #endif
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: toggle smooth vs discrete ramping
     else if (event == EV_3clicks) {
@@ -677,20 +677,20 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #endif
         blip();
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_RAMP_CONFIG
     // 4 clicks: configure this ramp mode
     else if (event == EV_4clicks) {
         push_state(ramp_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         #ifdef USE_REVERSING
         // fix ramp direction on first frame if necessary
@@ -744,7 +744,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_REVERSING) || defined(START_AT_MEMORIZED_LEVEL)
     // reverse ramp direction on hold release
@@ -755,7 +755,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef START_AT_MEMORIZED_LEVEL
         save_config_wl();
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // click, hold: change brightness (dimmer)
@@ -765,7 +765,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #endif
         // ramp slower in discrete mode
         if (ramp_style  &&  (arg % HOLD_TIMEOUT != 0)) {
-            return MISCHIEF_MANAGED;
+            return EVENT_HANDLED;
         }
         // TODO? make it ramp up instead, if already at min?
         memorized_level = nearest_level((int16_t)actual_level - ramp_step_size);
@@ -804,13 +804,13 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef START_AT_MEMORIZED_LEVEL
     // click, release, hold, release: save new ramp level (if necessary)
     else if (event == EV_click2_hold_release) {
         save_config_wl();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #if defined(USE_SET_LEVEL_GRADUALLY) || defined(USE_REVERSING)
@@ -822,7 +822,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         #ifdef USE_SET_LEVEL_GRADUALLY
         // make thermal adjustment speed scale with magnitude
         if ((arg & 1) && (actual_level < THERM_FASTER_LEVEL)) {
-            return MISCHIEF_MANAGED;  // adjust slower when not a high mode
+            return EVENT_HANDLED;  // adjust slower when not a high mode
         }
         #ifdef THERM_HARD_TURBO_DROP
         else if ((! (actual_level < THERM_FASTER_LEVEL))
@@ -864,7 +864,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
         }
         #endif
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_THERMAL_REGULATION
@@ -893,7 +893,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepdown);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // underheating: increase slowly if we're lower than the target
     //               (proportional to how low we are)
@@ -912,7 +912,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
             set_level(stepup);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -1004,18 +1004,18 @@ uint8_t strobe_state(Event event, uint16_t arg) {
     // init anything which needs to be initialized
     else if (event == EV_enter_state) {
         ramp_direction = 1;
-        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;
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         strobe_type = (st + 1) % NUM_STROBES;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change speed (go faster)
     //       or change brightness (brighter)
@@ -1052,14 +1052,14 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         }
         #endif
 
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     // ... and save new strobe settings
     else if (event == EV_click1_hold_release) {
         ramp_direction = -ramp_direction;
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change speed (go slower)
     //       or change brightness (dimmer)
@@ -1093,12 +1093,12 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         }
         #endif
 
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // release hold: save new strobe settings
     else if (event == EV_click2_hold_release) {
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_LIGHTNING_MODE) || defined(USE_CANDLE_MODE)
     // clock tick: bump the random seed
@@ -1107,7 +1107,7 @@ uint8_t strobe_state(Event event, uint16_t arg) {
         if (arg == TICKS_PER_SECOND) ramp_direction = 1;
 
         pseudo_rand_seed += arg;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -1223,14 +1223,14 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
     if (event == EV_enter_state) {
         candle_mode_timer = 0;  // in case any time was left over from earlier
         ramp_direction = 1;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: cancel timer
     else if (event == EV_2clicks) {
         // parent state just rotated through strobe/flasher modes,
         // so cancel timer...  in case any time was left over from earlier
         candle_mode_timer = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change brightness (brighter)
     else if (event == EV_click1_hold) {
@@ -1243,19 +1243,19 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
         candle_mode_brightness += ramp_direction;
         if (candle_mode_brightness < 1) candle_mode_brightness = 1;
         else if (candle_mode_brightness > MAX_CANDLE_LEVEL) candle_mode_brightness = MAX_CANDLE_LEVEL;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
         ramp_direction = -ramp_direction;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, hold: change brightness (dimmer)
     else if (event == EV_click2_hold) {
         ramp_direction = 1;
         if (candle_mode_brightness > 1)
             candle_mode_brightness --;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 3 clicks: add 30m to candle timer
     else if (event == EV_3clicks) {
@@ -1266,7 +1266,7 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
             set_level(actual_level + 32);
             delay_4ms(2);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // clock tick: animate candle brightness
     else if (event == EV_tick) {
@@ -1328,7 +1328,7 @@ uint8_t candle_mode_state(Event event, uint16_t arg) {
             // random amplitude
             //candle_wave3_depth = 2 + (pseudo_rand() % ((CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100) - 2));
             candle_wave3_depth = pseudo_rand() % (CANDLE_WAVE3_MAXDEPTH * CANDLE_AMPLITUDE / 100);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1345,19 +1345,19 @@ uint8_t boring_strobe_state(Event event, uint16_t arg) {
     momentary_mode = 1;  // 0 = ramping, 1 = strobes
 
     if (event == EV_enter_state) {
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 1 click: off
     else if (event == EV_1click) {
         // reset to police strobe for next time
         boring_strobe_type = 0;
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 2 clicks: rotate through strobe/flasher modes
     else if (event == EV_2clicks) {
         boring_strobe_type = (st + 1) % NUM_BORING_STROBES;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1411,7 +1411,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(USE_GOODNIGHT_MODE) || defined(USE_BEACON_MODE)
     // 2 clicks: next mode
@@ -1421,7 +1421,7 @@ uint8_t battcheck_state(Event event, uint16_t arg) {
         #elif defined(USE_BEACON_MODE)
         set_state(beacon_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     return EVENT_NOT_HANDLED;
@@ -1434,19 +1434,19 @@ uint8_t tempcheck_state(Event event, uint16_t arg) {
     // 1 click: off
     if (event == EV_1click) {
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if 0  // not part of a loop in this UI
     // 2 clicks: battcheck mode
     else if (event == EV_2clicks) {
         set_state(battcheck_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // 4 clicks: thermal config mode
     else if (event == EV_4clicks) {
         push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1458,7 +1458,7 @@ uint8_t 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;
     }
     // TODO: use sleep ticks to measure time between pulses,
     //       to save power
@@ -1469,12 +1469,12 @@ uint8_t beacon_state(Event event, uint16_t arg) {
         #else
         set_state(battcheck_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // 4 clicks: beacon config mode
     else if (event == EV_4clicks) {
         push_state(beacon_config_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1490,12 +1490,12 @@ uint8_t goodnight_state(Event event, uint16_t arg) {
         ticks_since_stepdown = 0;
         blink_confirm(2);
         set_level(GOODNIGHT_LEVEL);
-        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;
     }
     // 2 clicks: beacon mode
     else if (event == EV_2clicks) {
@@ -1504,7 +1504,7 @@ uint8_t goodnight_state(Event event, uint16_t arg) {
         #elif defined(USE_TEMPCHECK_MODE)
         set_state(tempcheck_state, 0);
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // tick: step down (maybe) or off (maybe)
     else if (event == EV_tick) {
@@ -1520,7 +1520,7 @@ uint8_t goodnight_state(Event event, uint16_t arg) {
                 set_state(off_state, 0);
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }
@@ -1572,14 +1572,14 @@ uint8_t lockout_state(Event event, uint16_t arg) {
             indicator_led(indicator_led_mode >> 2);
             #endif
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if defined(TICK_DURING_STANDBY) && defined(USE_INDICATOR_LED)
     else if (event == EV_sleep_tick) {
         if ((indicator_led_mode & 0b00001100) == 0b00001100) {
             indicator_blink(arg);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #ifdef USE_INDICATOR_LED
@@ -1597,7 +1597,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         indicator_led_mode = (mode << 2) + (indicator_led_mode & 0x03);
         indicator_led(mode);
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #if 0  // old method, deprecated in favor of "7 clicks from off"
     // click, click, hold: rotate through indicator LED modes (off mode)
@@ -1624,12 +1624,12 @@ uint8_t lockout_state(Event event, uint16_t arg) {
         indicator_led(mode);
         #endif
         //save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // click, click, hold, release: save indicator LED mode (off mode)
     else if (event == EV_click3_hold_release) {
         save_config();
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     #endif
@@ -1637,7 +1637,7 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     else if (event == EV_4clicks) {
         blink_confirm(1);
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -1660,14 +1660,14 @@ uint8_t momentary_state(Event event, uint16_t arg) {
         if (momentary_mode == 0) {
             set_level(memorized_level);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // button was released
     else if ((event & (B_CLICK | B_PRESS)) == (B_CLICK)) {
         momentary_active = 0;
         set_level(0);
         //go_to_standby = 1;  // sleep while light is off
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     // Sleep, dammit!  (but wait a few seconds first)
@@ -1688,7 +1688,7 @@ uint8_t momentary_state(Event event, uint16_t arg) {
                 // TODO: lighted button should use lockout config?
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -1721,7 +1721,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
             //memorized_level = MAX_1x7135;
             memorized_level = (MUGGLE_FLOOR + MUGGLE_CEILING) / 2;
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // initial press: moon hint
     else if (event == EV_click1_press) {
@@ -1749,12 +1749,12 @@ uint8_t muggle_state(Event event, uint16_t arg) {
             set_level(memorized_level);
         }
         */
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // hold: change brightness
     else if (event == EV_click1_hold) {
         // ramp at half speed
-        if (arg & 1) return MISCHIEF_MANAGED;
+        if (arg & 1) return EVENT_HANDLED;
 
         // if off, start at bottom
         if (muggle_off_mode) {
@@ -1776,7 +1776,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
             memorized_level = m;
             set_level(m);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // reverse ramp direction on hold release
     else if (event == EV_click1_hold_release) {
@@ -1784,7 +1784,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         #ifdef START_AT_MEMORIZED_LEVEL
         save_config_wl();  // momentary use should retain brightness level
         #endif
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     /*
     // click, hold: change brightness (dimmer)
@@ -1793,7 +1793,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         if (memorized_level > MUGGLE_FLOOR)
             memorized_level = actual_level - 1;
         set_level(memorized_level);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     */
     // 6 clicks: exit muggle mode
@@ -1802,7 +1802,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         muggle_mode_active = 0;
         save_config();
         set_state(off_state, 0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // tick: housekeeping
     else if (event == EV_tick) {
@@ -1815,7 +1815,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
                 go_to_standby = 1;  // sleep while light is off
             }
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #ifdef USE_THERMAL_REGULATION
     // overheating is handled specially in muggle mode
@@ -1827,7 +1827,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         uint8_t new = actual_level - arg;
         if (new < MUGGLE_FLOOR) { new = MUGGLE_FLOOR; }
         set_level(new);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     #endif
     // low voltage is handled specially in muggle mode
@@ -1838,7 +1838,7 @@ uint8_t muggle_state(Event event, uint16_t arg) {
         } else {
             muggle_off_mode = 1;
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
 
     return EVENT_NOT_HANDLED;
@@ -1854,7 +1854,7 @@ uint8_t config_state_base(Event event, uint16_t arg,
     if (event == EV_enter_state) {
         config_step = 0;
         set_level(0);
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance forward through config steps
     else if (event == EV_tick) {
@@ -1868,13 +1868,13 @@ uint8_t config_state_base(Event event, uint16_t arg,
             //set_state(retstate, retval);
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // an option was set (return from number_entry_state)
     else if (event == EV_reenter_state) {
         config_state_values[config_step] = number_entry_value;
         config_step ++;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     //return EVENT_NOT_HANDLED;
     // eat all other events; don't pass any through to parent
@@ -1978,7 +1978,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
         blinks_left = arg;
         entry_step = 0;
         wait_ticks = 0;
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // advance through the process:
     // 0: wait a moment
@@ -2035,7 +2035,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             number_entry_value = value;
             pop_state();
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     // count clicks
     else if (event == EV_click1_release) {
@@ -2048,7 +2048,7 @@ uint8_t number_entry_state(Event event, uint16_t arg) {
             delay_4ms(8/2);
             set_level(0);
         }
-        return MISCHIEF_MANAGED;
+        return EVENT_HANDLED;
     }
     return EVENT_NOT_HANDLED;
 }