aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelene ToyKeeper2023-08-24 17:12:49 -0600
committerSelene ToyKeeper2023-08-24 17:12:49 -0600
commit2196969167efc5298277f53f0ce7103ee6630dad (patch)
tree747b9209d3da49d30ff9497e2704b16ef431c937
parentadded channel mode per strobe mode, and made FSM channel mode more flexible, (diff)
downloadanduril-2196969167efc5298277f53f0ce7103ee6630dad.tar.gz
anduril-2196969167efc5298277f53f0ce7103ee6630dad.tar.bz2
anduril-2196969167efc5298277f53f0ce7103ee6630dad.zip
added emisar-d4k-3ch build
-rw-r--r--hwdef-emisar-d4k-3ch.c421
-rw-r--r--hwdef-emisar-d4k-3ch.h230
-rw-r--r--spaghetti-monster/anduril/cfg-emisar-d4k-3ch.h106
3 files changed, 757 insertions, 0 deletions
diff --git a/hwdef-emisar-d4k-3ch.c b/hwdef-emisar-d4k-3ch.c
new file mode 100644
index 0000000..1042d9e
--- /dev/null
+++ b/hwdef-emisar-d4k-3ch.c
@@ -0,0 +1,421 @@
+// Emisar D4K 3-channel hwdef
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+#include "chan-rgbaux.c"
+
+
+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
+};
+
+
+// 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) {
+ if (level == 0) {
+ MAIN2_PWM_LVL = 0;
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ } else {
+ level --;
+ MAIN2_ENABLE_PORT |= (1 << MAIN2_ENABLE_PIN);
+ MAIN2_PWM_LVL = PWM_GET8(pwm1_levels, level);
+ }
+}
+
+// LED 3 is 16-bit
+void set_level_led3(uint8_t level) {
+ if (level == 0) {
+ LED3_PWM_LVL = 0;
+ PWM_CNT = 0;
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ } else {
+ level --;
+ LED3_ENABLE_PORT |= (1 << LED3_ENABLE_PIN);
+ LED3_PWM_LVL = PWM_GET16(pwm2_levels, level);
+ uint16_t top = PWM_GET16(pwm_tops, level);
+ while(actual_level && (PWM_CNT > (top - 32))) {}
+ PWM_TOP = top;
+ if (! actual_level) PWM_CNT = 0;
+ }
+}
+
+// this 16-bit channel may be LED 4 or LEDs 1+2, depending on wiring
+void set_level_led4(uint8_t level) {
+ if (level == 0) {
+ LED4_PWM_LVL = 0;
+ PWM_CNT = 0; // reset phase
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ } else {
+ level --; // PWM array index = level - 1
+ // gotta turn on the opamp before light can come out
+ LED4_ENABLE_PORT |= (1 << LED4_ENABLE_PIN);
+ LED4_PWM_LVL = PWM_GET16(pwm2_levels, level);
+ // pulse frequency modulation, a.k.a. dynamic PWM
+ uint16_t top = PWM_GET16(pwm_tops, level);
+ // wait to sync the counter and avoid flashes
+ while(actual_level && (PWM_CNT > (top - 32))) {}
+ PWM_TOP = top;
+ // force reset phase when turning on from zero
+ // (because otherwise the initial response is inconsistent)
+ if (! actual_level) PWM_CNT = 0;
+ }
+}
+
+void set_level_all(uint8_t level) {
+ if (level == 0) {
+ MAIN2_PWM_LVL = 0;
+ LED3_PWM_LVL = 0;
+ LED4_PWM_LVL = 0;
+ PWM_CNT = 0;
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ return;
+ }
+
+ level --;
+
+ MAIN2_ENABLE_PORT |= (1 << MAIN2_ENABLE_PIN);
+ LED3_ENABLE_PORT |= (1 << LED3_ENABLE_PIN );
+ LED4_ENABLE_PORT |= (1 << LED4_ENABLE_PIN );
+ // FIXME? It might be better to calculate the 8-bit value from the
+ // 16-bit tables instead of using the 8-bit ramp
+ // 8bit = max(1, 16bit * 255 / top)
+ MAIN2_PWM_LVL = PWM_GET8 (pwm1_levels, level);
+ LED3_PWM_LVL = PWM_GET16(pwm2_levels, level);
+ LED4_PWM_LVL = PWM_GET16(pwm2_levels, level);
+ uint16_t top = PWM_GET16(pwm_tops, level);
+ while(actual_level && (PWM_CNT > (top - 32))) {}
+ PWM_TOP = top;
+ if (! actual_level) PWM_CNT = 0;
+}
+
+// 8/16/16 wiring, mix 16+16
+void set_level_led34a_blend(uint8_t level) {
+ if (level == 0) {
+ LED3_PWM_LVL = 0;
+ LED4_PWM_LVL = 0;
+ PWM_CNT = 0; // reset phase
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ return;
+ }
+
+ level --; // PWM array index = level - 1
+
+ PWM_DATATYPE warm_PWM, cool_PWM;
+ PWM_DATATYPE brightness = PWM_GET16(pwm2_levels, level);
+ PWM_DATATYPE top = PWM_GET16(pwm_tops, level);
+ uint8_t blend = cfg.channel_mode_args[channel_mode];
+
+ calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, top, blend);
+
+ if (warm_PWM > 0) LED3_ENABLE_PORT |= (1 << LED3_ENABLE_PIN);
+ if (cool_PWM > 0) LED4_ENABLE_PORT |= (1 << LED4_ENABLE_PIN);
+ LED3_PWM_LVL = warm_PWM;
+ LED4_PWM_LVL = cool_PWM;
+ while(actual_level && (PWM_CNT > (top - 32))) {}
+ PWM_TOP = top;
+ if (! actual_level) PWM_CNT = 0;
+}
+
+// 16/16/8 wiring, mix 16+8
+void set_level_led34b_blend(uint8_t level) {
+ if (level == 0) {
+ LED3_PWM_LVL = 0;
+ LED4_PWM_LVL = 0;
+ PWM_CNT = 0; // reset phase
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ return;
+ }
+
+ level --;
+
+ const uint16_t top = 2047;
+ uint16_t warm_PWM, cool_PWM; // 11 bits, 8 bits
+ uint8_t blend = cfg.channel_mode_args[channel_mode];
+ uint16_t brightness = PWM_GET8(pwm1_levels, level);
+
+ if (0 == brightness) brightness = 1;
+ brightness = brightness << 3;
+
+ calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, top, blend);
+
+ // adjust to halfway between 8-bit steps
+ warm_PWM -= 4;
+ if (warm_PWM > top) warm_PWM = 0;
+
+ if (cool_PWM > 0) MAIN2_ENABLE_PORT |= (1 << MAIN2_ENABLE_PIN);
+ if (warm_PWM > 0) LED3_ENABLE_PORT |= (1 << LED3_ENABLE_PIN);
+ MAIN2_PWM_LVL = (uint8_t)(cool_PWM >> 3);
+ LED3_PWM_LVL = warm_PWM;
+ //while(actual_level && (PWM_CNT > (top - 32))) {}
+ PWM_TOP = top;
+ if (! actual_level) PWM_CNT = 0;
+}
+
+void set_level_hsv(uint8_t level) {
+ // TODO: implement a custom 3H handler which wraps around 0 to 255
+ if (level == 0) {
+ MAIN2_PWM_LVL = 0;
+ LED3_PWM_LVL = 0;
+ LED4_PWM_LVL = 0;
+ PWM_CNT = 0;
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ return;
+ }
+
+ level --;
+
+ RGB_t color;
+ uint8_t h = cfg.channel_mode_args[channel_mode];
+ uint8_t s = 255; // TODO: drop saturation at brightest levels
+ uint8_t v = PWM_GET8(pwm1_levels, level);
+ color = hsv2rgb(h, s, v);
+
+ if (color.r > 0) MAIN2_ENABLE_PORT |= (1 << MAIN2_ENABLE_PIN);
+ if (color.g > 0) LED3_ENABLE_PORT |= (1 << LED3_ENABLE_PIN );
+ if (color.b > 0) LED4_ENABLE_PORT |= (1 << LED4_ENABLE_PIN );
+ MAIN2_PWM_LVL = color.r;
+ LED3_PWM_LVL = color.g;
+ LED4_PWM_LVL = color.b;
+ //while(actual_level && (PWM_CNT > (255 - 32))) {}
+ PWM_TOP = 255;
+ if (! actual_level) PWM_CNT = 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(
+ uint16_t *a, // red
+ uint16_t *b, // warm
+ uint8_t *c, // cool
+ uint8_t level) {
+
+ // led4=red, led3=warm
+ uint16_t vpwm = PWM_GET16(pwm2_levels, level);
+ // main2=white, 8-bit
+ uint8_t vpwm8 = PWM_GET8 (pwm1_levels, level);
+
+ // tint goes from 0 (red) to 127 (warm white) to 255 (cool white)
+ uint8_t mytint;
+ mytint = 255 * (uint16_t)level / RAMP_SIZE;
+
+ // 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)(255 - mytint)
+ * (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) + 127) / 255;
+ // cool white is low at 0, high at 255 (linear)
+ *c = (uint8_t)(
+ (((PWM_DATATYPE2)mytint
+ * (PWM_DATATYPE2)vpwm8) + 127) / 255
+ );
+
+}
+
+// 3-channel "auto tint" channel mode
+void set_level_auto3(uint8_t level) {
+ if (level == 0) {
+ MAIN2_PWM_LVL = 0;
+ LED3_PWM_LVL = 0;
+ LED4_PWM_LVL = 0;
+ PWM_CNT = 0;
+ MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN); // turn off opamp
+ LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN ); // turn off opamp
+ LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN ); // turn off opamp
+ return;
+ }
+
+ level --;
+
+ uint16_t a, b;
+ uint8_t c;
+ calc_auto_3ch_blend(&a, &b, &c, level);
+
+ // pulse frequency modulation, a.k.a. dynamic PWM
+ uint16_t top = PWM_GET(pwm_tops, level);
+
+ if (a > 0) LED4_ENABLE_PORT |= (1 << LED4_ENABLE_PIN );
+ else LED4_ENABLE_PORT &= ~(1 << LED4_ENABLE_PIN );
+ if (b > 0) LED3_ENABLE_PORT |= (1 << LED3_ENABLE_PIN );
+ else LED3_ENABLE_PORT &= ~(1 << LED3_ENABLE_PIN );
+ if (c > 0) MAIN2_ENABLE_PORT |= (1 << MAIN2_ENABLE_PIN);
+ else MAIN2_ENABLE_PORT &= ~(1 << MAIN2_ENABLE_PIN);
+
+ LED4_PWM_LVL = a; // red
+ LED3_PWM_LVL = b; // warm
+ MAIN2_PWM_LVL = c; // cool
+
+ while(actual_level && (PWM_CNT > (255 - 32))) {}
+ PWM_TOP = top;
+ if (! actual_level) PWM_CNT = 0;
+}
+
+///// "gradual tick" functions for smooth thermal regulation /////
+
+bool gradual_adjust(uint8_t main2, uint16_t led3, uint16_t led4) {
+ GRADUAL_ADJUST_SIMPLE(main2, MAIN2_PWM_LVL);
+ GRADUAL_ADJUST_SIMPLE(led3, LED3_PWM_LVL );
+ GRADUAL_ADJUST_SIMPLE(led4, LED4_PWM_LVL );
+
+ if ((main2 == MAIN2_PWM_LVL)
+ && (led3 == LED3_PWM_LVL )
+ && (led4 == LED4_PWM_LVL )) {
+ return true; // done
+ }
+ return false; // not done yet
+}
+
+bool gradual_tick_main2(uint8_t gt) {
+ uint8_t main2 = PWM_GET8(pwm1_levels, gt);
+ return gradual_adjust(main2, 0, 0);
+}
+
+bool gradual_tick_led3(uint8_t gt) {
+ uint16_t led3 = PWM_GET16(pwm2_levels, gt);
+ return gradual_adjust(0, led3, 0);
+}
+
+bool gradual_tick_led4(uint8_t gt) {
+ uint16_t led4 = PWM_GET16(pwm2_levels, gt);
+ return gradual_adjust(0, 0, led4);
+}
+
+bool gradual_tick_all(uint8_t gt) {
+ uint8_t main2 = PWM_GET8 (pwm1_levels, gt);
+ uint16_t led3 = PWM_GET16(pwm2_levels, gt);
+ uint16_t led4 = PWM_GET16(pwm2_levels, gt);
+ return gradual_adjust(main2, led3, led4);
+}
+
+// 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_GET16(pwm2_levels, gt);
+ PWM_DATATYPE top = PWM_GET16(pwm_tops, gt);
+ uint8_t blend = cfg.channel_mode_args[channel_mode];
+
+ calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, 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) {
+ const uint16_t top = 2047;
+ uint16_t warm_PWM, cool_PWM; // 11 bits, 8 bits
+ uint8_t blend = cfg.channel_mode_args[channel_mode];
+ uint16_t brightness = PWM_GET8(pwm1_levels, gt);
+
+ if (0 == brightness) brightness = 1;
+ brightness = brightness << 3;
+
+ calc_2ch_blend(&warm_PWM, &cool_PWM, brightness, top, blend);
+
+ // adjust to halfway between 8-bit steps
+ warm_PWM -= 4;
+ if (warm_PWM > top) warm_PWM = 0;
+
+ // convert to 8-bit
+ cool_PWM = (uint8_t)(cool_PWM >> 3);
+
+ 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
+ uint8_t v = PWM_GET8(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
+ uint16_t red, warm;
+ uint8_t cool;
+ calc_auto_3ch_blend(&red, &warm, &cool, gt);
+ return gradual_adjust(cool, warm, red);
+}
+
diff --git a/hwdef-emisar-d4k-3ch.h b/hwdef-emisar-d4k-3ch.h
new file mode 100644
index 0000000..4a3134e
--- /dev/null
+++ b/hwdef-emisar-d4k-3ch.h
@@ -0,0 +1,230 @@
+// 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
+ *
+ * All 3 channels share a single Opamp enable pin,
+ * but have individual PWM controls.
+ * 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 0b0000000000011111
+#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
+
+// 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 uint8_t // 8-bit PWM on main2
+#define PWM2_DATATYPE uint16_t // dynamic PWM on led3 + led4
+
+// dynamic PWM
+#define PWM_TOP ICR1 // holds the TOP value for for variable-resolution PWM
+#define PWM_TOP_INIT 511 // highest value used in top half of ramp
+#define PWM_CNT TCNT1 // for dynamic PWM, reset phase
+
+// main 2 LEDs / 1st channel (2 LEDs)
+#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)
+#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)
+// 8-bit PWM only on OCR0A :(
+#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)
+ ;
+
+ // 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 PWM resolution
+ PWM_TOP = PWM_TOP_INIT;
+
+ // 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
+
diff --git a/spaghetti-monster/anduril/cfg-emisar-d4k-3ch.h b/spaghetti-monster/anduril/cfg-emisar-d4k-3ch.h
new file mode 100644
index 0000000..46d5796
--- /dev/null
+++ b/spaghetti-monster/anduril/cfg-emisar-d4k-3ch.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 20
+#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_MAIN2
+
+#define FACTORY_RESET_WARN_CHANNEL CM_LED4
+#define FACTORY_RESET_SUCCESS_CHANNEL CM_MAIN2
+
+#define USE_CONFIG_COLORS
+#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
+// level_calc.py 5.01 1 150 7135 1 0.2 2000 --pwm dyn:69:16383:511
+// 8-bit PWM
+#define PWM1_LEVELS 0,1,1,2,2,2,2,3,3,3,3,4,4,5,5,6,6,6,7,8,8,9,9,10,10,11,12,13,13,14,15,16,16,17,18,19,20,21,22,23,23,24,26,27,28,29,30,31,32,33,34,36,37,38,39,41,42,43,45,46,47,49,50,52,53,55,56,58,59,61,62,64,66,67,69,71,72,74,76,78,80,81,83,85,87,89,91,93,95,97,99,101,103,105,107,109,111,113,116,118,120,122,125,127,129,132,134,136,139,141,144,146,148,151,154,156,159,161,164,166,169,172,174,177,180,183,185,188,191,194,197,200,203,205,208,211,214,217,220,223,226,230,233,236,239,242,245,249,252,255
+// dynamic PWM
+#define PWM2_LEVELS 0,1,1,2,2,2,3,4,4,5,6,6,7,8,9,10,11,13,14,15,17,18,20,21,23,25,27,29,31,33,35,38,40,42,45,47,50,52,55,57,60,62,65,67,70,72,74,76,78,79,81,82,83,84,84,85,84,84,82,81,78,76,72,68,63,58,51,44,35,26,27,29,30,32,33,35,37,38,40,42,44,46,48,50,53,55,57,60,63,65,68,71,74,77,80,83,87,90,94,98,102,106,110,114,118,123,128,132,137,142,148,153,159,164,170,176,183,189,196,202,209,216,224,231,239,247,255,263,272,281,290,299,309,318,328,339,349,360,371,382,394,406,418,430,443,456,469,483,497,511
+#define PWM_TOPS 16383,13662,10727,15413,11905,8157,12776,14730,12250,13437,13990,11928,12275,12360,12270,12060,11765,12450,11970,11470,11698,11138,11181,10600,10534,10404,10226,10014,9776,9519,9248,9220,8919,8617,8512,8203,8066,7760,7605,7308,7144,6860,6693,6426,6260,6009,5769,5539,5320,5046,4851,4607,4378,4163,3914,3727,3468,3268,3008,2803,2548,2345,2099,1874,1642,1430,1189,970,728,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511
+#define MIN_THERM_STEPDOWN 70 // should be above highest dyn_pwm level
+#define DEFAULT_LEVEL 70
+#define MAX_1x7135 70
+#define HALFSPEED_LEVEL 10
+#define QUARTERSPEED_LEVEL 4
+
+//#define DEFAULT_MANUAL_MEMORY DEFAULT_LEVEL
+//#define DEFAULT_MANUAL_MEMORY_TIMER 10
+
+#define RAMP_SMOOTH_FLOOR 10
+#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 highest regulated power (no FET or turbo)
+#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
+
+// 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
+