Added "Lockout 3C -> Off", changed Lockout 4H blink (light) to a blip (dark),

adjusted a couple builds which overflowed.

4 files changed, 28 insertions, 1 deletions

diff --git a/spaghetti-monster/anduril/anduril-manual.txt b/spaghetti-monster/anduril/anduril-manual.txt
index 8d6ad75..1873b8d 100644
--- a/spaghetti-monster/anduril/anduril-manual.txt
+++ b/spaghetti-monster/anduril/anduril-manual.txt
@@ -75,6 +75,7 @@ In Lockout mode with Simple UI, there are a few functions:
 
   - 1H: Momentary moon
   - 2H: Momentary low
+  - 3C: Unlock and turn off
   - 4C: Unlock and turn on
   - 4H: Unlock and turn on at low level
   - 5C: Unlock and turn on at high level
@@ -296,6 +297,8 @@ To exit lockout mode, click 4 times.  The light should blink briefly and
 then turn on at the memorized level.  Or hold the final press to turn on 
 at the floor level instead:
 
+  - 3C: Unlock and go to "Off" mode
+
   - 4C: Go to ramp mode (memorized level).
     (uses manual mem level if there is one)
 
@@ -788,6 +791,7 @@ Ramp		Full	10H	Ramp Extras config menu:
 
 Lockout		Any	1C/1H	Momentary moon (lowest floor)
 Lockout		Any	2C/2H	Momentary moon (highest floor, or manual mem level)
+Lockout		Any	3C	Unlock (go to "Off" mode)
 Lockout		Any	4C	On (ramp mode, memorized level)
 Lockout		Any	4H	On (ramp mode, floor level)
 Lockout		Any	5C	On (ramp mode, ceiling level)
diff --git a/spaghetti-monster/anduril/cfg-blf-gt-mini.h b/spaghetti-monster/anduril/cfg-blf-gt-mini.h
index af16f2c..a647ea5 100644
--- a/spaghetti-monster/anduril/cfg-blf-gt-mini.h
+++ b/spaghetti-monster/anduril/cfg-blf-gt-mini.h
@@ -10,3 +10,11 @@
 // the button is visible while main LEDs are on
 #define USE_INDICATOR_LED_WHILE_RAMPING
 
+// too big, remove stuff to make room
+#undef USE_SOS_MODE
+//#undef USE_RAMP_AFTER_MOON_CONFIG
+//#undef USE_RAMP_SPEED_CONFIG
+//#undef USE_VOLTAGE_CORRECTION
+//#undef USE_2C_STYLE_CONFIG
+//#undef USE_TACTICAL_STROBE_MODE
+
diff --git a/spaghetti-monster/anduril/cfg-blf-q8.h b/spaghetti-monster/anduril/cfg-blf-q8.h
index d4243ee..851d930 100644
--- a/spaghetti-monster/anduril/cfg-blf-q8.h
+++ b/spaghetti-monster/anduril/cfg-blf-q8.h
@@ -36,3 +36,10 @@
 // stop panicking at ~75% power or ~3000 lm, this light has high thermal mass
 #define THERM_FASTER_LEVEL (RAMP_SIZE*9/10)  // throttle back faster when high
 
+// too big, remove stuff to make room
+#undef USE_SOS_MODE
+//#undef USE_RAMP_AFTER_MOON_CONFIG
+//#undef USE_RAMP_SPEED_CONFIG
+//#undef USE_VOLTAGE_CORRECTION
+//#undef USE_2C_STYLE_CONFIG
+//#undef USE_TACTICAL_STROBE_MODE
diff --git a/spaghetti-monster/anduril/lockout-mode.c b/spaghetti-monster/anduril/lockout-mode.c
index 8c83cff..e3e3fed 100644
--- a/spaghetti-monster/anduril/lockout-mode.c
+++ b/spaghetti-monster/anduril/lockout-mode.c
@@ -88,9 +88,16 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     }
     #endif
 
+    // 3 clicks: exit and turn off
+    else if (event == EV_3clicks) {
+        blink_once();
+        set_state(off_state, 0);
+        return MISCHIEF_MANAGED;
+    }
     // 4 clicks: exit and turn on
     else if (event == EV_4clicks) {
         #ifdef USE_MANUAL_MEMORY
+        // FIXME: memory timer is totally ignored
         if (manual_memory)
             set_state(steady_state, manual_memory);
         else
@@ -100,7 +107,8 @@ uint8_t lockout_state(Event event, uint16_t arg) {
     }
     // 4 clicks, but hold last: exit and start at floor
     else if (event == EV_click4_hold) {
-        blink_once();
+        //blink_once();
+        blip();
         // reset button sequence to avoid activating anything in ramp mode
         current_event = 0;
         // ... and back to ramp mode