merged fsm branch, mostly to get Lume1 driver support

6 files changed, 299 insertions, 30 deletions

diff --git a/hwdef-fw3x-lume1.h b/hwdef-fw3x-lume1.h
new file mode 100644
index 0000000..09c5bfe
--- /dev/null
+++ b/hwdef-fw3x-lume1.h
@@ -0,0 +1,169 @@
+#ifndef HWDEF_FW3X_LUME1_H
+#define HWDEF_FW3X_LUME1_H
+
+/* lume1 Driver Rev B for FW3x driver layout (attiny1634)
+ * www.loneoceans.com/labs/ for more information
+ *
+ * Pin / Name / Function in Lume1 Rev B
+ *   1    PA6   Regulated PWM (PWM1B)
+ *   2    PA5   R red aux LED (PWM0B)
+ *   3    PA4   G green aux LED
+ *   4    PA3   B blue aux LED
+ *   5    PA2   e-switch (PCINT2)
+ *   6    PA1   Jumper 1
+ *   7    PA0   Jumper 2
+ *   8    GND   GND
+ *   9    VCC   VCC
+ *  10    PC5   Jumper 3
+ *  11    PC4   Jumper 4
+ *  12    PC3   RESET
+ *  13    PC2   External Thermal Sensor (ADC11)
+ *  14    PC1   SCK
+ *  15    PC0   N/C
+ *  16    PB3   FET PWM (PWM1A)
+ *  17    PB2   MISO
+ *  18    PB1   MOSI
+ *  19    PB0   ADC5 Voltage Battery Sense (2:1 divider)
+ *  20    PA7   BB_Enable
+ *        ADC12 internal thermal sensor (not used for lume1)
+ *
+ * Main LED power uses one pin as a global Buck Boost Enable, and
+ * one pin to control the power level via PWM. Another pin is used
+ * for FET control.
+ */
+
+#ifdef ATTINY
+#undef ATTINY
+#endif
+#define ATTINY 1634
+#include <avr/io.h>
+
+#define PWM_CHANNELS 2
+// Added for Lume1 Buck Boost Driver
+#define PWM_BITS 10  // 0 to 1023 at 3.9 kHz, not 0 to 255 at 15.6 kHz
+#define PWM_TOP 1023
+
+#define SWITCH_PIN   PA2    // pin 5
+#define SWITCH_PCINT PCINT2 // pin 5 pin change interrupt
+#define SWITCH_PCIE  PCIE0  // PCIE0 is for PCINT[7:0]
+#define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
+#define SWITCH_PORT  PINA   // PINA or PINB or PINC
+
+#define PWM1_PIN PA6        // pin 1, Buck Boost CTRL pin or 7135-eqv PWM
+#define PWM1_LVL OCR1B      // OCR1A is the output compare register for PA6
+
+#define PWM2_PIN PB3        // pin 16, FET PWM Pin, but only used as on (1023) or off (0)
+#define PWM2_LVL OCR1A      // OCR1A is the output compare register for PB3
+
+// Added for Lume1 Buck Boost Driver
+#define LED_ENABLE_PIN  PA7    // pin 20, BuckBoost Enable
+#define LED_ENABLE_PORT PORTA  // control port for PA7
+
+/* // For Jumpers X1 to X4, no SW support yet
+#define JUMPER1_PIN PA1
+#define JUMPER2_PIN PA0
+#define JUMPER3_PIN PC5
+#define JUMPER4_PIN PC4
+*/
+
+#define USE_VOLTAGE_DIVIDER   // use a dedicated pin, not VCC, because VCC input is flattened
+#define VOLTAGE_PIN PB0       // Pin 19  PB0  ADC5
+// pin to ADC mappings are in DS table 19-4
+#define VOLTAGE_ADC ADC5D  // digital input disable pin for PB1
+// DIDR0/DIDR1 mappings are in DS section 19.13.5, 19.13.6
+#define VOLTAGE_ADC_DIDR DIDR1  // DIDR channel for ADC5D
+// DS tables 19-3, 19-4
+// Bit   7     6     5      4     3    2    1    0
+//     REFS1 REFS0 REFEN ADC0EN MUX3 MUX2 MUX1 MUX0
+// MUX[3:0] = 0, 1, 0, 1 for ADC5 / PB0
+// divided by ...
+// REFS[1:0] = 0, 0 for VCC as analog reference at 2.5V
+// other bits reserved
+#define ADMUX_VOLTAGE_DIVIDER 0b00000101
+#define ADC_PRSCL   0x06    // clk/64
+
+// Raw ADC readings at 4.4V and 2.2V
+// calibrate the voltage readout here
+// estimated / calculated values are:
+// [(Vbatt)*(R2/(R2+R1)) / 2.5V] * 1023
+// R1 = R2 = 100kR
+#ifndef ADC_44
+#define ADC_44 900
+#endif
+#ifndef ADC_22
+#define ADC_22 450
+#endif
+
+// Default ADMUX_THERM for Temperature is: 0b10001110 in tk-attiny.h
+// REFS[1:0] as 10 for analog reference at internal 1.1Vref
+// MUX[3:0] as 1110 for ADC'12' - temperature sensor internal
+
+// Modified fsm-adc.c to use different ADMUX and ADC_temperature_handler()
+// based on USE_EXTERNAL_TEMP_SENSOR
+// See line 34 and line 209
+#define USE_EXTERNAL_TEMP_SENSOR
+#define ADMUX_THERM_EXTERNAL_SENSOR 0b00001011  // VCC reference (2.5V), Channel PC2
+// Used for Lume1 Driver: MCP9700 - T_Celsius = 100*(VOUT - 0.5V)
+// ADC is 2.5V reference, 0 to 1023
+// FIXME: due to floating point, this calculation takes 916 extra bytes
+//        (should use an integer equivalent instead)
+#define EXTERN_TEMP_FORMULA(m) (((m)-205)/4.09)
+
+// this driver allows for aux LEDs under the optic
+#define AUXLED_R_PIN    PA5    // pin 2
+#define AUXLED_G_PIN    PA4    // pin 3
+#define AUXLED_B_PIN    PA3    // pin 4
+#define AUXLED_RGB_PORT PORTA  // PORTA or PORTB or PORTC
+#define AUXLED_RGB_DDR  DDRA   // DDRA or DDRB or DDRC
+#define AUXLED_RGB_PUE  PUEA   // PUEA or PUEB or PUEC
+
+// with so many pins, doing this all with #ifdefs gets awkward...
+// ... so just hardcode it in each hwdef file instead
+// For lume1 driver, no SW support for Auxillary Jumpers X1 to X4 yet!
+inline void hwdef_setup() {
+  // enable output ports in Data Direction Registers
+  // FET PWM Pin
+  DDRB = (1 << PWM2_PIN);
+  // Main PWM, Buck Boost Enable Pin, aux R/G/B
+  DDRA = (1 << PWM1_PIN)
+       | (1 << LED_ENABLE_PIN)
+       | (1 << AUXLED_R_PIN)
+       | (1 << AUXLED_G_PIN)
+       | (1 << AUXLED_B_PIN)
+       ;
+  //DDRB&=~(1<<VOLTAGE_PIN); // All pins are input by default
+  /* // For Jumpers X1 to X4, no SW support yet
+  DDRA &= (1<<JUMPER1_PIN);
+  DDRA &= (1<<JUMPER2_PIN);
+  DDRC &= (1<<JUMPER3_PIN);
+  DDRC &= (1<<JUMPER4_PIN);
+  PUEA = (1 << JUMPER1_PIN);
+  PUEA = (1 << JUMPER2_PIN);
+  PUEC = (1 << JUMPER3_PIN);
+  PUEC = (1 << JUMPER4_PIN);
+  */
+
+  // configure PWM for 10 bit at 3.9kHz
+  // Setup PWM. F_pwm = F_clkio / 2 / N / TOP, where N = prescale factor, TOP = top of counter
+  // pre-scale for timer: N = 1
+  // WGM1[3:0]: 0,0,1,1: PWM, Phase Correct, 10-bit (DS table 12-5)
+  // CS1[2:0]:    0,0,1: clk/1 (No prescaling) (DS table 12-6)
+  // COM1A[1:0]:    1,0: PWM OC1A in the normal direction (DS table 12-4)
+  // COM1B[1:0]:    1,0: PWM OC1B in the normal direction (DS table 12-4)
+  TCCR1A  = (1<<WGM11)  | (1<<WGM10)   // 10-bit (TOP=0x03FF) (DS table 12-5)
+          | (1<<COM1A1) | (0<<COM1A0)  // PWM 1A Clear OC1A on Compare Match
+          | (1<<COM1B1) | (0<<COM1B0)  // PWM 1B Clear OC1B on Compare Match
+          ;
+  TCCR1B  = (0<<CS12)   | (0<<CS11) | (1<<CS10)  // clk/1 (no prescaling) (DS table 12-6)
+          | (0<<WGM13)  | (0<<WGM12)  // PWM, Phase Correct, 10-bit
+          ;
+
+  // set up e-switch
+  //PORTA = (1 << SWITCH_PIN);  // TODO: configure PORTA / PORTB / PORTC?
+  PUEA = (1 << SWITCH_PIN);  // pull-up for e-switch
+  SWITCH_PCMSK = (1 << SWITCH_PCINT);  // enable pin change interrupt
+}
+
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/spaghetti-monster/anduril/anduril-ui.png b/spaghetti-monster/anduril/anduril-ui.png
index 70f6be0..8f60cc8 100644
--- a/spaghetti-monster/anduril/anduril-ui.png
+++ b/spaghetti-monster/anduril/anduril-ui.png
diff --git a/spaghetti-monster/anduril/anduril.svg b/spaghetti-monster/anduril/anduril.svg
index d58e478..2ecb530 100644
--- a/spaghetti-monster/anduril/anduril.svg
+++ b/spaghetti-monster/anduril/anduril.svg
@@ -18,8 +18,8 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    sodipodi:docname="anduril.svg"
    inkscape:export-filename="/tmp/anduril-ui.png"
