converted Noctigon DM11-12V build, renamed to noctigon-dm11-boost

2 files changed, 28 insertions, 25 deletions

diff --git a/spaghetti-monster/anduril/MODELS b/spaghetti-monster/anduril/MODELS
index 3a321cd..efe4a05 100644
--- a/spaghetti-monster/anduril/MODELS
+++ b/spaghetti-monster/anduril/MODELS
@@ -38,7 +38,8 @@ Model	Name                          	MCU
 0267	noctigon-k9.3-tintramp-219    	attiny1634
 0271	noctigon-dm11                 	attiny1634
 0272	noctigon-dm11-nofet           	attiny1634
-0273	noctigon-dm11-12v             	attiny1634
+0273	noctigon-dm11-boost           	attiny1634
+0273	noctigon-dm11-12v             	attiny1634	(old)
 0274	noctigon-dm11-sbt90           	attiny1634
 0311	fw3a                          	attiny85
 0312	fw3a-219                      	attiny85
diff --git a/spaghetti-monster/anduril/cfg-noctigon-dm11-12v.h b/spaghetti-monster/anduril/cfg-noctigon-dm11-boost.h
index 7798206..231944c 100644
--- a/spaghetti-monster/anduril/cfg-noctigon-dm11-12v.h
+++ b/spaghetti-monster/anduril/cfg-noctigon-dm11-boost.h
@@ -1,28 +1,18 @@
-// Noctigon DM11 (12V) config options for Anduril
+// Noctigon DM11 (boost driver) config options for Anduril
 // Copyright (C) 2021-2023 Selene ToyKeeper
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
 #define MODEL_NUMBER "0273"
-#include "hwdef-Noctigon_DM11-12V.h"
+#include "hwdef-noctigon-dm11-boost.h"
 #include "hank-cfg.h"
 // ATTINY: 1634
 
-// this light has three aux LED channels: R, G, B
-#define USE_AUX_RGB_LEDS
-// ... and a single LED in the button
-#define USE_BUTTON_LED
-// don't use aux LEDs while main LED is on
-#ifdef USE_INDICATOR_LED_WHILE_RAMPING
-#undef USE_INDICATOR_LED_WHILE_RAMPING
-#endif
-
+#define RAMP_SIZE 150
 
 // power channels:
-// - linear: 5A?
+// - boost: 8A?
 // - DD FET: none (can't do DD on a boost driver)
-#define RAMP_LENGTH 150
-#define USE_DYN_PWM
 
 // level_calc.py 5.01 1 149 7135 1 0.3 1740 --pwm dyn:78:16384:255
 // (plus a 0 at the beginning for moon)
@@ -34,11 +24,6 @@
 #define HALFSPEED_LEVEL 12
 #define QUARTERSPEED_LEVEL 4
 
-// don't blink halfway up
-#ifdef BLINK_AT_RAMP_MIDDLE
-#undef BLINK_AT_RAMP_MIDDLE
-#endif
-
 #define RAMP_SMOOTH_FLOOR 10  // low levels may be unreliable
 #define RAMP_SMOOTH_CEIL  130
 // 10, 30, 50, [70], 90, 110, 130
@@ -52,21 +37,33 @@
 #define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL
 #define SIMPLE_UI_STEPS 5
 
-// make candle mode wobble more
-#define CANDLE_AMPLITUDE 33
-
 // stop panicking at ~70% power or ~600 lm
 #define THERM_FASTER_LEVEL 130
 #define MIN_THERM_STEPDOWN 80  // must be > end of dynamic PWM range
 
+#define THERM_CAL_OFFSET 5
+
 //#define THERM_RESPONSE_MAGNITUDE 32  // smaller adjustments, this host changes temperature slowly
 //#define THERM_NEXT_WARNING_THRESHOLD 32  // more error tolerance before adjusting
 
+// show each channel while it scroll by in the menu
+#define USE_CONFIG_COLORS
+
+// blink numbers on the aux LEDs by default
+#define DEFAULT_BLINK_CHANNEL  CM_AUXWHT
+
+// use aux red + aux blue for police strobe
+#define USE_POLICE_COLOR_STROBE_MODE
+#define POLICE_STROBE_USES_AUX
+#define POLICE_COLOR_STROBE_CH1        CM_AUXRED
+#define POLICE_COLOR_STROBE_CH2        CM_AUXBLU
+
+// the default of 26 looks a bit rough, so increase it to make it smoother
+#define CANDLE_AMPLITUDE 33
+
 // slow down party strobe; this driver can't pulse for 2ms or less
 #define PARTY_STROBE_ONTIME 3
 
-#define THERM_CAL_OFFSET 5
-
 // the power regulator seems to "jump start" the LEDs all on its own,
 // so the firmware doesn't have to
 // (and unfortunately the power regulator jumps it a bit too hard)
@@ -77,3 +74,8 @@
 // added for convenience
 #define USE_SOFT_FACTORY_RESET
 
+// don't blink halfway up
+#ifdef BLINK_AT_RAMP_MIDDLE
+#undef BLINK_AT_RAMP_MIDDLE
+#endif
+