From 3d12b7066d27b591e0283e20ed066bc66e29fbe4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 10 Nov 2023 21:34:40 -0700
Subject: refactor checkpoint: splitting MCU-specific code into arch/$MCU.[ch]

Phew, that's a lot of changes!  And there's still a lot more to do...
---
 hw/lumintop/fw3x-lume1/hwdef.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'hw/lumintop/fw3x-lume1/hwdef.h')

diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index 943921f..ca412cc 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -34,9 +34,7 @@
  * Another pin is used for DD FET control.
  */
 
-#include <avr/io.h>
-
-#define HWDEF_C_FILE lumintop/fw3x-lume1/hwdef.c
+#define HWDEF_C  lumintop/fw3x-lume1/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
@@ -95,7 +93,7 @@ enum CHANNEL_MODES {
 #define SWITCH_PCMSK PCMSK0 // PCMSK0 is for PCINT[7:0]
 #define SWITCH_PORT  PINA   // PINA or PINB or PINC
 #define SWITCH_PUE   PUEA   // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
+#define SWITCH_VECT  PCINT0_vect  // ISR for PCINT[7:0]
 
 #define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
 #define VOLTAGE_PIN PB0      // Pin 19  PB0  ADC5
-- 
cgit v1.2.3


From 62e9337211eea3583daa24e84ce9fda5db5a35e7 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 27 Nov 2023 14:45:00 -0700
Subject: fw3x: fixed swapped red+blue, fixed battery measurements, added
 police color strobe

---
 hw/lumintop/fw3x-lume1/hwdef.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'hw/lumintop/fw3x-lume1/hwdef.h')

diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index ca412cc..e50d8b1 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -8,9 +8,9 @@
  *
  * Pin / Name / Function in Lume1 Rev B
  *   1    PA6   Regulated PWM (PWM1B)
- *   2    PA5   R: red aux LED (PWM0B)
+ *   2    PA5   B: blue aux LED (PWM0B)
  *   3    PA4   G: green aux LED
- *   4    PA3   B: blue aux LED
+ *   4    PA3   R: red aux LED
  *   5    PA2   e-switch (PCINT2)
  *   6    PA1   Jumper 1
  *   7    PA0   Jumper 2
