Anduril Pocket: The pocket-friendly flashlight UI

Author: SammysHP

ToyKeeper/spaghetti-monster/anduril/lockout-mode.c

@@ -98,31 +98,11 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     #endif
 
     // 3 clicks: exit and turn off
-    else if (event == EV_3clicks) {
+    else if (event == EV_5clicks) {
         blink_once();
         set_state(off_state, 0);
         return MISCHIEF_MANAGED;
     }
-    // 4 clicks: exit and turn on
-    else if (event == EV_4clicks) {
-        set_state(steady_state, memorized_level);
-        return MISCHIEF_MANAGED;
-    }
-    // 4 clicks, but hold last: exit and start at floor
-    else if (event == EV_click4_hold) {
-        //blink_once();
-        blip();
-        // reset button sequence to avoid activating anything in ramp mode
-        current_event = 0;
-        // ... and back to ramp mode
-        set_state(steady_state, 1);
-        return MISCHIEF_MANAGED;
-    }
-    // 5 clicks: exit and turn on at ceiling level
-    else if (event == EV_5clicks) {
-        set_state(steady_state, MAX_LEVEL);
-        return MISCHIEF_MANAGED;
-    }
 
     ////////// Every action below here is blocked in the simple UI //////////
     #ifdef USE_SIMPLE_UI

ToyKeeper/spaghetti-monster/anduril/off-mode.c

@@ -87,13 +87,13 @@ uint8_t off_state(Event event, uint16_t arg) {
     #endif
     #if (B_TIMING_ON == B_PRESS_T)
     // hold (initially): go to lowest level (floor), but allow abort for regular click
-    else if (event == EV_click1_press) {
+    else if (event == EV_click2_press) {
         set_level(nearest_level(1));
         return MISCHIEF_MANAGED;
     }
     #endif  // B_TIMING_ON == B_PRESS_T
     // hold: go to lowest level
-    else if (event == EV_click1_hold) {
+    else if (event == EV_click2_hold) {
         #if (B_TIMING_ON == B_PRESS_T)
         #ifdef MOON_TIMING_HINT
         if (arg == 0) {
@@ -118,13 +118,13 @@ uint8_t off_state(Event event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     // hold, release quickly: go to lowest level (floor)
-    else if (event == EV_click1_hold_release) {
+    else if (event == EV_click2_hold_release) {
         set_state(steady_state, 1);
         return MISCHIEF_MANAGED;
     }
     #if (B_TIMING_ON != B_TIMEOUT_T)
     // 1 click (before timeout): go to memorized level, but allow abort for double click
-    else if (event == EV_click1_release) {
+    else if (event == EV_click2_release) {
         #if defined(USE_MANUAL_MEMORY) && !defined(USE_MANUAL_MEMORY_TIMER)
             // this clause probably isn't used by any configs any more
             // but is included just in case someone configures it this way
@@ -140,7 +140,7 @@ uint8_t off_state(Event event, uint16_t arg) {
     }
     #endif  // if (B_TIMING_ON != B_TIMEOUT_T)
     // 1 click: regular mode
-    else if (event == EV_1click) {
+    else if (event == EV_2clicks) {
         #if (B_TIMING_ON != B_TIMEOUT_T)
         // brightness was already set; reuse previous value
         set_state(steady_state, actual_level);
@@ -152,7 +152,7 @@ uint8_t off_state(Event event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     // click, hold: momentary at ceiling or turbo
-    else if (event == EV_click2_hold) {
+    else if (event == EV_click3_hold) {
         uint8_t turbo_level;  // how bright is "turbo"?
 
         #if defined(USE_2C_STYLE_CONFIG)  // user can choose 2C behavior
@@ -178,30 +178,30 @@ uint8_t off_state(Event event, uint16_t arg) {
         set_level(turbo_level);
         return MISCHIEF_MANAGED;
     }
-    else if (event == EV_click2_hold_release) {
+    else if (event == EV_click3_hold_release) {
         set_level(0);
         return MISCHIEF_MANAGED;
     }
     // 2 clicks: highest mode (ceiling)
-    else if (event == EV_2clicks) {
+    else if (event == EV_3clicks) {
         set_state(steady_state, MAX_LEVEL);
         return MISCHIEF_MANAGED;
     }
     // 3 clicks (initial press): off, to prep for later events
-    else if (event == EV_click3_press) {
+    else if (event == EV_click4_press) {
         set_level(0);
         return MISCHIEF_MANAGED;
     }
     #ifdef USE_BATTCHECK
     // 3 clicks: battcheck mode / blinky mode group 1
-    else if (event == EV_3clicks) {
+    else if (event == EV_4clicks) {
         set_state(battcheck_state, 0);
         return MISCHIEF_MANAGED;
     }
     #endif
     #ifdef USE_LOCKOUT_MODE
     // 4 clicks: soft lockout
-    else if (event == EV_4clicks) {
+    else if (event == EV_5clicks) {
         blink_once();
         set_state(lockout_state, 0);
         return MISCHIEF_MANAGED;
@@ -251,19 +251,19 @@ uint8_t off_state(Event event, uint16_t arg) {
 
     // click, click, long-click: strobe mode
     #ifdef USE_STROBE_STATE
-    else if (event == EV_click3_hold) {
+    else if (event == EV_click4_hold) {
         set_state(strobe_state, 0);
         return MISCHIEF_MANAGED;
     }
     #elif defined(USE_BORING_STROBE_STATE)
-    else if (event == EV_click3_hold) {
+    else if (event == EV_click4_hold) {
         set_state(boring_strobe_state, 0);
         return MISCHIEF_MANAGED;
     }
     #endif
     #ifdef USE_MOMENTARY_MODE
     // 5 clicks: momentary mode
-    else if (event == EV_5clicks) {
+    else if (event == EV_6clicks) {
         blink_once();
         set_state(momentary_state, 0);
         return MISCHIEF_MANAGED;

ToyKeeper/spaghetti-monster/anduril/ramp-mode.c

@@ -153,7 +153,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
 
     #ifdef USE_LOCKOUT_MODE
     // 4 clicks: shortcut to lockout mode
-    else if (event == EV_4clicks) {
+    else if (event == EV_5clicks) {
         set_level(0);
         set_state(lockout_state, 0);
         return MISCHIEF_MANAGED;
@@ -438,7 +438,7 @@ uint8_t steady_state(Event event, uint16_t arg) {
 
     #ifdef USE_MOMENTARY_MODE
     // 5 clicks: shortcut to momentary mode
-    else if (event == EV_5clicks) {
+    else if (event == EV_6clicks) {
         // Allow to use turbo in momentary mode. It is safe to overwrite
         // memorized_level because the only way to exit momentary mode is to
         // reboot the flashlight which restores memorized_level to the default

ToyKeeper/spaghetti-monster/anduril/strobe-modes.c

@@ -143,7 +143,7 @@ uint8_t strobe_state(Event event, uint16_t arg) {
     }
     #ifdef USE_MOMENTARY_MODE
     // 5 clicks: go to momentary mode (momentary strobe)
-    else if (event == EV_5clicks) {
+    else if (event == EV_6clicks) {
         set_state(momentary_state, 0);
         set_level(0);
         return MISCHIEF_MANAGED;