5 files changed, 25 insertions, 4 deletions
diff --git a/spaghetti-monster/anduril/cfg-emisar-d1.h b/spaghetti-monster/anduril/cfg-emisar-d1.h
index e9064ac..d35480c 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d1.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d1.h
@@ -2,5 +2,12 @@
 #include "cfg-emisar-d4.h"
 
 // stop panicking at ~75% power or ~1000 lm (D1 has a decent power-to-thermal-mass ratio)
+#ifdef THERM_FASTER_LEVEL
 #undef THERM_FASTER_LEVEL
+#endif
 #define THERM_FASTER_LEVEL (RAMP_SIZE*9/10)  // throttle back faster when high
+
+// no need to be extra-careful on this light
+#ifdef THERM_HARD_TURBO_DROP
+#undef THERM_HARD_TURBO_DROP
+#endif
diff --git a/spaghetti-monster/anduril/cfg-emisar-d1s.h b/spaghetti-monster/anduril/cfg-emisar-d1s.h
index 7e73fa7..eb98c2e 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d1s.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d1s.h
@@ -2,5 +2,12 @@
 #include "cfg-emisar-d4.h"
 
 // stop panicking at ~90% power or ~1200 lm (D1S has a good power-to-thermal-mass ratio)
+#ifdef THERM_FASTER_LEVEL
 #undef THERM_FASTER_LEVEL
+#endif
 #define THERM_FASTER_LEVEL 144  // throttle back faster when high
+
+// no need to be extra-careful on this light
+#ifdef THERM_HARD_TURBO_DROP
+#undef THERM_HARD_TURBO_DROP
+#endif
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4.h b/spaghetti-monster/anduril/cfg-emisar-d4.h
index 4ac1f5e..251f81d 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4.h
@@ -14,7 +14,8 @@
 #define QUARTERSPEED_LEVEL 5
 
 // optional, makes initial turbo step-down faster so first peak isn't as hot
-//#define THERM_HARD_TURBO_DROP
+// the D4 runs very very hot, so be extra careful
+#define THERM_HARD_TURBO_DROP
 
-// stop panicking at ~25% power or ~1000 lm, this light is a hotrod
-#define THERM_FASTER_LEVEL (RAMP_SIZE*2/3)  // throttle back faster when high
+// stop panicking at ~30% power or ~1200 lm
+#define THERM_FASTER_LEVEL 105
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h
index ddb56ee..df2f019 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d4s.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h
@@ -40,7 +40,13 @@
 #define RAMP_SMOOTH_CEIL (MAX_LEVEL*4/5)
 
 // thermal regulation parameters
+#ifdef MIN_THERM_STEPDOWN
 #undef MIN_THERM_STEPDOWN  // this should be lower, because 3x7135 instead of 1x7135
+#endif
 #define MIN_THERM_STEPDOWN 60  // lowest value it'll step down to
 #define THERM_FASTER_LEVEL (RAMP_SIZE*9/10)  // throttle back faster when high
 
+// no need to be extra-careful on this light
+#ifdef THERM_HARD_TURBO_DROP
+#undef THERM_HARD_TURBO_DROP
+#endif
diff --git a/spaghetti-monster/anduril/cfg-fw3a.h b/spaghetti-monster/anduril/cfg-fw3a.h
index 262ef13..65f1e48 100644
--- a/spaghetti-monster/anduril/cfg-fw3a.h
+++ b/spaghetti-monster/anduril/cfg-fw3a.h
@@ -19,4 +19,4 @@
 // stop panicking at about 3A or ~1100 lm, this light is a hotrod
 #define THERM_FASTER_LEVEL MAX_Nx7135
 // optional, makes initial turbo step-down faster so first peak isn't as hot
-//#define THERM_HARD_TURBO_DROP
+#define THERM_HARD_TURBO_DROP