moved variant builds under their parent, like "d4-219" -> "d4/219"

2 files changed, 0 insertions, 126 deletions

diff --git a/hw/hank/noctigon-kr4-nofet/anduril.h b/hw/hank/noctigon-kr4-nofet/anduril.h
deleted file mode 100644
index 0198e33..0000000
--- a/hw/hank/noctigon-kr4-nofet/anduril.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Noctigon KR4 (no DD FET) config options for Anduril
-// Copyright (C) 2020-2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-// (and Noctigon KR1)
-// (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
-#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
-#include "hank/noctigon-kr4/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0212"
-// ATTINY: 1634
-
-// brightness w/ SST-20 4000K LEDs:
-// 0/1023: 0.35 lm
-// 1/1023: 2.56 lm
-// max regulated: 1740 lm
-#undef PWM_CHANNELS
-#define PWM_CHANNELS 1
-#define RAMP_SIZE 150
-// prioritize low lows, at risk of visible ripple
-// level_calc.py 5.01 1 149 7135 1 0.3 1740 --pwm dyn:78:16384:255
-#undef PWM1_LEVELS
-#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
-#undef PWM2_LEVELS
-#undef PWM_TOPS
-#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
-#undef DEFAULT_LEVEL
-#define DEFAULT_LEVEL 50
-#undef MAX_1x7135
-#define MAX_1x7135 150
-
-#undef RAMP_SMOOTH_FLOOR
-#undef RAMP_SMOOTH_CEIL
-#undef RAMP_DISCRETE_FLOOR
-#undef RAMP_DISCRETE_CEIL
-#undef RAMP_DISCRETE_STEPS
-
-#define RAMP_SMOOTH_FLOOR 11  // low levels may be unreliable
-#define RAMP_SMOOTH_CEIL  130
-// 11, 30, [50], 70, 90, 110, 130  (plus [150] on turbo)
-#define RAMP_DISCRETE_FLOOR 11
-#define RAMP_DISCRETE_CEIL  RAMP_SMOOTH_CEIL
-#define RAMP_DISCRETE_STEPS 7
-
-// safe limit ~1000 lm (can sustain 900 lm)
-#undef SIMPLE_UI_FLOOR
-#undef SIMPLE_UI_CEIL
-#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR
-#define SIMPLE_UI_CEIL RAMP_DISCRETE_CEIL
-
-
-// slow down party strobe; this driver can't pulse for 1ms or less
-// (only needed on no-FET build)
-#define PARTY_STROBE_ONTIME 2
-
-// jump start a bit higher than base driver
-#undef DEFAULT_JUMP_START_LEVEL
-#define DEFAULT_JUMP_START_LEVEL 25
-
-// stop panicking at ~1300 lm
-#undef THERM_FASTER_LEVEL
-#define THERM_FASTER_LEVEL 140
-#undef MIN_THERM_STEPDOWN
-#define MIN_THERM_STEPDOWN 80  // must be > end of dynamic PWM range
-
diff --git a/hw/hank/noctigon-kr4-nofet/hwdef.c b/hw/hank/noctigon-kr4-nofet/hwdef.c
deleted file mode 100644
index 783eeed..0000000
--- a/hw/hank/noctigon-kr4-nofet/hwdef.c
+++ /dev/null
@@ -1,60 +0,0 @@
-// Noctigon KR4 (no DD FET) PWM helper functions
-// Copyright (C) 2020-2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "fsm/chan-rgbaux.c"
-
-void set_level_zero();
-
-void set_level_main(uint8_t level);
-bool gradual_tick_main(uint8_t gt);
-
-
-Channel channels[] = {
-    { // channel 1 only
-        .set_level    = set_level_main,
-        .gradual_tick = gradual_tick_main
-    },
-    RGB_AUX_CHANNELS
-};
-
-
-void set_level_zero() {
-    CH1_PWM = 0;
-    CH2_PWM = 0;
-    PWM_CNT = 0;  // reset phase
-    CH1_ENABLE_PORT &= ~(1 << CH1_ENABLE_PIN);  // disable opamp
-}
-
-// single set of LEDs with linear power channel
-void set_level_main(uint8_t level) {
-    CH1_ENABLE_PORT |= (1 << CH1_ENABLE_PIN);  // enable opamp
-
-    PWM_DATATYPE ch1_pwm = PWM_GET(pwm1_levels, level);
-    // pulse frequency modulation, a.k.a. dynamic PWM
-    uint16_t top = PWM_GET16(pwm_tops, level);
-
-    CH1_PWM = ch1_pwm;
-    CH2_PWM = 0;
-    // 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;
-}
-
-bool gradual_tick_main(uint8_t gt) {
-    PWM_DATATYPE pwm1 = PWM_GET(pwm1_levels, gt);
-
-    GRADUAL_ADJUST_SIMPLE(pwm1, CH1_PWM);
-
-    if (   (pwm1 == CH1_PWM)
-       ) {
-        return true;  // done
-    }
-    return false;  // not done yet
-}
-