reorganized project files (part 1)

(just moved files, didn't change the contents yet,
 and nothing will work without updating #includes and build scripts and stuff)

3 files changed, 716 insertions, 0 deletions

diff --git a/hw/hank/emisar-d4k-3ch/cfg.h b/hw/hank/emisar-d4k-3ch/cfg.h
new file mode 100644
index 0000000..c39ac01
--- /dev/null
+++ b/hw/hank/emisar-d4k-3ch/cfg.h
@@ -0,0 +1,106 @@
+// Emisar D4K 3-channel config options for Anduril
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#define MODEL_NUMBER "0151"
+#include "hwdef-emisar-d4k-3ch.h"
+#include "hank-cfg.h"
+// ATTINY: 1634
+
+// this light has three aux LED channels: R, G, B
+#define USE_AUX_RGB_LEDS
+
+// turn on the aux LEDs while main LEDs are on
+// (in case there's a RGB button)
+#define USE_AUX_RGB_LEDS_WHILE_ON  40
+#define USE_INDICATOR_LED_WHILE_RAMPING
+
+// channel modes...
+// CM_MAIN2, CM_LED3, CM_LED4, CM_ALL,
+// CM_BLEND34A, CM_BLEND34B, CM_HSV, CM_AUTO3
+#define DEFAULT_CHANNEL_MODE           CM_ALL
+
+#define FACTORY_RESET_WARN_CHANNEL     CM_LED4
+#define FACTORY_RESET_SUCCESS_CHANNEL  CM_MAIN2
+
+#define CONFIG_WAITING_CHANNEL         CM_LED3
+#define CONFIG_BLINK_CHANNEL           CM_ALL
+
+// blink numbers on the main LEDs by default (but allow user to change it)
+#define DEFAULT_BLINK_CHANNEL          CM_MAIN2
+
+// LEDs 3 and 4 make a nice police strobe
+#define POLICE_COLOR_STROBE_CH1        CM_LED3
+#define POLICE_COLOR_STROBE_CH2        CM_LED4
+// aux red + aux blue are the correct colors, but are dim
+//#define POLICE_COLOR_STROBE_CH1        CM_AUXRED
+//#define POLICE_COLOR_STROBE_CH2        CM_AUXBLU
+
+// how much to increase total brightness at middle tint
+// (0 = 100% brightness, 64 = 200% brightness)
+#define TINT_RAMPING_CORRECTION 0  // none, linear regulator doesn't need it
+
+// main 2 LEDs
+//   output: unknown, 2000 lm?
+// LED 3 / 4
+//   output: unknown, 1000 lm each?
+#define RAMP_SIZE 150
+// delta-sigma modulated PWM (0b0HHHHHHHHLLLLLLL = 0, 8xHigh, 7xLow bits)
+// level_calc.py 5.01 1 150 7135 0 0.2 2000 --pwm 32640
+// (max is (255 << 7), because it's 8-bit PWM plus 7 bits of DSM)
+#define PWM1_LEVELS 0,1,2,3,4,5,6,7,9,10,12,14,17,19,22,25,28,32,36,41,45,50,56,62,69,76,84,92,101,110,121,132,143,156,169,184,199,215,232,251,270,291,313,336,360,386,414,442,473,505,539,574,612,651,693,736,782,829,880,932,987,1045,1105,1168,1233,1302,1374,1449,1527,1608,1693,1781,1873,1969,2068,2172,2279,2391,2507,2628,2753,2883,3018,3158,3303,3454,3609,3771,3938,4111,4289,4475,4666,4864,5068,5280,5498,5724,5957,6197,6445,6701,6965,7237,7518,7808,8106,8413,8730,9056,9392,9737,10093,10459,10835,11223,11621,12031,12452,12884,13329,13786,14255,14737,15232,15741,16262,16798,17347,17911,18489,19082,19691,20314,20954,21609,22281,22969,23674,24397,25137,25895,26671,27465,28279,29111,29963,30835,31727,32640
+
+#define MIN_THERM_STEPDOWN 50
+#define DEFAULT_LEVEL 70
+#define MAX_1x7135 70
+// always run at 1/4th speed, because 4 kHz PWM is enough for this circuit
+// and speed changes make a big visible bump
+#define HALFSPEED_LEVEL     255
+#define QUARTERSPEED_LEVEL  255
+
+#define RAMP_SMOOTH_FLOOR 1
+#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
+
+// 10 40 [70] 100 130
+#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR
+#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL
+#define SIMPLE_UI_STEPS 5
+
+// stop panicking at ~1500 lm
+#define THERM_FASTER_LEVEL 130
+
+#define USE_POLICE_COLOR_STROBE_MODE
+#undef  TACTICAL_LEVELS
+#define TACTICAL_LEVELS 120,30,(RAMP_SIZE+3)  // high, low, police strobe
+
+// use the brightest setting for strobe
+#define STROBE_BRIGHTNESS MAX_LEVEL
+// slow down party strobe; this driver can't pulse for 1ms or less
+#define PARTY_STROBE_ONTIME 2
+// #define STROBE_OFF_LEVEL 1  // nope, this makes strobe blurry
+// bike strobe needs a longer pulse too?
+//#define BIKE_STROBE_ONTIME 8
+
+// the default of 26 looks a bit flat, so increase it
+#define CANDLE_AMPLITUDE 33
+
+// the power regulator is a bit slow, so push it harder for a quick response from off
+#define DEFAULT_JUMP_START_LEVEL 21
+#define BLINK_BRIGHTNESS 50
+#define BLINK_ONCE_TIME 12  // longer blink, since main LEDs are slow
+
+#define THERM_CAL_OFFSET 5
+
+// don't blink while ramping
+#ifdef BLINK_AT_RAMP_MIDDLE
+#undef BLINK_AT_RAMP_MIDDLE
+#endif
+
+// for consistency with KR4 (not otherwise necessary though)
+#define USE_SOFT_FACTORY_RESET
+
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.c b/hw/hank/emisar-d4k-3ch/hwdef.c
new file mode 100644
index 0000000..e35af08
--- /dev/null
+++ b/hw/hank/emisar-d4k-3ch/hwdef.c
@@ -0,0 +1,362 @@
+// Emisar D4K 3-channel hwdef
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "spaghetti-monster/anduril/channel-modes.h"  //for circular_tint_3h()
+#include "chan-rgbaux.c"
+
+void set_level_zero();
+
+void set_level_main2(uint8_t level);
+void set_level_led3(uint8_t level);
+void set_level_led4(uint8_t level);
+void set_level_all(uint8_t level);
+void set_level_led34a_blend(uint8_t level);
+void set_level_led34b_blend(uint8_t level);
+void set_level_hsv(uint8_t level);
+void set_level_auto3(uint8_t level);
+
+bool gradual_tick_main2(uint8_t gt);
+bool gradual_tick_led3(uint8_t gt);
+bool gradual_tick_led4(uint8_t gt);
+bool gradual_tick_all(uint8_t gt);
+bool gradual_tick_led34a_blend(uint8_t gt);
+bool gradual_tick_led34b_blend(uint8_t gt);
+bool gradual_tick_hsv(uint8_t gt);
+bool gradual_tick_auto3(uint8_t gt);
+
+
+Channel channels[] = {
+    { // main 2 LEDs only
+        .set_level    = set_level_main2,
+        .gradual_tick = gradual_tick_main2,
+        .has_args     = 0
+    },
+    { // 3rd LED only
+        .set_level    = set_level_led3,
+        .gradual_tick = gradual_tick_led3,
+        .has_args     = 0
+    },
+    { // 4th LED only
+        .set_level    = set_level_led4,
+        .gradual_tick = gradual_tick_led4,
+        .has_args     = 0
+    },
+    { // all channels, tied together (equal amounts, max power)
+        .set_level    = set_level_all,
+        .gradual_tick = gradual_tick_all,
+        .has_args     = 0
+    },
+    { // 3rd + 4th LEDs, manual blend (max "100%" power) (8/16/16)
+        .set_level    = set_level_led34a_blend,
+        .gradual_tick = gradual_tick_led34a_blend,
+        .has_args     = 1
+    },
+    { // 3rd + 4th LEDs, manual blend (max "100%" power) (16/16/8)
+        .set_level    = set_level_led34b_blend,
+        .gradual_tick = gradual_tick_led34b_blend,
+        .has_args     = 1
+    },
+    { // 3ch blend (HSV style)
+        .set_level    = set_level_hsv,
+        .gradual_tick = gradual_tick_hsv,
+        .has_args     = 1
+    },
+    { // 3ch auto blend (red-warm-cool style, led4-led3-main2)
+        .set_level    = set_level_auto3,
+        .gradual_tick = gradual_tick_auto3,
+        .has_args     = 0
+    },
+    RGB_AUX_CHANNELS
+};
+
+// HSV mode needs a different 3H handler
+StatePtr channel_3H_modes[NUM_CHANNEL_MODES] = {
+    NULL, NULL, NULL, NULL,
+    NULL, NULL, circular_tint_3h, NULL,
+};
+
+void set_level_zero() {
+    // disable timer overflow interrupt
+    // (helps improve button press handling from Off state)
+    DSM_INTCTRL &= ~DSM_OVF_bm;
+
+    // turn off all LEDs
+    MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN);
+    LED3_ENABLE_PORT  &= ~(1 << LED3_ENABLE_PIN );
+    LED4_ENABLE_PORT  &= ~(1 << LED4_ENABLE_PIN );
+    main2_dsm_lvl = 0;
+    led3_dsm_lvl  = 0;
+    led4_dsm_lvl  = 0;
+    MAIN2_PWM_LVL = 0;
+    LED3_PWM_LVL  = 0;
+    LED4_PWM_LVL  = 0;
+    PWM_CNT       = 0;
+    //PWM_TOP       = PWM_TOP_INIT;
+}
+
+// wrap setting the dsm vars, to get a faster response
+// (just setting *_dsm_lvl doesn't work well for strobes)
+void set_hw_levels(PWM_DATATYPE main2, // brightness, 0 to DSM_TOP
+                   PWM_DATATYPE led3,
+                   PWM_DATATYPE led4,
+                   bool main2_en,      // enable even at PWM=0?
+                   bool led3_en,
+                   bool led4_en
+                   ) {
+
+    // enable/disable LED power channels
+    if (main2 | main2_en)
+         MAIN2_ENABLE_PORT |=  (1 << MAIN2_ENABLE_PIN);
+    else MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN);
+
+    if (led3  | led3_en )
+         LED3_ENABLE_PORT  |=  (1 << LED3_ENABLE_PIN);
+    else LED3_ENABLE_PORT  &= ~(1 << LED3_ENABLE_PIN);
+
+    if (led4  | led4_en )
+         LED4_ENABLE_PORT  |=  (1 << LED4_ENABLE_PIN);
+    else LED4_ENABLE_PORT  &= ~(1 << LED4_ENABLE_PIN);
+
+    // set delta-sigma soft levels
+    main2_dsm_lvl = main2;
+    led3_dsm_lvl  = led3;
+    led4_dsm_lvl  = led4;
+    // set hardware PWM levels and init dsm loop
+    MAIN2_PWM_LVL = main2_pwm = main2 >> 7;
+    LED3_PWM_LVL  = led3_pwm  = led3  >> 7;
+    LED4_PWM_LVL  = led4_pwm  = led4  >> 7;
+
+    // enable timer overflow interrupt so DSM can work
+    DSM_INTCTRL |= DSM_OVF_bm;
+
+    // force phase reset
+    PWM_CNT       = PWM_CNT2  = 0;
+}
+
+// delta-sigma modulation of PWM outputs
+// happens on each Timer overflow (every 512 cpu clock cycles)
+// uses 8-bit pwm w/ 7-bit dsm (0b 0PPP PPPP PDDD DDDD)
+ISR(DSM_vect) {
+    // set new hardware values first,
+    // for best timing (reduce effect of interrupt jitter)
+    MAIN2_PWM_LVL = main2_pwm;
+    LED3_PWM_LVL  = led3_pwm;
+    LED4_PWM_LVL  = led4_pwm;
+
+    // calculate next values, now that timing matters less
+
+    // accumulate error
+    main2_dsm += (main2_dsm_lvl & 0x007f);
+    // next PWM = base PWM value + carry bit
+    main2_pwm  = (main2_dsm_lvl >> 7) + (main2_dsm > 0x7f);
+    // clear carry bit
+    main2_dsm &= 0x7f;
+
+    // repeat for other channels
+
+    led3_dsm += (led3_dsm_lvl & 0x007f);
+    led3_pwm  = (led3_dsm_lvl >> 7) + (led3_dsm > 0x7f);
+    led3_dsm &= 0x7f;
+
+    led4_dsm += (led4_dsm_lvl & 0x007f);
+    led4_pwm  = (led4_dsm_lvl >> 7) + (led4_dsm > 0x7f);
+    led4_dsm &= 0x7f;
+}
+
+// LEDs 1+2 are 8-bit
+// this 8-bit channel may be LEDs 1+2 or LED 4, depending on wiring
+void set_level_main2(uint8_t level) {
+    set_hw_levels(PWM_GET(pwm1_levels, level), 0, 0,
+                  1,                           0, 0);
+}
+
+// LED 3 is 16-bit
+void set_level_led3(uint8_t level) {
+    set_hw_levels(0, PWM_GET(pwm1_levels, level), 0,
+                  0, 1,                           0);
+}
+
+// this 16-bit channel may be LED 4 or LEDs 1+2, depending on wiring
+void set_level_led4(uint8_t level) {
+    set_hw_levels(0, 0, PWM_GET(pwm1_levels, level),
+                  0, 0, 1);
+}
+
+void set_level_all(uint8_t level) {
+    PWM_DATATYPE pwm = PWM_GET(pwm1_levels, level);
+    set_hw_levels(pwm, pwm, pwm, 1, 1, 1);
+}
+
+// 8/16/16 wiring, mix 16+16
+void set_level_led34a_blend(uint8_t level) {
+    PWM_DATATYPE warm_PWM, cool_PWM;
+    PWM_DATATYPE brightness = PWM_GET(pwm1_levels, level);
+    uint8_t blend = cfg.channel_mode_args[channel_mode];
+
+    calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, DSM_TOP, blend);
+
+    set_hw_levels(0, warm_PWM,    cool_PWM,
+                  0, (blend<170), (blend>85));
+}
+
+// 16/16/8 wiring, mix 16+8
+void set_level_led34b_blend(uint8_t level) {
+    PWM_DATATYPE warm_PWM, cool_PWM;
+    PWM_DATATYPE brightness = PWM_GET(pwm1_levels, level);
+    uint8_t blend = cfg.channel_mode_args[channel_mode];
+
+    calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, DSM_TOP, blend);
+
+    set_hw_levels(cool_PWM,   warm_PWM,    0,
+                  (blend>85), (blend<170), 0);
+}
+
+void set_level_hsv(uint8_t level) {
+    RGB_t color;
+    uint8_t h = cfg.channel_mode_args[channel_mode];
+    uint8_t s = 255;  // TODO: drop saturation at brightest levels
+    PWM_DATATYPE v = PWM_GET(pwm1_levels, level);
+    color = hsv2rgb(h, s, v);
+
+    set_hw_levels(color.r, color.g, color.b,
+                  0,       0,       0);
+}
+
+// calculate a 3-channel "auto tint" blend
+// (like red -> warm white -> cool white)
+// results are placed in *a, *b, and *c vars
+// level : ramp level to convert into 3 channel levels
+// (assumes ramp table is "pwm1_levels")
+void calc_auto_3ch_blend(
+    PWM_DATATYPE *a,  // red
+    PWM_DATATYPE *b,  // warm
+    PWM_DATATYPE *c,  // cool
+    uint8_t level) {
+
+    PWM_DATATYPE vpwm  = PWM_GET(pwm1_levels, level);
+
+    // tint goes from 0 (red) to 127 (warm white) to 255 (cool white)
+    uint8_t mytint;
+    mytint = 255 * (uint16_t)(level+1) / RAMP_SIZE;
+
+    uint8_t falling=0, rising=0;
+    if (level < (RAMP_SIZE/2))
+        falling = 255 - triangle_wave(mytint);
+    else
+        rising = 255 - triangle_wave(mytint);
+
+    // TODO: make "a" drop to zero sooner, and "c" start ramping up later
+    // red is high at 0, low at 255 (linear)
+    *a = (((PWM_DATATYPE2)falling
+         * (PWM_DATATYPE2)vpwm) + 127) / 255;
+    // warm white is low at 0 and 255, high at 127 (linear triangle)
+    *b = (((PWM_DATATYPE2)triangle_wave(mytint)
+         * (PWM_DATATYPE2)vpwm)      ) / 255;
+    // cool white is low at 0, high at 255 (linear)
+    *c = (((PWM_DATATYPE2)rising
+         * (PWM_DATATYPE2)vpwm) + 127) / 255;
+
+}
+
+// 3-channel "auto tint" channel mode
+void set_level_auto3(uint8_t level) {
+    PWM_DATATYPE a, b, c;
+    calc_auto_3ch_blend(&a, &b, &c, level);
+
+    set_hw_levels(c, b, a,
+                  0, 0, (0 == level));
+}
+
+///// "gradual tick" functions for smooth thermal regulation /////
+// (and other smooth adjustments)
+
+bool gradual_adjust(PWM_DATATYPE main2, PWM_DATATYPE led3, PWM_DATATYPE led4) {
+    // adjust multiple times based on current brightness
+    // (so it adjusts faster/coarser when bright, slower/finer when dim)
+
+    // higher shift = slower/finer adjustments
+    const uint8_t shift = 9;  // ((255 << 7) >> 9) = 63 max
+    uint8_t steps;
+
+    steps = main2_dsm_lvl >> shift;
+    for (uint8_t i=0; i<=steps; i++)
+        GRADUAL_ADJUST_SIMPLE(main2, main2_dsm_lvl);
+
+    steps = led3_dsm_lvl  >> shift;
+    for (uint8_t i=0; i<=steps; i++)
+        GRADUAL_ADJUST_SIMPLE(led3,  led3_dsm_lvl );
+
+    steps = led4_dsm_lvl  >> shift;
+    for (uint8_t i=0; i<=steps; i++)
+        GRADUAL_ADJUST_SIMPLE(led4,  led4_dsm_lvl );
+
+    if ((main2 == main2_dsm_lvl)
+     && (led3  == led3_dsm_lvl )
+     && (led4  == led4_dsm_lvl )) {
+        return true;  // done
+    }
+    return false;  // not done yet
+}
+
+bool gradual_tick_main2(uint8_t gt) {
+    PWM_DATATYPE main2 = PWM_GET(pwm1_levels, gt);
+    return gradual_adjust(main2, 0, 0);
+}
+
+bool gradual_tick_led3(uint8_t gt) {
+    PWM_DATATYPE led3 = PWM_GET(pwm1_levels, gt);
+    return gradual_adjust(0, led3, 0);
+}
+
+bool gradual_tick_led4(uint8_t gt) {
+    PWM_DATATYPE led4 = PWM_GET(pwm1_levels, gt);
+    return gradual_adjust(0, 0, led4);
+}
+
+bool gradual_tick_all(uint8_t gt) {
+    PWM_DATATYPE pwm = PWM_GET(pwm1_levels, gt);
+    return gradual_adjust(pwm, pwm, pwm);
+}
+
+// 8/16/16 wiring, mix 16+16
+bool gradual_tick_led34a_blend(uint8_t gt) {
+    PWM_DATATYPE warm_PWM, cool_PWM;
+    PWM_DATATYPE brightness = PWM_GET(pwm1_levels, gt);
+    uint8_t blend = cfg.channel_mode_args[channel_mode];
+
+    calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, DSM_TOP, blend);
+
+    return gradual_adjust(0, warm_PWM, cool_PWM);
+}
+
+// 16/16/8 wiring, mix 16+8
+bool gradual_tick_led34b_blend(uint8_t gt) {
+    PWM_DATATYPE warm_PWM, cool_PWM;
+    PWM_DATATYPE brightness = PWM_GET(pwm1_levels, gt);
+    uint8_t blend = cfg.channel_mode_args[channel_mode];
+
+    calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, DSM_TOP, blend);
+
+    return gradual_adjust(cool_PWM, warm_PWM, 0);
+}
+
+bool gradual_tick_hsv(uint8_t gt) {
+    // figure out what exact PWM levels we're aiming for
+    RGB_t color;
+    uint8_t h = cfg.channel_mode_args[channel_mode];
+    uint8_t s = 255;  // TODO: drop saturation at brightest levels
+    PWM_DATATYPE v = PWM_GET(pwm1_levels, gt);
+    color = hsv2rgb(h, s, v);
+
+    return gradual_adjust(color.r, color.g, color.b);
+}
+
+bool gradual_tick_auto3(uint8_t gt) {
+    // figure out what exact PWM levels we're aiming for
+    PWM_DATATYPE red, warm, cool;
+    calc_auto_3ch_blend(&red, &warm, &cool, gt);
+    return gradual_adjust(cool, warm, red);
+}
+
diff --git a/hw/hank/emisar-d4k-3ch/hwdef.h b/hw/hank/emisar-d4k-3ch/hwdef.h
new file mode 100644
index 0000000..2e83fbe
--- /dev/null
+++ b/hw/hank/emisar-d4k-3ch/hwdef.h
@@ -0,0 +1,248 @@
+// Emisar D4K 3-channel hwdef
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+/*
+ * Pin / Name / Function
+ *   1    PA6   LED 4 PWM (linear) (PWM1B)
+ *   2    PA5   R: red aux LED (PWM0B)
+ *   3    PA4   G: green aux LED
+ *   4    PA3   B: blue aux LED
+ *   5    PA2   button LED
+ *   6    PA1   3rd LED opamp enable
+ *   7    PA0   4th LED opamp enable
+ *   8    GND   GND
+ *   9    VCC   VCC
+ *  10    PC5   (none)
+ *  11    PC4   (none)
+ *  12    PC3   RESET
+ *  13    PC2   (none)
+ *  14    PC1   SCK
+ *  15    PC0   main 2 LEDs PWM (linear) (PWM0A) (8-bit only)
+ *  16    PB3   3rd LED PWM (linear) (PWM1A)
+ *  17    PB2   MISO
+ *  18    PB1   MOSI / battery voltage (ADC6)
+ *  19    PB0   main 2 LEDs opamp enable
+ *  20    PA7   e-switch (PCINT7)
+ *      ADC12   thermal sensor
+ *
+ * PWM speed + resolution is dynamic on 2 channels,
+ * and 8-bit 16 kHz on 1 channel.
+ *
+ * Note: Some hardware might swap the wires at build time!
+ * It might be wired 8/16/16 (8-bit LEDs 1+2) or 16/16/8 (8-bit LED 4).
+ * So this code should support both wire layouts.
+ */
+
+#define ATTINY 1634
+#include <avr/io.h>
+
+#define HWDEF_C_FILE hwdef-emisar-d4k-3ch.c
+
+// allow using aux LEDs as extra channel modes
+#include "chan-rgbaux.h"
+
+// channel modes:
+// - 1. main 2 LEDs only (8/16/16 wiring) or LED 4 only (16/16/8)
+// - 2. 3rd LED only
+// - 3. 4th LED only (8/16/16 wiring) or main 2 LEDs only (16/16/8)
+// - 4. all 3 channels (equal amounts)
+// - 5. 2ch blend (3rd + 4th LEDs, 8/16/16 wiring)
+// - 6. 2ch blend (3rd + 4th LEDs, 16/16/8 wiring)
+// - 7. 3ch blend (HSV style)
+// - 8. 3ch auto blend (red-warm-cool style, led4-led3-main2)
+// - 9+. RGB aux (hidden)
+#define NUM_CHANNEL_MODES   (8 + NUM_RGB_AUX_CHANNEL_MODES)
+enum channel_modes_e {
+    CM_MAIN2 = 0,
+    CM_LED3,
+    CM_LED4,
+    CM_ALL,
+    CM_BLEND34A,  // 8 / [16+16]
+    CM_BLEND34B,  // 16 / [16+8]
+    CM_HSV,
+    CM_AUTO3,
+    RGB_AUX_ENUMS
+};
+
+#define CHANNEL_MODES_ENABLED 0b0000000000001111
+#define USE_CHANNEL_MODE_ARGS
+// _, _, _, _, 128=middle CCT, 128=middle CCT, 213=purple, _
+#define CHANNEL_MODE_ARGS 0,0,0,0,128,128,213,0,RGB_AUX_CM_ARGS
+#define USE_CUSTOM_CHANNEL_3H_MODES
+#define USE_CIRCULAR_TINT_3H
+
+// can use some of the common handlers
+#define USE_CALC_2CH_BLEND
+#define USE_HSV2RGB
+
+
+#define PWM_CHANNELS 1  // old, remove this
+
+#define PWM_BITS      16     // 0 to 16383 at variable Hz, not 0 to 255 at 16 kHz
+#define PWM_GET       PWM_GET16
+#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  // 15-bit PWM+DSM ramp
+
+// dynamic PWM
+#define PWM_TOP       ICR1   // holds the TOP value for for variable-resolution PWM
+#define PWM_TOP_INIT  255    // highest value used in top half of ramp
+#define PWM_CNT       TCNT1  // for checking / resetting phase
+#define PWM_CNT2      TCNT0  // 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     TIMER0_OVF_vect
+#define DSM_INTCTRL  TIMSK
+#define DSM_OVF_bm   (1<<TOIE0)
+
+#define DELAY_FACTOR 90  // less time in delay() because more time spent in interrupts
+
+// main 2 LEDs / 1st channel (2 LEDs)
+uint16_t main2_dsm_lvl;
+uint8_t main2_pwm, main2_dsm;
+#define MAIN2_PWM_PIN PC0
+#define MAIN2_PWM_LVL OCR0A   // OCR0A is the output compare register for PC0
+#define MAIN2_ENABLE_PIN  PB0    // Opamp power
+#define MAIN2_ENABLE_PORT PORTB  // control port for PB0
+
+// LED 3 / 2nd channel (1 LED)
+uint16_t led3_dsm_lvl;
+uint8_t led3_pwm, led3_dsm;
+#define LED3_PWM_PIN PB3
+#define LED3_PWM_LVL OCR1A   // OCR1A is the output compare register for PB3
+#define LED3_ENABLE_PIN  PA1    // Opamp power
+#define LED3_ENABLE_PORT PORTA  // control port for PA1
+
+// LED 4 / 3rd channel (1 LED)
+uint16_t led4_dsm_lvl;
+uint8_t led4_pwm, led4_dsm;
+#define LED4_PWM_PIN PA6
+#define LED4_PWM_LVL OCR1B  // OCR1B is the output compare register for PA6
+#define LED4_ENABLE_PIN  PA0    // Opamp power
+#define LED4_ENABLE_PORT PORTA  // control port for PA0
+
+// e-switch
+#ifndef SWITCH_PIN
+#define SWITCH_PIN   PA7     // pin 20
+#define SWITCH_PCINT PCINT7  // pin 20 pin change interrupt
+#define SWITCH_PCIE  PCIE0   // PCIE1 is for PCINT[7:0]
+#define SWITCH_PCMSK PCMSK0  // PCMSK1 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]
+#endif
+
+#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
+
+// this light has three aux LED channels: R, G, B
+#define USE_AUX_RGB_LEDS
+// the aux LEDs are front-facing, so turn them off while main LEDs are on
+// it also has an independent LED in the button
+#define USE_BUTTON_LED
+
+
+inline void hwdef_setup() {
+    // enable output ports
+    DDRC = (1 << MAIN2_PWM_PIN);
+    DDRB = (1 << LED3_PWM_PIN)
+         | (1 << MAIN2_ENABLE_PIN)
+         ;
+    DDRA = (1 << LED4_PWM_PIN)
+         | (1 << LED4_ENABLE_PIN)
+         | (1 << LED3_ENABLE_PIN)
+         | (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
+    // Linear opamp PWM for both 16-bit 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)  | (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;
+
+    // 8-bit PWM channel (LEDs 1+2 or LED 4)
+    // WGM0[2:0]: 0,0,1: PWM, Phase Correct, 8-bit (DS table 11-8)
+    // CS0[2:0]:  0,0,1: clk/1 (No prescaling) (DS table 11-9)
+    // COM0A[1:0]:  1,0: PWM OC0A in the normal direction (DS table 11-4)
+    // COM0B[1:0]:  1,0: PWM OC0B in the normal direction (DS table 11-7)
+    TCCR0A  = (0<<WGM01)  | (1<<WGM00)   // 8-bit (TOP=0xFF) (DS table 11-8)
+            | (1<<COM0A1) | (0<<COM0A0)  // PWM 0A in normal direction (DS table 11-4)
+            //| (1<<COM0B1) | (0<<COM0B0)  // PWM 0B in normal direction (DS table 11-7)
+            ;
+    TCCR0B  = (0<<CS02)   | (0<<CS01) | (1<<CS00)  // clk/1 (no prescaling) (DS table 11-9)
+            | (0<<WGM02)  // phase-correct PWM (DS table 11-8)
+            ;
+
+    // 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
+}
+
+
+#define LAYOUT_DEFINED
+