-   inkscape:export-xdpi="109.75774"
-   inkscape:export-ydpi="109.75774">
+   inkscape:export-xdpi="67.543221"
+   inkscape:export-ydpi="67.543221">
   <defs
      id="defs4">
     <marker
@@ -2851,7 +2851,7 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1.0500861"
-     inkscape:cx="341.22418"
+     inkscape:cx="72.674772"
      inkscape:cy="568.52482"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2959,29 +2959,7 @@
        y="145.69688"
        x="1339.1499"
        id="image21186"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAMgCAYAAADVw8ezAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
-WXMAAC4mAAAuJgFVH1qAAAAAB3RJTUUH4wgWFywjmzkvJwAABGZJREFUeNrt08ENg0AQBEFjbf6R
-9vP+kMUKoeoQpjTXOef+6TX9TQBEQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQARE
-QIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIg
-QAREQIAICBABASIgQAREQIAICBABASIgQAQEiIAICBABASIgX28qK3iIgAARECACAkRAgAiIgAAR
-ECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAiI
-gAARECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAgIEAERECACAkRAgAgIEAERECACAkRA
-gGivqazgIQICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAIC
-RECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEi
-IEAERECACAgQAQEiIEAERECACAgQAQGivaaygocICBABASIgQAQEiIAICBABASIgQAQEiIAICBAB
-ASIgQAQEiIAICBABASIgQAQEiIAICBABASIgQAQEiIAICBABASIgQAQEiIAICBABASIgQAQEiIAI
-CBABASIgQAQEiIAICBABASIgQAQEiIAAERABASIgQAQEiIAAERABASIgQAQEiPaaygoeIiBABASI
-gAARECACIiBABASIgAARECACIiBABASIgAARECACIiBABASIgAARECACIiBABASIgAARECACIiBA
-BASIgAARECACIiBABASIgAARECACIiBABASIgAARECACIiBABASIgAARECACAkRABASIgAARECAC
-AkRABASIgAARECDaayoreIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQ
-IAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiA
-ABEQIAICRECACAgQAREQIAICRECACAgQAREQIAICRECAaK+prOAhAgJEQIAICBABASIgAgJEQIAI
-CBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgAgJE
-QIAICBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABAaK9
-prKChwgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEB
-IiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAAR
-EAEBIiBABASIgAAREAEBIiBABASI9noABIsdhY+pbIsAAAAASUVORK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAMgCAYAAADVw8ezAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAC4mAAAuJgFVH1qAAAAAB3RJTUUH4wgWFywjmzkvJwAABGZJREFUeNrt08ENg0AQBEFjbf6R 9vP+kMUKoeoQpjTXOef+6TX9TQBEQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQARE QIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIg QAREQIAICBABASIgQAREQIAICBABASIgQAQEiIAICBABASIgX28qK3iIgAARECACAkRAgAiIgAAR ECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAiI gAARECACAkRAgAiIgAARECACAkRAgAiIgAARECACAkRAgAgIEAERECACAkRAgAgIEAERECACAkRA gGivqazgIQICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAIC RECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEiIAICRECACAgQAQEi IEAERECACAgQAQEiIEAERECACAgQAQGivaaygocICBABASIgQAQEiIAICBABASIgQAQEiIAICBAB ASIgQAQEiIAICBABASIgQAQEiIAICBABASIgQAQEiIAICBABASIgQAQEiIAICBABASIgQAQEiIAI CBABASIgQAQEiIAICBABASIgQAQEiIAAERABASIgQAQEiIAAERABASIgQAQEiPaaygoeIiBABASI gAARECACIiBABASIgAARECACIiBABASIgAARECACIiBABASIgAARECACIiBABASIgAARECACIiBA BASIgAARECACIiBABASIgAARECACIiBABASIgAARECACIiBABASIgAARECACAkRABASIgAARECAC AkRABASIgAARECDaayoreIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQ IAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiAABEQIAICRECACIiA ABEQIAICRECACAgQAREQIAICRECACAgQAREQIAICRECAaK+prOAhAgJEQIAICBABASIgAgJEQIAI CBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgAgJE QIAICBABASIgAgJEQIAICBABASIgAgJEQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABAaK9 prKChwgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEB IiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAgIEAEBIiBABASIgAAR EAEBIiBABASIgAAREAEBIiBABASI9noABIsdhY+pbIsAAAAASUVORK5CYII= "
        preserveAspectRatio="none"
        height="261.36438"
        width="17.741749" />
