merged multi-channel branch with a major refactor and half a year of updates

1 files changed, 362 insertions, 0 deletions

diff --git a/hwdef-emisar-d4k-3ch.c b/hwdef-emisar-d4k-3ch.c
new file mode 100644
index 0000000..e35af08
--- /dev/null
+++ b/hwdef-emisar-d4k-3ch.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);
+}
+