moved Simple UI actions from 8C/8H -> 10C/10H... and removed USE_TENCLICK_THERMAL_CONFIG

(the tenclick thermal thing isn't relevant ever since factory reset was added)

11 files changed, 4 insertions, 36 deletions

diff --git a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
index 7652bf5..418c11b 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4sv2.h
@@ -42,9 +42,6 @@
 // stop panicking at ~50% power or ~2000 lm
 #define THERM_FASTER_LEVEL 130
 
-// easier access to thermal config mode, for Emisar
-#define USE_TENCLICK_THERMAL_CONFIG
-
 #ifdef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_MIDDLE
 #endif
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4v2.h b/spaghetti-monster/anduril/cfg-emisar-d4v2.h
index dc96c47..eac4013 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4v2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4v2.h
@@ -40,7 +40,4 @@
 // stop panicking at ~30% power or ~1200 lm
 #define THERM_FASTER_LEVEL 105
 
-// easier access to thermal config mode, for Emisar
-#define USE_TENCLICK_THERMAL_CONFIG
-
 #define THERM_CAL_OFFSET 5
diff --git a/spaghetti-monster/anduril/cfg-ff-e01.h b/spaghetti-monster/anduril/cfg-ff-e01.h
index 7b3578a..689cce8 100644
--- a/spaghetti-monster/anduril/cfg-ff-e01.h
+++ b/spaghetti-monster/anduril/cfg-ff-e01.h
@@ -10,6 +10,3 @@
 // (9 / 45 / 116 / 248 / 467 / 742 / 1280 + 2140 lm)
 #undef RAMP_DISCRETE_STEPS
 #define RAMP_DISCRETE_STEPS 7
-
-// shortcut for first-time setup
-#define USE_TENCLICK_THERMAL_CONFIG
diff --git a/spaghetti-monster/anduril/cfg-fw3a.h b/spaghetti-monster/anduril/cfg-fw3a.h
index 489766c..d8e271d 100644
--- a/spaghetti-monster/anduril/cfg-fw3a.h
+++ b/spaghetti-monster/anduril/cfg-fw3a.h
@@ -16,7 +16,5 @@
 // stop panicking at about 3A or ~1100 lm, this light is a hotrod
 #define THERM_FASTER_LEVEL MAX_Nx7135
 
-#define USE_TENCLICK_THERMAL_CONFIG
-
 // can't reset the normal way because power is connected before the button
 #define USE_SOFT_FACTORY_RESET
diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h b/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h
index a9e81c6..0176da6 100644
--- a/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h
+++ b/spaghetti-monster/anduril/cfg-mateminco-mf01-mini.h
@@ -49,5 +49,4 @@
 #define RAMP_DISCRETE_STEPS 7  // ??, ??, ... lm
 
 
-//#define USE_TENCLICK_THERMAL_CONFIG  // by request
 #define THERM_FASTER_LEVEL 130  // throttle back faster when high
diff --git a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h
index ea28900..8761f66 100644
--- a/spaghetti-monster/anduril/cfg-mateminco-mf01s.h
+++ b/spaghetti-monster/anduril/cfg-mateminco-mf01s.h
@@ -39,7 +39,6 @@
 #define RAMP_DISCRETE_CEIL  120 // ~5400 lm
 #define RAMP_DISCRETE_STEPS 7  // 35, 108, 280, 626, 1500, 2930, 5400 lm
 
-#define USE_TENCLICK_THERMAL_CONFIG  // by request
 #define THERM_FASTER_LEVEL 125  // throttle back faster when high (>6000 lm)
 #define THERM_HARD_TURBO_DROP  // this light is massively overpowered
 
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
index c45fea6..4dbdf4f 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1-12v.h
@@ -55,9 +55,6 @@
 #define THERM_RESPONSE_MAGNITUDE 32  // smaller adjustments, this host changes temperature slowly
 #define THERM_NEXT_WARNING_THRESHOLD 32  // more error tolerance before adjusting
 
-// easier access to thermal config mode, for Noctigon
-#define USE_TENCLICK_THERMAL_CONFIG
-
 // slow down party strobe; this driver can't pulse for 1ms or less
 #define PARTY_STROBE_ONTIME 4
 
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h
index a95c918..7af7d8d 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1-sbt90.h
@@ -51,9 +51,6 @@
 //#define THERM_NEXT_WARNING_THRESHOLD 16  // accumulate less error before adjusting
 //#define THERM_RESPONSE_MAGNITUDE 128  // bigger adjustments
 
-// easier access to thermal config mode, for Noctigon
-#define USE_TENCLICK_THERMAL_CONFIG
-
 // slow down party strobe; this driver can't pulse for 1ms or less
 //#define PARTY_STROBE_ONTIME 2
 
diff --git a/spaghetti-monster/anduril/cfg-noctigon-k1.h b/spaghetti-monster/anduril/cfg-noctigon-k1.h
index d844961..8ebf904 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-k1.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-k1.h
@@ -56,9 +56,6 @@
 #define THERM_RESPONSE_MAGNITUDE 32  // smaller adjustments, this host changes temperature slowly
 #define THERM_NEXT_WARNING_THRESHOLD 32  // more error tolerance before adjusting
 
-// easier access to thermal config mode, for Noctigon
-#define USE_TENCLICK_THERMAL_CONFIG
-
 // slow down party strobe; this driver can't pulse for 1ms or less
 #define PARTY_STROBE_ONTIME 2
 
diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4.h b/spaghetti-monster/anduril/cfg-noctigon-kr4.h
index 3a56fa8..92c4443 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-kr4.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-kr4.h
@@ -55,9 +55,6 @@
 #define THERM_NEXT_WARNING_THRESHOLD 16  // accumulate less error before adjusting
 #define THERM_RESPONSE_MAGNITUDE 128  // bigger adjustments
 
-// easier access to thermal config mode
-#define USE_TENCLICK_THERMAL_CONFIG
-
 // slow down party strobe; this driver can't pulse for 1ms or less
 // (only needed on no-FET build)
 //#define PARTY_STROBE_ONTIME 2
diff --git a/spaghetti-monster/anduril/off-mode.c b/spaghetti-monster/anduril/off-mode.c
index 50d1dcf..4d4d83d 100644
--- a/spaghetti-monster/anduril/off-mode.c
+++ b/spaghetti-monster/anduril/off-mode.c
@@ -182,8 +182,8 @@ uint8_t off_state(Event event, uint16_t arg) {
     #endif
 
     #ifdef USE_SIMPLE_UI
-    // 8 clicks, but hold last click: turn simple UI off (or configure it)
-    else if ((event == EV_click8_hold) && (!arg)) {
+    // 10 clicks, but hold last click: turn simple UI off (or configure it)
+    else if ((event == EV_click10_hold) && (!arg)) {
         if (simple_ui_active) {  // turn off simple UI
             blink_once();
             simple_ui_active = 0;
@@ -199,8 +199,8 @@ uint8_t off_state(Event event, uint16_t arg) {
     if (simple_ui_active) {
         return EVENT_NOT_HANDLED;
     }
-    // 8 clicks: enable simple UI
-    else if (event == EV_8clicks) {
+    // 10 clicks: enable simple UI
+    else if (event == EV_10clicks) {
         blink_once();
         simple_ui_active = 1;
         save_config();
@@ -274,13 +274,6 @@ uint8_t off_state(Event event, uint16_t arg) {
         return MISCHIEF_MANAGED;
     }
     #endif  // end 7 clicks
-    #if defined(USE_TENCLICK_THERMAL_CONFIG) && defined(USE_THERMAL_REGULATION)
-    // 10 clicks: thermal config mode
-    else if (event == EV_10clicks) {
-        push_state(thermal_config_state, 0);
-        return MISCHIEF_MANAGED;
-    }
-    #endif
     return EVENT_NOT_HANDLED;
 }