added Emisar D1v2 models (old FET+7135, new linear+FET, new linear-only)

4 files changed, 52 insertions, 6 deletions

diff --git a/spaghetti-monster/anduril/MODELS b/spaghetti-monster/anduril/MODELS
index 329cc4d..3071b60 100644
--- a/spaghetti-monster/anduril/MODELS
+++ b/spaghetti-monster/anduril/MODELS
@@ -1,6 +1,5 @@
 Model	Name                          	MCU
 -----	----                          	---
-0000	thefreeman-lin16dac           	attiny1616
 0111	emisar-d4                     	attiny85
 0112	emisar-d4-219c                	attiny85
 0113	emisar-d4v2                   	attiny1634
@@ -8,7 +7,9 @@ Model	Name                          	MCU
 0115	emisar-d4v2-nofet             	attiny1634
 0121	emisar-d1                     	attiny85
 0122	emisar-d1s                    	attiny85
-0123	emisar-d1v2                   	attiny1634
+0123	emisar-d1v2-7135-fet          	attiny1634
+0124	emisar-d1v2-linear-fet        	attiny1634
+0125	emisar-d1v2-nofet             	attiny1634
 0131	emisar-d4s                    	attiny85
 0132	emisar-d4s-219c               	attiny85
 0133	emisar-d4sv2                  	attiny1634
diff --git a/spaghetti-monster/anduril/cfg-emisar-d1v2.h b/spaghetti-monster/anduril/cfg-emisar-d1v2-7135-fet.h
index 48a3ef0..a448703 100644
--- a/spaghetti-monster/anduril/cfg-emisar-d1v2.h
+++ b/spaghetti-monster/anduril/cfg-emisar-d1v2-7135-fet.h
@@ -1,14 +1,17 @@
-// Emisar D1v2 config options for Anduril (D1 w/ D4v2 driver)
+// Emisar D1v2 (7135+FET) config options for Anduril
+// (was only made for a short time, not many people have one)
 // ATTINY: 1634
 // same as Emisar D4v2, mostly
 #include "cfg-emisar-d4v2.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0123"
 
-// there are no aux LEDs on a D1
-#undef USE_AUX_RGB_LEDS
-// ... and no button LED
+// ... there is no separate button LED, only the RGB LEDs
 #undef USE_BUTTON_LED
+// the aux LEDs are in the button, so use them while main LEDs are on
+// (early short run had no button LEDs at all, later run uses linear+FET instead,
+//  so it's unlikely that anyone needs this, but it doesn't hurt anything)
+#define USE_INDICATOR_LED_WHILE_RAMPING
 
 // safe limit ~50% power
 #undef SIMPLE_UI_CEIL
diff --git a/spaghetti-monster/anduril/cfg-emisar-d1v2-linear-fet.h b/spaghetti-monster/anduril/cfg-emisar-d1v2-linear-fet.h
new file mode 100644
index 0000000..e14295e
--- /dev/null
+++ b/spaghetti-monster/anduril/cfg-emisar-d1v2-linear-fet.h
@@ -0,0 +1,24 @@
+// Emisar D1v2 (linear+FET) config options for Anduril
+// (2022 re-issue / update of old D1)
+// ATTINY: 1634
+// similar to a Noctigon KR4, sort of
+#include "cfg-noctigon-kr4.h"
+#undef MODEL_NUMBER
+#define MODEL_NUMBER "0124"
+
+// ... there is no separate button LED, only the RGB LEDs
+#ifdef USE_BUTTON_LED
+#undef USE_BUTTON_LED
+#endif
+// the aux LEDs are in the button, so use them while main LEDs are on
+#define USE_INDICATOR_LED_WHILE_RAMPING
+
+// safe limit: max regulated power
+#undef SIMPLE_UI_CEIL
+#define SIMPLE_UI_CEIL MAX_1x7135
+
+// 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
diff --git a/spaghetti-monster/anduril/cfg-emisar-d1v2-nofet.h b/spaghetti-monster/anduril/cfg-emisar-d1v2-nofet.h
new file mode 100644
index 0000000..081202d
--- /dev/null
+++ b/spaghetti-monster/anduril/cfg-emisar-d1v2-nofet.h
@@ -0,0 +1,18 @@
+// Emisar D1v2 (linear+FET) config options for Anduril
+// (2022 re-issue / update of old D1)
+// ATTINY: 1634
+// similar to a Noctigon KR4, sort of
+#include "cfg-noctigon-kr4-nofet.h"
+#undef MODEL_NUMBER
+#define MODEL_NUMBER "0125"
+
+// ... there is no separate button LED, only the RGB LEDs
+#ifdef USE_BUTTON_LED
+#undef USE_BUTTON_LED
+#endif
+// the aux LEDs are in the button, so use them while main LEDs are on
+#define USE_INDICATOR_LED_WHILE_RAMPING
+
+// safe limit: same as regular ramp
+#undef SIMPLE_UI_CEIL
+#define SIMPLE_UI_CEIL RAMP_SMOOTH_CEIL