converted noctigon-kr4-boost to new API

(it's almost identical to noctigon-dm11-boost)

4 files changed, 73 insertions, 232 deletions

diff --git a/hwdef-Noctigon_KR4-12V.h b/hwdef-Noctigon_KR4-12V.h
deleted file mode 100644
index 57d39f2..0000000
--- a/hwdef-Noctigon_KR4-12V.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// Noctigon KR4 (12V) driver layout (attiny1634)
-// Copyright (C) 2020-2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-/*
- * (based on Noctigon DM11-12V and KR4)
- *
- * Pin / Name / Function
- *   1    PA6   (none) (PWM1B) (reserved for DD drivers)
- *   2    PA5   R: red aux LED (PWM0B)
- *   3    PA4   G: green aux LED
- *   4    PA3   B: blue aux LED
- *   5    PA2   L: button LED
- *   6    PA1   (none)
- *   7    PA0   (none)
- *   8    GND   GND
- *   9    VCC   VCC
- *  10    PC5   (none)
- *  11    PC4   (none)
- *  12    PC3   RESET
- *  13    PC2   (none)
- *  14    PC1   SCK
- *  15    PC0   boost PMIC enable (PWM0A not used)
- *  16    PB3   main LED PWM (PWM1A)
- *  17    PB2   MISO / e-switch (PCINT10)
- *  18    PB1   MOSI / battery voltage (ADC6)
- *  19    PB0   Opamp power
- *  20    PA7   (none)  (PCINT7)
- *      ADC12   thermal sensor
- *
- * Main LED power uses one pin to turn the Opamp on/off,
- * and one pin to control Opamp power level.
- * Linear brightness control uses the power level pin, with dynamic PWM.
- * The on/off pin is only used to turn the main LED on and off,
- * not to change brightness.
- */
-
-#ifdef ATTINY
-#undef ATTINY
-#endif
-#define ATTINY 1634
-#include <avr/io.h>
-
-#define PWM_CHANNELS 1  // can't use DD FET on boost drivers
-#define PWM_BITS 16  // data type needs 16 bits, not 8
-#define PWM_TOP  255 // highest value used in top half of ramp
-#define USE_DYN_PWM  // dynamic frequency and speed
-
-#define SWITCH_PIN   PB2     // pin 17
-#define SWITCH_PCINT PCINT10 // pin 17 pin change interrupt
-#define SWITCH_PCIE  PCIE1   // PCIE1 is for PCINT[11:8]
-#define SWITCH_PCMSK PCMSK1  // PCMSK1 is for PCINT[11:8]
-#define SWITCH_PORT  PINB    // PINA or PINB or PINC
-#define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
-
-#define PWM1_PIN PB3        // pin 16, Opamp reference
-#define PWM1_LVL OCR1A      // OCR1A is the output compare register for PB3
-#define PWM1_CNT TCNT1      // for dynamic PWM, reset phase
-#define PWM1_PHASE_RESET_OFF  // force reset while shutting off
-#define PWM1_PHASE_RESET_ON   // force reset while turning on
-#define PWM1_PHASE_SYNC       // manual sync while changing level
-
-// PWM parameters of both channels are tied together because they share a counter
-#define PWM1_TOP ICR1       // holds the TOP value for for variable-resolution PWM
-
-#define LED_ENABLE_PIN  PB0    // pin 19, Opamp power
-#define LED_ENABLE_PORT PORTB  // control port for PB0
-
-#define LED2_ENABLE_PIN  PC0    // pin 15, boost PMIC enable
-#define LED2_ENABLE_PORT PORTC  // control port for PC0
-
-
-#define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
-#define VOLTAGE_PIN PB1      // Pin 18 / PB1 / ADC6
-// pin to ADC mappings are in DS table 19-4
-#define VOLTAGE_ADC      ADC6D  // 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 ADC6D
-// 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, 1, 0 for ADC6 / PB1
-// divided by ...
-// REFS[1:0] = 1, 0 for internal 1.1V reference
-// other bits reserved
-#define ADMUX_VOLTAGE_DIVIDER 0b10000110
-#define ADC_PRSCL   0x07    // clk/128
-
-// Raw ADC readings at 4.4V and 2.2V
-// calibrate the voltage readout here
-// estimated / calculated values are:
-//   (voltage - D1) * (R2/(R2+R1) * 1024 / 1.1)
-// D1, R1, R2 = 0, 330, 100
-#ifndef ADC_44
-//#define ADC_44 981  // raw value at 4.40V
-#define ADC_44 967  // manually tweaked so 4.16V will blink out 4.2
-#endif
-#ifndef ADC_22
-//#define ADC_22 489  // raw value at 2.20V
-#define ADC_22 482  // manually tweaked so 4.16V will blink out 4.2
-#endif
-
-// this light has 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 BUTTON_LED_PIN  PA2    // pin 5
-#define BUTTON_LED_PORT PORTA  // for all "PA" pins
-#define BUTTON_LED_DDR  DDRA   // for all "PA" pins
-#define BUTTON_LED_PUE  PUEA   // for all "PA" pins
-
-// with so many pins, doing this all with #ifdefs gets awkward...
-// ... so just hardcode it in each hwdef file instead
-inline void hwdef_setup() {
-  // enable output ports
-  // boost PMIC on/off
-  DDRC = (1 << LED2_ENABLE_PIN);
-  // Opamp level and Opamp on/off
-  DDRB = (1 << PWM1_PIN)
-       | (1 << LED_ENABLE_PIN);
-  // aux R/G/B, button LED
-  DDRA = (1 << AUXLED_R_PIN)
-       | (1 << AUXLED_G_PIN)
-       | (1 << AUXLED_B_PIN)
-       | (1 << BUTTON_LED_PIN)
-       ;
-
-  // 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]: 1,0,1,0: PWM, Phase Correct, 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]:    0,0: PWM OC1B disabled (DS table 12-4)
-  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)
-          | (0<<COM1B1) | (0<<COM1B0)  // PWM 1B disabled (DS table 12-4)
-          ;
-  TCCR1B  = (0<<CS12)   | (0<<CS11) | (1<<CS10)  // clk/1 (no prescaling) (DS table 12-6)
-          | (1<<WGM13)  | (0<<WGM12)  // phase-correct adjustable PWM (DS table 12-5)
-          ;
-
-  // set PWM resolution
-  PWM1_TOP = PWM_TOP;
-
-  // set up e-switch
-  //PORTB = (1 << SWITCH_PIN);  // TODO: configure PORTA / PORTB / PORTC?
-  PUEB = (1 << SWITCH_PIN);  // pull-up for e-switch
-  SWITCH_PCMSK = (1 << SWITCH_PCINT);  // enable pin change interrupt
-}
-
-#define LAYOUT_DEFINED
-
diff --git a/hwdef-noctigon-kr4-boost.h b/hwdef-noctigon-kr4-boost.h
new file mode 100644
index 0000000..07c4f4b
--- /dev/null
+++ b/hwdef-noctigon-kr4-boost.h
@@ -0,0 +1,57 @@
+// Noctigon KR4 boost driver layout (attiny1634)
+// Copyright (C) 2020-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+/*
+ * (based on Noctigon DM11-boost and KR4)
+ * (is basically the same except the switch is on a different pin)
+ *
+ * Pin / Name / Function
+ *   1    PA6   (none) (PWM1B) (reserved for DD drivers)
+ *   2    PA5   R: red aux LED (PWM0B)
+ *   3    PA4   G: green aux LED
+ *   4    PA3   B: blue aux LED
+ *   5    PA2   L: button LED
+ *   6    PA1   (none)
+ *   7    PA0   (none)
+ *   8    GND   GND
+ *   9    VCC   VCC
+ *  10    PC5   (none)
+ *  11    PC4   (none)
+ *  12    PC3   RESET
+ *  13    PC2   (none)
+ *  14    PC1   SCK
+ *  15    PC0   boost PMIC enable (PWM0A not used)
+ *  16    PB3   main LED PWM (PWM1A)
+ *  17    PB2   MISO / e-switch (PCINT10)
+ *  18    PB1   MOSI / battery voltage (ADC6)
+ *  19    PB0   Opamp power
+ *  20    PA7   (none)  (PCINT7)
+ *      ADC12   thermal sensor
+ *
+ * Main LED power uses one pin to turn the Opamp on/off,
+ * and one pin to control Opamp power level.
+ * Linear brightness control uses the power level pin, with dynamic PWM.
+ * The on/off pin is only used to turn the main LED on and off,
+ * not to change brightness.
+ */
+
+#include "hwdef-noctigon-dm11-boost.h"
+
+// e-switch is on a different pin
+#undef SWITCH_PIN
+#undef SWITCH_PCINT
+#undef SWITCH_PCIE
+#undef SWITCH_PCMSK
+#undef SWITCH_PORT
+#undef SWITCH_PUE
+#undef PCINT_vect
+#define SWITCH_PIN   PB2     // pin 17
+#define SWITCH_PCINT PCINT10 // pin 17 pin change interrupt
+#define SWITCH_PCIE  PCIE1   // PCIE1 is for PCINT[11:8]
+#define SWITCH_PCMSK PCMSK1  // PCMSK1 is for PCINT[11:8]
+#define SWITCH_PORT  PINB    // PINA or PINB or PINC
+#define SWITCH_PUE   PUEB    // pullup group B
+#define PCINT_vect   PCINT1_vect  // ISR for PCINT[11:8]
+
diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4-12v.h b/spaghetti-monster/anduril/cfg-noctigon-kr4-12v.h
deleted file mode 100644
index 52a031d..0000000
--- a/spaghetti-monster/anduril/cfg-noctigon-kr4-12v.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Noctigon KR4 (12V) config options for Anduril
-// (and Noctigon KR1)
-// Copyright (C) 2020-2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-#define MODEL_NUMBER "0216"
-#include "hwdef-Noctigon_KR4-12V.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 (D4v2.5 only)
-#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
-
-
-// power channels:
-// - linear: 5A?
-// - 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)
-#define PWM1_LEVELS 0,1,1,1,2,3,3,4,5,6,7,8,9,10,11,13,14,16,17,19,21,23,25,27,29,31,34,36,39,42,44,47,50,53,57,60,63,67,70,74,77,81,85,88,92,96,99,103,107,110,113,117,120,123,126,128,130,133,134,136,137,137,137,137,136,135,133,130,126,122,117,111,104,96,87,76,65,52,38,22,23,25,26,27,28,29,30,32,33,34,36,37,39,40,42,43,45,47,49,51,53,55,57,59,61,63,66,68,70,73,76,78,81,84,87,90,93,96,99,103,106,110,113,117,121,125,129,133,137,142,146,151,155,160,165,170,175,181,186,192,197,203,209,215,222,228,234,241,248,255
-#define PWM_TOPS 16383,16383,12404,8140,11462,14700,11041,12947,13795,14111,14124,13946,13641,13248,12791,13418,12808,13057,12385,12428,12358,12209,12000,11746,11459,11147,11158,10793,10708,10576,10173,9998,9800,9585,9527,9278,9023,8901,8634,8486,8216,8053,7881,7615,7440,7261,7009,6832,6656,6422,6196,6031,5819,5615,5419,5190,4973,4803,4571,4386,4179,3955,3745,3549,3340,3145,2940,2729,2513,2312,2109,1903,1697,1491,1286,1070,871,662,459,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
-
-#define DEFAULT_LEVEL 70
-#define MAX_1x7135 150
-#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
-#define RAMP_DISCRETE_FLOOR 10
-#define RAMP_DISCRETE_CEIL  RAMP_SMOOTH_CEIL
-#define RAMP_DISCRETE_STEPS 7
-
-// safe limit ~75% power
-#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR
-#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
-
-// 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)
-#define DEFAULT_JUMP_START_LEVEL 1
-#define BLINK_BRIGHTNESS 50
-#define BLINK_ONCE_TIME 12
-
-// can't reset the normal way because power is connected before the button
-#define USE_SOFT_FACTORY_RESET
diff --git a/spaghetti-monster/anduril/cfg-noctigon-kr4-boost.h b/spaghetti-monster/anduril/cfg-noctigon-kr4-boost.h
new file mode 100644
index 0000000..1603acf
--- /dev/null
+++ b/spaghetti-monster/anduril/cfg-noctigon-kr4-boost.h
@@ -0,0 +1,16 @@
+// Noctigon KR4 (12V) config options for Anduril
+// (and Noctigon KR1)
+// Copyright (C) 2020-2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// the only things different from dm11-boost are:
+// - e-switch is on a different pin (defined in hwdef)
+// - different model number
+#include "cfg-noctigon-dm11-boost.h"
+#include "hwdef-noctigon-kr4-boost.h"
+#undef MODEL_NUMBER
+#define MODEL_NUMBER "0216"
+#include "hank-cfg.h"
+// ATTINY: 1634
+