adjusted Lume1 (FW3X) cfg and hwdef according to what seems right for it

(but it's not tested since I have no relevant hardware...  need to get
 it tested by someone who has the hardware)

2 files changed, 45 insertions, 57 deletions

diff --git a/hwdef-fw3x-lume1.h b/hwdef-fw3x-lume1.h
index cea24ca..09c5bfe 100644
--- a/hwdef-fw3x-lume1.h
+++ b/hwdef-fw3x-lume1.h
@@ -1,5 +1,5 @@
-#ifndef HWDEF_LUME1_FW3X_REVB_H
-#define HWDEF_LUME1_FW3X_REVB_H
+#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
@@ -9,9 +9,9 @@
  *   2    PA5   R red aux LED (PWM0B)
  *   3    PA4   G green aux LED
  *   4    PA3   B blue aux LED
- *   5    PA2   e-switch (PCINT2) 
+ *   5    PA2   e-switch (PCINT2)
  *   6    PA1   Jumper 1
- *   7    PA0   Jumper 2 
+ *   7    PA0   Jumper 2
  *   8    GND   GND
  *   9    VCC   VCC
  *  10    PC5   Jumper 3
@@ -25,11 +25,11 @@
  *  18    PB1   MOSI
  *  19    PB0   ADC5 Voltage Battery Sense (2:1 divider)
  *  20    PA7   BB_Enable
- *				ADC12   internal thermal sensor (not used for lume1)
+ *        ADC12 internal thermal sensor (not used for lume1)
  *
- * Main LED power uses one pin as a global Buck Boost Enable, and 
+ * 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. 
+ * for FET control.
  */
 
 #ifdef ATTINY
@@ -66,14 +66,6 @@
 #define JUMPER4_PIN PC4
 */
 
-/*
-// average drop across diode on this hardware
-// not applicable for LUME1 driver
-#ifndef VOLTAGE_FUDGE_FACTOR
-#define VOLTAGE_FUDGE_FACTOR 4  // add 0.20V  (measured 0.22V)
-#endif
-*/
-
 #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
@@ -111,31 +103,33 @@
 // See line 34 and line 209
 #define USE_EXTERNAL_TEMP_SENSOR
 #define ADMUX_THERM_EXTERNAL_SENSOR 0b00001011  // VCC reference (2.5V), Channel PC2
-#define TEMP_CHANNEL 0b00001111
+// 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
+#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
-  // Buck Boost Enable Pin
-  // DDRA = (1 << LED_ENABLE_PIN);
   // FET PWM Pin
   DDRB = (1 << PWM2_PIN);
-  // Main PWM, aux R/G/B
+  // 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)
-       | (1 << LED_ENABLE_PIN)
        ;
   //DDRB&=~(1<<VOLTAGE_PIN); // All pins are input by default
   /* // For Jumpers X1 to X4, no SW support yet
@@ -143,10 +137,10 @@ inline void hwdef_setup() {
   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); 
+  PUEA = (1 << JUMPER1_PIN);
+  PUEA = (1 << JUMPER2_PIN);
+  PUEC = (1 << JUMPER3_PIN);
+  PUEC = (1 << JUMPER4_PIN);
   */
 
   // configure PWM for 10 bit at 3.9kHz
@@ -172,4 +166,4 @@ inline void hwdef_setup() {
 
 #define LAYOUT_DEFINED
 
-#endif
\ No newline at end of file
+#endif
diff --git a/spaghetti-monster/anduril/cfg-fw3x-lume1.h b/spaghetti-monster/anduril/cfg-fw3x-lume1.h
index 27f652a..0ab93ca 100644
--- a/spaghetti-monster/anduril/cfg-fw3x-lume1.h
+++ b/spaghetti-monster/anduril/cfg-fw3x-lume1.h
@@ -4,19 +4,11 @@
  * 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
- * - Manual: https://bazaar.launchpad.net/~toykeeper/flashlight-firmware/fsm/view/head:/ToyKeeper/spaghetti-monster/anduril/anduril-manual.txt
- * - Notigon K1 Repo: https://code.launchpad.net/~toykeeper/flashlight-firmware/noctigon-k1
  */
 
-#include "hwdef-lume1-fw3x-revb.h"
+#include "hwdef-fw3x-lume1.h"
 // ATTINY: 1634
 
-// NOTES: modified fsm-ramping.c (line 80) adding if block to turn off BuckBoost EN pin during FET Turbo
-//        Lume1 driver is a 10-bit Constant Current Buck Boost level, + FET for Turbo
-//        FET is not used for regular ramping, only turned on during TURBO
-//       - Same for line 161 in fsm-ramping.c
-// NOTES: modifed fsm-adc.c (line 33 & 289) changing reading to external adc
-
 // set this light for 50C thermal ceiling
 #undef DEFAULT_THERM_CEIL
 #define DEFAULT_THERM_CEIL 50
@@ -28,8 +20,6 @@
 //#define USE_BUTTON_LED
 
 // the aux LEDs are front-facing, so turn them off while main LEDs are on
-// TODO: the whole "indicator LED" thing needs to be refactored into
-//       "aux LED(s)" and "button LED(s)" since they work a bit differently
 #ifdef USE_INDICATOR_LED_WHILE_RAMPING
 #undef USE_INDICATOR_LED_WHILE_RAMPING
 #endif
@@ -49,12 +39,13 @@
 //#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
-// TODO CHECK WHAT THESE DO
-#define MAX_1x7135 50	
-#define HALFSPEED_LEVEL 14
-#define QUARTERSPEED_LEVEL 5
+#define DEFAULT_LEVEL 56
+#define MAX_1x7135 149
+// TODO: test if underclocking works on lume1
+//#define HALFSPEED_LEVEL 14
+//#define QUARTERSPEED_LEVEL 5
 
-// the entire ramp is regulated; don't blink halfway up
+// the entire ramp is regulated except turbo; don't blink halfway up
 #ifdef BLINK_AT_RAMP_MIDDLE
 #undef BLINK_AT_RAMP_MIDDLE
 #endif
@@ -66,8 +57,12 @@
 #endif
 
 #define RAMP_SMOOTH_FLOOR 1
-#define RAMP_SMOOTH_CEIL 149	// Level 150 is when BuckBoost is off and FET is ON 100%
-// 10, 30, [50], 70, 90, 110, 130
+#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
@@ -81,8 +76,8 @@
 // FET mode can run very very hot, so be extra careful
 //#define THERM_HARD_TURBO_DROP
 
-// stop panicking at ~70% power or ~700 lm (not sure of this numbers yet)
-#define THERM_FASTER_LEVEL 120
+// stop panicking at ~85% regulated power or ~750 lm
+#define THERM_FASTER_LEVEL 140
 
 // respond to thermal changes faster
 #define THERMAL_WARNING_SECONDS 3
@@ -96,11 +91,10 @@
 // slow down party strobe; this driver can't pulse for too short a time
 #define PARTY_STROBE_ONTIME 4
 
-//#define THERM_CAL_OFFSET 0	// was 5 from Noctigon
-
-// attiny1634 has enough space to smooth out voltage readings
-#define USE_VOLTAGE_LOWPASS
+#ifdef THERM_CAL_OFFSET
+#undef THERM_CAL_OFFSET
+#endif
+#define THERM_CAL_OFFSET 0  // not needed due to external sensor
 
 // can't reset the normal way because power is connected before the button
-// no support for this yet for ATtiny1634 due to lack of WDTCR register in 1634 
-//#define USE_SOFT_FACTORY_RESET
\ No newline at end of file
+#define USE_SOFT_FACTORY_RESET