@@ -3826,7 +3804,7 @@ EAEBIiBABASIgAAREAEBIiBABASI9noABIsdhY+pbIsAAAAASUVORK5CYII=
        transform="translate(4.5029255)"><textPath
          xlink:href="#path5213-6-8-4-9-9-1-3-0"
          id="textPath20024"><tspan
-   id="tspan7287-5-5-6-6-4">            Click, Click, Hold</tspan></textPath></text>
+   id="tspan7287-5-5-6-6-4">     Click, Click, Hold (3H)</tspan></textPath></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:2.13333344;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-88-7-6)"
        d="m 1058.2677,758.40918 c 0.4912,-26.15636 0.9882,-169.24427 7.3904,-226.98309"
diff --git a/spaghetti-monster/anduril/cfg-fw3x-lume1.h b/spaghetti-monster/anduril/cfg-fw3x-lume1.h
new file mode 100644
index 0000000..cf4d9bc
--- /dev/null
+++ b/spaghetti-monster/anduril/cfg-fw3x-lume1.h
@@ -0,0 +1,90 @@
+/* lume1 for FW3x config options for Anduril
+ * Constant current Buck-Boost + FET driver
+ * For more information: www.loneoceans.com/labs/
+ * Datasheets:
+ * - 1634: http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8303-8-bit-AVR-Microcontroller-tinyAVR-ATtiny1634_Datasheet.pdf
+ * - 85: https://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2586-AVR-8-bit-Microcontroller-ATtiny25-ATtiny45-ATtiny85_Datasheet.pdf
+ */
+
+#include "hwdef-fw3x-lume1.h"
+// ATTINY: 1634
+
+// set this light for 50C thermal ceiling
+#undef DEFAULT_THERM_CEIL
+#define DEFAULT_THERM_CEIL 50
+
+// this light has three aux LED channels: R, G, B
+#define USE_AUX_RGB_LEDS
+
+// it has no independent LED in the button unlike emisar d4
+//#define USE_BUTTON_LED
+
+// the aux LEDs are front-facing, so turn them off while main LEDs are on
+#ifdef USE_INDICATOR_LED_WHILE_RAMPING
+#undef USE_INDICATOR_LED_WHILE_RAMPING
+#endif
+#define RGB_LED_OFF_DEFAULT 0x18  // low, voltage
+#define RGB_LED_LOCKOUT_DEFAULT 0x37  // blinking, rainbow
+
+// enable blinking aux LEDs
+#define TICK_DURING_STANDBY
+#define STANDBY_TICK_SPEED 3  // every 0.128 s
+//#define STANDBY_TICK_SPEED 4  // every 0.256 s
+//#define STANDBY_TICK_SPEED 5  // every 0.512 s
+
+// ../../bin/level_calc.py cube 1 149 7135 0 0.5 1000, with 0 appended to the end.
+// for FET PWM (PWM2), all values are 0, except for last value of 1023
+// (with max_pwm set to 1023)
+#define RAMP_LENGTH 150
+//#define PWM1_LEVELS 0,0,0,0,1,1,1,1,2,2,2,3,3,4,4,5,5,6,7,7,8,9,10,11,12,13,14,15,16,17,19,20,22,23,25,26,28,30,32,34,36,38,40,42,45,47,49,52,55,58,60,63,66,70,73,76,80,83,87,91,94,98,102,107,111,115,120,124,129,134,139,144,150,155,160,166,172,178,184,190,196,203,209,216,223,230,237,244,252,259,267,275,283,291,299,308,316,325,334,343,353,362,372,382,392,402,412,423,433,444,455,466,478,489,501,513,525,538,550,563,576,589,602,616,630,644,658,672,687,701,716,731,747,762,778,794,810,827,844,861,878,895,913,930,948,967,985,1004,1023,0
+#define PWM1_LEVELS 1,1,1,1,2,2,2,2,3,3,3,4,4,5,5,6,6,7,8,8,9,10,11,12,13,14,15,16,17,18,20,21,23,24,26,27,29,31,33,35,37,39,41,43,45,48,50,53,56,58,61,64,67,70,74,77,80,84,88,91,95,99,103,108,112,116,121,125,130,135,140,145,150,156,161,167,173,178,184,191,197,203,210,217,223,230,238,245,252,260,268,275,283,292,300,308,317,326,335,344,353,363,372,382,392,402,413,423,434,445,456,467,478,490,502,514,526,538,551,563,576,589,603,616,630,644,658,672,687,702,717,732,747,763,778,794,811,827,844,861,878,895,913,931,949,967,985,1004,1023,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,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,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,1023
+#define DEFAULT_LEVEL 56
+#define MAX_1x7135 149
+// TODO: test if underclocking works on lume1
+//#define HALFSPEED_LEVEL 14
+//#define QUARTERSPEED_LEVEL 5
+// don't slow down at low levels; this isn't that sort of light
+// (it needs to stay at full speed for the 10-bit PWM to work)
+#ifdef USE_DYNAMIC_UNDERCLOCKING
+#undef USE_DYNAMIC_UNDERCLOCKING
+#endif
+
+// the entire ramp is regulated except turbo; don't blink halfway up
+#ifdef BLINK_AT_RAMP_MIDDLE
+#undef BLINK_AT_RAMP_MIDDLE
+#endif
+
+#define RAMP_SMOOTH_FLOOR 1
+#define RAMP_SMOOTH_CEIL 149
+// turn on BuckBoost from level 1 to 149, but not 150
+// Level 150 is when BuckBoost is off and FET is ON 100%
+#define LED_ENABLE_PIN_LEVEL_MIN 1
+#define LED_ENABLE_PIN_LEVEL_MAX 149
+// 10 33 56 79 102 125 [149]
+#define RAMP_DISCRETE_FLOOR 10
+#define RAMP_DISCRETE_CEIL RAMP_SMOOTH_CEIL
+#define RAMP_DISCRETE_STEPS 7
+
+// Muggle mode: Goal from about ~10 lumens to about ~300+ lumens
+// In this case, ramp number 99 is about 1A to the driver
+#define MUGGLE_FLOOR RAMP_DISCRETE_FLOOR
+#define MUGGLE_CEILING 99
+
+// slow down party strobe; this driver can't pulse for too short a time
+#define PARTY_STROBE_ONTIME 4
+
+// optional, makes initial turbo step-down faster so first peak isn't as hot
+// FET mode can run very very hot, so be extra careful
+//#define THERM_HARD_TURBO_DROP
+
+// stop panicking at ~85% regulated power or ~750 lm
+#define THERM_FASTER_LEVEL 140
+
+#define THERM_CAL_OFFSET 0  // not needed due to external sensor
+
+// easier access to thermal config mode, similar to Emisar, Noctigon
+#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/fsm-adc.c b/spaghetti-monster/fsm-adc.c
index 4766786..71ecf65 100644
--- a/spaghetti-monster/fsm-adc.c
+++ b/spaghetti-monster/fsm-adc.c
@@ -20,6 +20,14 @@
 #ifndef FSM_ADC_C
 #define FSM_ADC_C
 