@@ -111,16 +111,19 @@ enum CHANNEL_MODES {
 #define ADMUX_VOLTAGE_DIVIDER 0b00000101
 #define ADC_PRSCL   0x06    // clk/64
 
+#undef voltage_raw2cooked
+#define voltage_raw2cooked  mcu_vdivider_raw2cooked
+
 // 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
+#define ADC_44 (4*900)
 #endif
 #ifndef ADC_22
-#define ADC_22 450
+#define ADC_22 (4*450)
 #endif
 
 // Default ADMUX_THERM for Temperature is: 0b10001110 in arch/mcu.h
@@ -139,9 +142,9 @@ enum CHANNEL_MODES {
 #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_R_PIN    PA3    // pin 2
 #define AUXLED_G_PIN    PA4    // pin 3
-#define AUXLED_B_PIN    PA3    // pin 4
+#define AUXLED_B_PIN    PA5    // 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
-- 
cgit v1.2.3


From 6cb18249d33f57acaf8e78734f4d155ebfd72165 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Mon, 27 Nov 2023 16:08:11 -0700
Subject: FW3X: multiple upgrades...

- upgraded to DSM: lower lows, *much* smoother ramp
- made lows more efficient with underclocking
- fixed party strobe being too blurry
- calibrated UI speed / bogomips multiplier
- added readme to document this hardware's multiple quirks
---
 hw/lumintop/fw3x-lume1/hwdef.h | 60 ++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 22 deletions(-)

(limited to 'hw/lumintop/fw3x-lume1/hwdef.h')

diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index e50d8b1..bee98db 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -8,9 +8,9 @@
  *
  * Pin / Name / Function in Lume1 Rev B
  *   1    PA6   Regulated PWM (PWM1B)
- *   2    PA5   B: blue aux LED (PWM0B)
+ *   2    PA5   B: blue aux LED (PWM0B) (or red)
  *   3    PA4   G: green aux LED
- *   4    PA3   R: red aux LED
+ *   4    PA3   R: red aux LED  (or blue)
  *   5    PA2   e-switch (PCINT2)
  *   6    PA1   Jumper 1
  *   7    PA0   Jumper 2
@@ -54,29 +54,38 @@ enum CHANNEL_MODES {
 #define CHANNEL_MODES_ENABLED 0b0000000000000001
 
 
-#define PWM_CHANNELS  2  // old, remove this
-
-// Added for Lume1 Buck Boost Driver
-#define PWM_BITS      16        // 0 to 1023 at 3.9 kHz, not 0 to 255 at 15.6 kHz
-#define PWM_GET       PWM_GET16
+#define PWM_BITS      16        // 0 to 32640 (0 to 255 PWM + 0 to 127 DSM) at constant kHz
 #define PWM_DATATYPE  uint16_t
 #define PWM_DATATYPE2 uint32_t  // only needs 32-bit if ramp values go over 255
 #define PWM1_DATATYPE uint16_t  // regulated ramp
-#define PWM2_DATATYPE uint16_t  // DD FET ramp
+#define PWM1_GET(x)   PWM_GET16(pwm1_levels, x)
+#define PWM2_DATATYPE uint8_t   // DD FET ramp
+#define PWM2_GET(x)   PWM_GET8(pwm2_levels, x)
 
 // PWM parameters of both channels are tied together because they share a counter
 #define PWM_TOP       ICR1   // holds the TOP value for variable-resolution PWM
-#define PWM_TOP_INIT  1023
-#define PWM_CNT       TCNT1  // for dynamic PWM, reset phase
+#define PWM_TOP_INIT  255
+#define PWM_CNT       TCNT1  // for checking / resetting phase
+// (max is (255 << 7), because it's 8-bit PWM plus 7 bits of DSM)
+#define DSM_TOP       (255<<7) // 15-bit resolution leaves 1 bit for carry
+
+// timer interrupt for DSM
+#define DSM_vect     TIMER1_OVF_vect
+#define DSM_INTCTRL  TIMSK
+#define DSM_OVF_bm   (1<<TOIE1)
 
-// regulated channel
+#define DELAY_FACTOR 85  // less time in delay() because more time spent in interrupts
+
+// regulated channel uses PWM+DSM
+uint16_t ch1_dsm_lvl;
+uint8_t ch1_pwm, ch1_dsm;
 #define CH1_PIN  PA6            // pin 1, Buck Boost CTRL pin or 7135-eqv PWM
 #define CH1_PWM  OCR1B          // OCR1B is the output compare register for PA6
 #define CH1_ENABLE_PIN   PA7    // pin 20, BuckBoost Enable
 #define CH1_ENABLE_PORT  PORTA  // control port for PA7
 
-// DD FET channel
-#define CH2_PIN  PB3            // pin 16, FET PWM Pin, but only used as on (1023) or off (0)
+// DD FET channel is on/off only (PWM=0, or PWM=MAX)
+#define CH2_PIN  PB3            // pin 16, FET PWM Pin, but only used as on (255) or off (0)
 #define CH2_PWM  OCR1A          // OCR1A is the output compare register for PB3
 
 /* // For Jumpers X1 to X4, no SW support yet
@@ -174,24 +183,31 @@ inline void hwdef_setup() {
     PUEC = (1 << JUMPER4_PIN);
     */
 
-    // configure PWM for 10 bit at 3.9kHz
+    // configure PWM
     // 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)
+    // PWM for both channels
+    // WGM1[3:0]: 1,0,1,0: PWM, Phase Correct, adjustable (DS table 12-5)
+    // WGM1[3:0]: 1,1,1,0: PWM, Fast, adjustable (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
-            ;
+    TCCR1A = (1<<WGM11)  | (0<<WGM10)   // adjustable PWM (TOP=ICR1) (DS table 12-5)
+           | (1<<COM1A1) | (0<<COM1A0)  // PWM 1A in normal direction (DS table 12-4)
+           | (1<<COM1B1) | (0<<COM1B0)  // PWM 1B in normal direction (DS table 12-4)
+           ;
+    TCCR1B = (0<<CS12)   | (0<<CS11) | (1<<CS10)  // clk/1 (no prescaling) (DS table 12-6)
+           //| (1<<WGM13)  | (1<<WGM12)  // fast adjustable PWM (DS table 12-5)
+           | (1<<WGM13)  | (0<<WGM12)  // phase-correct adjustable PWM (DS table 12-5)
+           ;
 
     // set PWM resolution
     PWM_TOP = PWM_TOP_INIT;
 
+    // set up interrupt for delta-sigma modulation
+    // (moved to hwdef.c functions so it can be enabled/disabled based on ramp level)
+    //DSM_INTCTRL |= DSM_OVF_bm;  // interrupt once for each timer cycle
+
     // set up e-switch
     SWITCH_PUE = (1 << SWITCH_PIN);  // pull-up for e-switch
     SWITCH_PCMSK = (1 << SWITCH_PCINT);  // enable pin change interrupt
-- 
cgit v1.2.3


From 00af846f2d4d269a447d27f6ce2b0307f18bdca8 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Tue, 28 Nov 2023 10:30:04 -0700
Subject: FW3X: fixed external temperature sensor

(the MCU's internal sensor works too, but external is a bit better I guess?)
---
 hw/lumintop/fw3x-lume1/hwdef.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'hw/lumintop/fw3x-lume1/hwdef.h')

diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index bee98db..92a177f 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -142,13 +142,15 @@ uint8_t ch1_pwm, ch1_dsm;
 // 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)
+//#define USE_EXTERNAL_TEMP_SENSOR
+
+// override the default temperature sensor code
+#undef hwdef_set_admux_therm
+void hwdef_set_admux_therm();
+#undef temp_raw2cooked
+uint16_t temp_raw2cooked(uint16_t measurement);
+// VCC reference (2.5V), Channel PC2
+#define ADMUX_THERM_EXTERNAL_SENSOR 0b00001011
 
 // this driver allows for aux LEDs under the optic
 #define AUXLED_R_PIN    PA3    // pin 2
-- 
cgit v1.2.3


From 1153a7c8b4130abb62654476bc958399d687cbf2 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 30 Nov 2023 08:44:31 -0700
Subject: added a build target for FW3X with manually-fixed RGB aux wiring

---
 hw/lumintop/fw3x-lume1/hwdef.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'hw/lumintop/fw3x-lume1/hwdef.h')

diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index 92a177f..021c4cf 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -153,9 +153,15 @@ uint16_t temp_raw2cooked(uint16_t measurement);
 #define ADMUX_THERM_EXTERNAL_SENSOR 0b00001011
 
 // this driver allows for aux LEDs under the optic
-#define AUXLED_R_PIN    PA3    // pin 2
-#define AUXLED_G_PIN    PA4    // pin 3
-#define AUXLED_B_PIN    PA5    // pin 4
+#ifdef FW3X_RGB_SWAP  // wiring fixed by end user
+    #define AUXLED_R_PIN    PA5    // pin 2
+    #define AUXLED_G_PIN    PA4    // pin 3
+    #define AUXLED_B_PIN    PA3    // pin 4
+#else  // Lumintop's factory wiring
+    #define AUXLED_R_PIN    PA3    // pin 4
+    #define AUXLED_G_PIN    PA4    // pin 3
+    #define AUXLED_B_PIN    PA5    // pin 2
+#endif
 #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
-- 
cgit v1.2.3