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

2 files changed, 0 insertions, 273 deletions

diff --git a/hw/hank/noctigon-k1-sbt90/anduril.h b/hw/hank/noctigon-k1-sbt90/anduril.h
deleted file mode 100644
index 71541e0..0000000
--- a/hw/hank/noctigon-k1-sbt90/anduril.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Noctigon K1-SBT90.2 config options for Anduril
-// Copyright (C) 2019-2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-// (is a K1 host with a KR4-like driver and a really high-powered LED)
-#define MODEL_NUMBER "0252"
-#include "hank/noctigon-k1-sbt90/hwdef.h"
-#include "hank/anduril.h"
-// ATTINY: 1634
-
-// this light can safely run a bit hotter than most
-#undef DEFAULT_THERM_CEIL
-#define DEFAULT_THERM_CEIL 55
-
-// this light has three aux LED channels: R, G, B
-#define USE_AUX_RGB_LEDS
-#define USE_AUX_RGB_LEDS_WHILE_ON  10
-#define USE_INDICATOR_LED_WHILE_RAMPING
-
-
-// brightness:
-// 0/1023: 0.35 lm
-// 1/1023: 2.56 lm
-// max regulated: 1740 lm
-// FET: ~3700 lm
-#define RAMP_SIZE 150
-// FIXME: it should probably have max_regulated at 120, not 130
-// ramp copied from noctigon-kr4
-// nice low lows, but might have visible ripple on some lights:
-// maxreg at 130, dynamic PWM: level_calc.py 5.01 2 149 7135 1 0.3 1740 FET 1 10 3190 --pwm dyn:64:16384:255
-// (plus one extra level at the beginning for moon)
-#define PWM1_LEVELS  0,1,1,2,2,3,4,5,6,7,8,9,11,12,14,16,17,19,22,24,26,29,31,34,37,40,43,46,49,53,56,60,63,67,71,74,78,82,86,89,93,96,99,103,105,108,110,112,114,115,116,116,115,114,112,109,106,101,95,89,81,71,60,48,34,19,20,21,22,23,24,26,27,28,30,31,32,34,36,37,39,41,43,45,47,49,51,53,56,58,61,63,66,69,72,75,78,81,84,88,91,95,99,103,107,111,115,119,124,129,133,138,143,149,154,159,165,171,177,183,189,196,203,210,217,224,231,239,247,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,0
-#define PWM2_LEVELS  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,20,30,41,52,63,75,87,99,112,125,138,151,165,179,194,208,224,239,255
-#define PWM_TOPS     16383,16383,11750,14690,9183,12439,13615,13955,13877,13560,13093,12529,13291,12513,12756,12769,11893,11747,12085,11725,11329,11316,10851,10713,10518,10282,10016,9729,9428,9298,8971,8794,8459,8257,8043,7715,7497,7275,7052,6753,6538,6260,5994,5798,5501,5271,5006,4758,4525,4268,4030,3775,3508,3263,3010,2752,2517,2256,1998,1763,1512,1249,994,749,497,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,255,255,255,255,255,255,255,255,255,255,255,255,255,255
-#define MIN_THERM_STEPDOWN 66  // should be above highest dyn_pwm level
-
-#define MAX_1x7135 130
-#define DEFAULT_LEVEL 50
-#define HALFSPEED_LEVEL 12
-#define QUARTERSPEED_LEVEL 4
-
-#if 0  // original 10-bit ramp
-// maxreg at 130: level_calc.py cube 2 150 7135 0 2.5 1740 FET 1 10 2565
-// maxreg at 120: level_calc.py cube 2 150 7135 0 2.5 1740 FET 1 10 3190
-#define PWM1_LEVELS 0,0,1,1,2,2,3,3,4,4,5,6,7,8,9,10,11,13,14,15,17,19,20,22,24,26,28,30,33,35,38,40,43,46,49,52,55,59,62,66,70,74,78,82,86,91,96,100,105,111,116,121,127,133,139,145,151,158,165,172,179,186,193,201,209,217,225,234,243,251,261,270,280,289,299,310,320,331,342,353,364,376,388,400,412,425,438,451,464,478,492,506,521,536,551,566,582,597,614,630,647,664,681,699,717,735,754,772,792,811,831,851,871,892,913,935,956,978,1001,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,0
-#define PWM2_LEVELS 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,51,79,109,138,168,198,229,260,292,324,357,390,423,457,492,527,562,598,634,671,708,746,784,822,861,901,941,982,1023
-#define DEFAULT_LEVEL 46
-#define MAX_1x7135 120
-#define HALFSPEED_LEVEL 10
-#define QUARTERSPEED_LEVEL 2
-#endif
-
-#define RAMP_SMOOTH_FLOOR 11  // low levels may be unreliable
-#define RAMP_SMOOTH_CEIL  130
-// 11 30 [50] 70 90 110 [130]
-#define RAMP_DISCRETE_FLOOR 11
-#define RAMP_DISCRETE_CEIL  RAMP_SMOOTH_CEIL
-#define RAMP_DISCRETE_STEPS 7
-
-// safe limit ~33% power
-#define SIMPLE_UI_FLOOR RAMP_DISCRETE_FLOOR
-#define SIMPLE_UI_CEIL 120
-#define SIMPLE_UI_STEPS 5
-
-// stop panicking at ~40% power or ~1700 lm
-#define THERM_FASTER_LEVEL 130
-//#define THERM_NEXT_WARNING_THRESHOLD 16  // accumulate less error before adjusting
-//#define THERM_RESPONSE_MAGNITUDE 128  // bigger adjustments
-
-#define THERM_CAL_OFFSET 5
-
-// the power regulator is a bit slow, so push it harder for a quick response from off
-// (unsure if necessary, copied from noctigon-kr4)
-//#define DEFAULT_JUMP_START_LEVEL 21
-//#define BLINK_BRIGHTNESS DEFAULT_LEVEL
-//#define BLINK_ONCE_TIME 12
-
-// there is usually no lighted button, so
-// blink numbers on the main LEDs by default (but allow user to change it)
-#define DEFAULT_BLINK_CHANNEL  CM_MAIN
-
-// normal party strobe speed; this driver can pulse very quickly due to its DD FET
-//#define PARTY_STROBE_ONTIME 2
-
-// the default of 26 looks a bit rough, so increase it to make it smoother
-#define CANDLE_AMPLITUDE 33
-
-// don't blink while ramping
-#ifdef BLINK_AT_RAMP_MIDDLE
-#undef BLINK_AT_RAMP_MIDDLE
-#endif
-
-// for compatibility with other models
-#define USE_SOFT_FACTORY_RESET
-
diff --git a/hw/hank/noctigon-k1-sbt90/hwdef.h b/hw/hank/noctigon-k1-sbt90/hwdef.h
deleted file mode 100644
index bdea32d..0000000
--- a/hw/hank/noctigon-k1-sbt90/hwdef.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// Noctigon K1-SBT90.2 driver layout (attiny1634)
-// Copyright (C) 2019-2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-/*
- * (mostly the same as KR4 driver)
- *
- * Pin / Name / Function
- *   1    PA6   FET PWM (direct drive) (PWM1B)
- *   2    PA5   R: red aux LED (PWM0B)
- *   3    PA4   G: green aux LED
- *   4    PA3   B: blue aux LED
- *   5    PA2   (none)
- *   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   (none) PWM0A
- *  16    PB3   main LED PWM (linear) (PWM1A)
- *  17    PB2   MISO / e-switch (PCINT10)
- *  18    PB1   MOSI / battery voltage (ADC6)
- *  19    PB0   Opamp power
- *  20    PA7   (none)
- *      ADC12   thermal sensor
- *
- * Main LED power uses one pin to turn the Opamp on/off,
- * and one pin to control Opamp power level.
- * Main 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.
- * Also has a direct-drive FET for turbo.
- */
-
-#define ATTINY 1634
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
-
-// allow using aux LEDs as extra channel modes
-#include "fsm/chan-rgbaux.h"
-
-// channel modes:
-// * 0. linear + DD FET stacked
-// * 1+. aux RGB
-#define NUM_CHANNEL_MODES   (1 + NUM_RGB_AUX_CHANNEL_MODES)
-enum CHANNEL_MODES {
-    CM_MAIN = 0,
-    RGB_AUX_ENUMS
-};
-
-#define DEFAULT_CHANNEL_MODE  CM_MAIN
-
-// right-most bit first, modes are in fedcba9876543210 order
-#define CHANNEL_MODES_ENABLED 0b0000000000000001
-// no args
-//#define USE_CHANNEL_MODE_ARGS
-//#define CHANNEL_MODE_ARGS     0,0,0,0,0,0,0,0
-
-
-#define PWM_CHANNELS 2  // old, remove this
-
-#define PWM_BITS      16        // dynamic 16-bit, but never goes over 255
-#define PWM_GET       PWM_GET8
-#define PWM_DATATYPE  uint16_t  // is used for PWM_TOPS (which goes way over 255)
-#define PWM_DATATYPE2 uint16_t  // only needs 32-bit if ramp values go over 255
-#define PWM1_DATATYPE uint8_t   // linear ramp
-#define PWM2_DATATYPE uint8_t   // DD FET ramp
-
-// PWM parameters of both channels are tied together because they share a counter
-#define PWM_TOP       ICR1   // holds the TOP value for variable-resolution PWM
-#define PWM_TOP_INIT  255    // highest value used in top half of ramp
-#define PWM_CNT       TCNT1  // for dynamic PWM, reset phase
-
-// linear channel
-#define CH1_PIN  PB3            // pin 16, Opamp reference
-#define CH1_PWM  OCR1A          // OCR1A is the output compare register for PB3
-#define CH1_ENABLE_PIN   PB0    // pin 19, Opamp power
-#define CH1_ENABLE_PORT  PORTB  // control port for PB0
-
-// DD FET channel
-#define CH2_PIN  PA6            // pin 1, DD FET PWM
-#define CH2_PWM  OCR1B          // OCR1B is the output compare register for PA6
-
-// e-switch
-#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]
-
-#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
-
-// TODO: calibrate this
-// 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
-
-#define TEMP_CHANNEL 0b00001111
-
-// 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
-
-inline void hwdef_setup() {
-    // enable output ports
-    // Opamp level and Opamp on/off
-    DDRB = (1 << CH1_PIN)
-         | (1 << CH1_ENABLE_PIN);
-    // DD FET PWM, aux R/G/B
-    DDRA = (1 << CH2_PIN)
-         | (1 << AUXLED_R_PIN)
-         | (1 << AUXLED_G_PIN)
-         | (1 << AUXLED_B_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]:    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)  | (0<<WGM12)  // phase-correct adjustable PWM (DS table 12-5)
-            ;
-
-    // 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
-