+// override onboard temperature sensor definition, if relevant
+#ifdef USE_EXTERNAL_TEMP_SENSOR
+#ifdef ADMUX_THERM
+#undef ADMUX_THERM
+#endif
+#define ADMUX_THERM ADMUX_THERM_EXTERNAL_SENSOR
+#endif
+
 
 static inline void set_admux_therm() {
     #if (ATTINY == 1634)
@@ -345,7 +353,13 @@ static inline void ADC_temperature_handler() {
 
     // let the UI see the current temperature in C
     // Convert ADC units to Celsius (ish)
+    #ifndef USE_EXTERNAL_TEMP_SENSOR
+    // onboard sensor for attiny25/45/85/1634
     temperature = (measurement>>1) + THERM_CAL_OFFSET + (int16_t)therm_cal_offset - 275;
+    #else
+    // external sensor
+    temperature = EXTERN_TEMP_FORMULA(measurement>>1) + THERM_CAL_OFFSET + (int16_t)therm_cal_offset;
+    #endif
 
     // how much has the temperature changed between now and a few seconds ago?
     int16_t diff;
diff --git a/spaghetti-monster/fsm-ramping.c b/spaghetti-monster/fsm-ramping.c
index 6c6d0cb..8ad4b65 100644
--- a/spaghetti-monster/fsm-ramping.c
+++ b/spaghetti-monster/fsm-ramping.c
@@ -76,16 +76,25 @@ void set_level(uint8_t level) {
         LED_ENABLE2_PORT &= ~(1 << LED_ENABLE2_PIN);
         #endif
     } else {
-        level --;
-
         // enable the power channel, if relevant
         #ifdef LED_ENABLE_PIN
-        LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN);
+            #ifndef LED_ENABLE_PIN_LEVEL_MIN
+            LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN);
+            #else
+            // only enable during part of the ramp
+            if ((level >= LED_ENABLE_PIN_LEVEL_MIN)
+                    && (level <= LED_ENABLE_PIN_LEVEL_MAX))
+                LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN);
+            else  // disable during other parts of the ramp
+                LED_ENABLE_PORT &= ~(1 << LED_ENABLE_PIN);
+            #endif
         #endif
         #ifdef LED_ENABLE2_PIN
         LED_ENABLE2_PORT |= (1 << LED_ENABLE2_PIN);
         #endif
 
+        level --;
+
         #ifdef USE_TINT_RAMPING
         #ifndef TINT_RAMPING_CORRECTION
         #define TINT_RAMPING_CORRECTION 26  // 140% brightness at middle tint
@@ -156,6 +165,15 @@ void gradual_tick() {
     if (gt < actual_level) gt = actual_level - 1;
     else if (gt > actual_level) gt = actual_level + 1;
 
+    #ifdef LED_ENABLE_PIN_LEVEL_MIN
+    // only enable during part of the ramp
+    if ((gt >= LED_ENABLE_PIN_LEVEL_MIN)
+            && (gt <= LED_ENABLE_PIN_LEVEL_MAX))
+        LED_ENABLE_PORT |= (1 << LED_ENABLE_PIN);
+    else  // disable during other parts of the ramp
+        LED_ENABLE_PORT &= ~(1 << LED_ENABLE_PIN);
+    #endif
+
     gt --;  // convert 1-based number to 0-based
 
     PWM_DATATYPE target;