merged sp10-pro shutoff fix and mt35-mini support

3 files changed, 99 insertions, 9 deletions

diff --git a/spaghetti-monster/anduril/MODELS b/spaghetti-monster/anduril/MODELS
index d2d509a..329cc4d 100644
--- a/spaghetti-monster/anduril/MODELS
+++ b/spaghetti-monster/anduril/MODELS
@@ -51,6 +51,7 @@ Model	Name                          	MCU
 0441	ff-e01                        	attiny85
 0511	mateminco-mf01s               	attiny85
 0521	mateminco-mf01-mini           	attiny85
+0531	mateminco-mt35-mini           	attiny85
 0611	blf-q8                        	attiny85
 0612	sofirn-sp36                   	attiny85
 0613	blf-q8-t1616                  	attiny1616
diff --git a/spaghetti-monster/anduril/cfg-mateminco-mt35-mini.h b/spaghetti-monster/anduril/cfg-mateminco-mt35-mini.h
new file mode 100644
index 0000000..b409c39
--- /dev/null
+++ b/spaghetti-monster/anduril/cfg-mateminco-mt35-mini.h
@@ -0,0 +1,51 @@
+// Mateminco MT35 Mini / Astrolux  FT03
+#define MODEL_NUMBER "0531"
+#include "hwdef-Mateminco_MT35-Mini.h"
+// ATTINY: 85
+
+// this light should be fine running a bit hotter than most
+#undef DEFAULT_THERM_CEIL
+#define DEFAULT_THERM_CEIL 55
+
+// the button lights up
+#define USE_INDICATOR_LED
+// the button is visible while main LEDs are on
+#define USE_INDICATOR_LED_WHILE_RAMPING
+
+// enable blinking aux LEDs
+#define TICK_DURING_STANDBY
+#define STANDBY_TICK_SPEED 3  // every 0.128 s
+
+#define RAMP_LENGTH 150
+// level_calc.py fifth 2 150 7135 1 1 120 FET 1 10 2000
+#define PWM1_LEVELS 1,2,2,3,4,5,6,7,8,9,11,13,14,16,18,21,23,26,28,31,35,38,41,45,49,53,58,63,67,73,78,84,90,96,102,109,116,124,131,139,147,156,165,174,184,194,204,215,226,237,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0
+#define PWM2_LEVELS 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,3,4,5,6,7,8,9,10,11,12,14,15,16,17,18,20,21,22,24,25,27,28,30,31,33,35,36,38,40,42,43,45,47,49,51,53,55,57,59,62,64,66,68,71,73,75,78,80,83,86,88,91,94,96,99,102,105,108,111,114,117,120,124,127,130,134,137,140,144,148,151,155,159,162,166,170,174,178,182,186,190,195,199,203,208,212,217,221,226,231,235,240,245,250,255
+#define DEFAULT_LEVEL 46
+#define MAX_1x7135 52
+#define HALFSPEED_LEVEL 20
+#define QUARTERSPEED_LEVEL 10
+
+#define RAMP_SMOOTH_FLOOR 1
+#define RAMP_SMOOTH_CEIL 112
+#define RAMP_DISCRETE_FLOOR 10
+#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
+#define RAMP_DISCRETE_STEPS 7
+
+// safe limit ~33% power
+#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR
+#define SIMPLE_UI_CEIL RAMP_LENGTH
+#define SIMPLE_UI_STEPS 5
+
+// stop panicking at ~40% power
+#define THERM_FASTER_LEVEL 120
+#define MIN_THERM_STEPDOWN 95 // ~600 lumens
+#define THERM_RESPONSE_MAGNITUDE 16  // smaller adjustments, big body.  default = 64
+
+#define DEFAULT_2C_STYLE 1  // enable 2 click turbo (Anduril 1 style)
+
+#ifdef BLINK_AT_RAMP_MIDDLE
+#undef BLINK_AT_RAMP_MIDDLE
+#endif
+
+// Allow 3C in Simple UI for switching between smooth and stepped ramping
+#define USE_SIMPLE_UI_RAMPING_TOGGLE
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index abbfbde..1667c00 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -70,7 +70,7 @@ void set_level(uint8_t level) {
         set_level_override(level);
     #else
 
-    #ifdef PWM1_CNT
+    #if defined(PWM1_CNT) && defined(PWM1_PHASE_RESET_ON) || defined(PWM1_PHASE_SYNC)
     static uint8_t prev_level = 0;
     uint8_t api_level = level;
     #endif
@@ -93,6 +93,20 @@ void set_level(uint8_t level) {
         TINT1_LVL = 0;
         TINT2_LVL = 0;
         #endif
+        #if defined(PWM1_CNT) && defined(PWM1_PHASE_RESET_OFF)
+            PWM1_CNT = 0;
+        #endif
+        #if defined(PWM2_CNT) && defined(PWM2_PHASE_RESET_OFF)
+            PWM2_CNT = 0;
+        #endif
+        #if defined(PWM3_CNT) && defined(PWM3_PHASE_RESET_OFF)
+            PWM3_CNT = 0;
+        #endif
+        #ifdef LED_OFF_DELAY
+            // for drivers with a slow regulator chip (eg, boost converter),
+            // delay before turning off to prevent flashes
+            delay_4ms(LED_OFF_DELAY/4);
+        #endif
         // disable the power channel, if relevant
         #ifdef LED_ENABLE_PIN
         LED_ENABLE_PORT &= ~(1 << LED_ENABLE_PIN);
@@ -104,6 +118,10 @@ void set_level(uint8_t level) {
         // enable the power channel, if relevant
         #ifndef USE_TINT_RAMPING  // update_tint handles this better
         #ifdef LED_ENABLE_PIN
+            #ifdef LED_ON_DELAY
+            uint8_t led_enable_port_save = LED_ENABLE_PORT;
+            #endif
+
             #ifndef LED_ENABLE_PIN_LEVEL_MIN
             LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN);
             #else
@@ -114,9 +132,29 @@ void set_level(uint8_t level) {
             else  // disable during other parts of the ramp
                 LED_ENABLE_PORT &= ~(1 << LED_ENABLE_PIN);
             #endif
+
+            // for drivers with a slow regulator chip (eg, boost converter),
+            // delay before lighting up to prevent flashes
+            #ifdef LED_ON_DELAY
+            // only delay if the pin status changed
+            if (LED_ENABLE_PORT != led_enable_port_save)
+                delay_4ms(LED_ON_DELAY/4);
+            #endif
         #endif
         #ifdef LED2_ENABLE_PIN
-        LED2_ENABLE_PORT |= (1 << LED2_ENABLE_PIN);
+            #ifdef LED2_ON_DELAY
+            uint8_t led2_enable_port_save = LED2_ENABLE_PORT;
+            #endif
+
+            LED2_ENABLE_PORT |= (1 << LED2_ENABLE_PIN);
+
+            // for drivers with a slow regulator chip (eg, boost converter),
+            // delay before lighting up to prevent flashes
+            #ifdef LED2_ON_DELAY
+            // only delay if the pin status changed
+            if (LED2_ENABLE_PORT != led2_enable_port_save)
+                delay_4ms(LED2_ON_DELAY/4);
+            #endif
         #endif
         #endif  // ifndef USE_TINT_RAMPING
 
@@ -138,7 +176,7 @@ void set_level(uint8_t level) {
 
         #ifdef USE_DYN_PWM
             uint16_t top = PWM_GET(pwm_tops, level);
-            #ifdef PWM1_CNT
+            #if defined(PWM1_CNT) && defined(PWM1_PHASE_SYNC)
             // wait to ensure compare match won't be missed
             // (causes visible flickering when missed, because the counter
             //  goes all the way to 65535 before returning)
@@ -154,27 +192,27 @@ void set_level(uint8_t level) {
 
             // repeat for other channels if necessary
             #ifdef PMW2_TOP
-                #ifdef PWM2_CNT
+                #if defined(PWM2_CNT) && defined(PWM2_PHASE_SYNC)
                 while(prev_level && (PWM2_CNT > (top - 32))) {}
                 #endif
                 PWM2_TOP = top;
             #endif
             #ifdef PMW3_TOP
-                #ifdef PWM3_CNT
+                #if defined(PWM3_CNT) && defined(PWM3_PHASE_SYNC)
                 while(prev_level && (PWM3_CNT > (top - 32))) {}
                 #endif
                 PWM3_TOP = top;
             #endif
         #endif  // ifdef USE_DYN_PWM
-        #ifdef PWM1_CNT
+        #if defined(PWM1_CNT) && defined(PWM1_PHASE_RESET_ON)
             // force reset phase when turning on from zero
             // (because otherwise the initial response is inconsistent)
             if (! prev_level) {
                 PWM1_CNT = 0;
-                #ifdef PWM2_CNT
+                #if defined(PWM2_CNT) && defined(PWM2_PHASE_RESET_ON)
                 PWM2_CNT = 0;
                 #endif
-                #ifdef PWM3_CNT
+                #if defined(PWM3_CNT) && defined(PWM3_PHASE_RESET_ON)
                 PWM3_CNT = 0;
                 #endif
             }
@@ -184,7 +222,7 @@ void set_level(uint8_t level) {
     update_tint();
     #endif
 
-    #ifdef PWM1_CNT
+    #if defined(PWM1_CNT) && defined(PWM1_PHASE_RESET_ON) || defined(PWM1_PHASE_SYNC)
     prev_level = api_level;
     #endif
     #endif  // ifdef OVERRIDE_SET_LEVEL