diff options
| author | Selene ToyKeeper | 2023-11-03 10:53:34 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2023-11-03 10:53:34 -0600 |
| commit | c798ab3e78d4ca857c9aa6dc283176df1769becd (patch) | |
| tree | a880468721171db1ace5b8e968fe29480b694466 /hw/hank | |
| parent | moved variant builds under their parent, like "d4-219" -> "d4/219" (diff) | |
| download | anduril-c798ab3e78d4ca857c9aa6dc283176df1769becd.tar.gz anduril-c798ab3e78d4ca857c9aa6dc283176df1769becd.tar.bz2 anduril-c798ab3e78d4ca857c9aa6dc283176df1769becd.zip | |
moved ATTINY and MODEL_NUMBER into $target/arch and $target/model,
and updated other scripts and files accordingly
Diffstat (limited to 'hw/hank')
98 files changed, 47 insertions, 101 deletions
diff --git a/hw/hank/emisar-2ch/anduril.h b/hw/hank/emisar-2ch/anduril.h index 2e87151..4693cb1 100644 --- a/hw/hank/emisar-2ch/anduril.h +++ b/hw/hank/emisar-2ch/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0135" #include "hank/emisar-2ch/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/emisar-2ch/arch b/hw/hank/emisar-2ch/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/emisar-2ch/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/emisar-2ch/fet/anduril.h b/hw/hank/emisar-2ch/fet/anduril.h index 3a9e513..a1d8794 100644 --- a/hw/hank/emisar-2ch/fet/anduril.h +++ b/hw/hank/emisar-2ch/fet/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0136" #include "hank/emisar-2ch/fet/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/emisar-2ch/fet/hwdef.h b/hw/hank/emisar-2ch/fet/hwdef.h index 1569d41..0778e10 100644 --- a/hw/hank/emisar-2ch/fet/hwdef.h +++ b/hw/hank/emisar-2ch/fet/hwdef.h @@ -32,7 +32,6 @@ * The first channel also has a direct-drive FET for turbo. */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/emisar-2ch/fet/hwdef.c diff --git a/hw/hank/emisar-2ch/fet/model b/hw/hank/emisar-2ch/fet/model new file mode 100644 index 0000000..a7d9419 --- /dev/null +++ b/hw/hank/emisar-2ch/fet/model @@ -0,0 +1 @@ +0136 diff --git a/hw/hank/emisar-2ch/hwdef.h b/hw/hank/emisar-2ch/hwdef.h index e67fac8..e3707c7 100644 --- a/hw/hank/emisar-2ch/hwdef.h +++ b/hw/hank/emisar-2ch/hwdef.h @@ -31,7 +31,6 @@ * and one pin to control the Opamp power level. */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/emisar-2ch/hwdef.c diff --git a/hw/hank/emisar-2ch/model b/hw/hank/emisar-2ch/model new file mode 100644 index 0000000..b8db57f --- /dev/null +++ b/hw/hank/emisar-2ch/model @@ -0,0 +1 @@ +0135 diff --git a/hw/hank/emisar-d1/anduril.h b/hw/hank/emisar-d1/anduril.h index 69b723f..9ed6b64 100644 --- a/hw/hank/emisar-d1/anduril.h +++ b/hw/hank/emisar-d1/anduril.h @@ -6,8 +6,6 @@ // same as Emisar D4, mostly #include "hank/emisar-d4/hwdef.h" #include "hank/emisar-d4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0121" // safe limit ~50% power #undef SIMPLE_UI_CEIL diff --git a/hw/hank/emisar-d1/arch b/hw/hank/emisar-d1/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/hank/emisar-d1/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/hank/emisar-d1/model b/hw/hank/emisar-d1/model new file mode 100644 index 0000000..9bc3765 --- /dev/null +++ b/hw/hank/emisar-d1/model @@ -0,0 +1 @@ +0121 diff --git a/hw/hank/emisar-d18/219/anduril.h b/hw/hank/emisar-d18/219/anduril.h index f9e07e4..e1c64cf 100644 --- a/hw/hank/emisar-d18/219/anduril.h +++ b/hw/hank/emisar-d18/219/anduril.h @@ -4,8 +4,6 @@ #pragma once #include "hank/emisar-d18/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0142" // don't turn off first channels at turbo level #undef PWM1_LEVELS diff --git a/hw/hank/emisar-d18/219/model b/hw/hank/emisar-d18/219/model new file mode 100644 index 0000000..aafa4b3 --- /dev/null +++ b/hw/hank/emisar-d18/219/model @@ -0,0 +1 @@ +0142 diff --git a/hw/hank/emisar-d18/anduril.h b/hw/hank/emisar-d18/anduril.h index 3e7746f..a42b962 100644 --- a/hw/hank/emisar-d18/anduril.h +++ b/hw/hank/emisar-d18/anduril.h @@ -3,7 +3,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0141" #include "hank/emisar-d18/hwdef.h" #include "hank/anduril.h" diff --git a/hw/hank/emisar-d18/arch b/hw/hank/emisar-d18/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/hank/emisar-d18/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/hank/emisar-d18/hwdef.h b/hw/hank/emisar-d18/hwdef.h index 942c5c0..86c97c2 100644 --- a/hw/hank/emisar-d18/hwdef.h +++ b/hw/hank/emisar-d18/hwdef.h @@ -12,7 +12,6 @@ * ---- */ -#define ATTINY 85 #include <avr/io.h> #define HWDEF_C_FILE lumintop/fw3a/hwdef.c diff --git a/hw/hank/emisar-d18/model b/hw/hank/emisar-d18/model new file mode 100644 index 0000000..a9a1a6e --- /dev/null +++ b/hw/hank/emisar-d18/model @@ -0,0 +1 @@ +0141 diff --git a/hw/hank/emisar-d1s/anduril.h b/hw/hank/emisar-d1s/anduril.h index 96ba075..b53bc06 100644 --- a/hw/hank/emisar-d1s/anduril.h +++ b/hw/hank/emisar-d1s/anduril.h @@ -6,8 +6,6 @@ // same as Emisar D4, mostly #include "hank/emisar-d4/hwdef.h" #include "hank/emisar-d4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0122" // safe limit ~50% power #undef SIMPLE_UI_CEIL diff --git a/hw/hank/emisar-d1s/arch b/hw/hank/emisar-d1s/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/hank/emisar-d1s/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/hank/emisar-d1s/model b/hw/hank/emisar-d1s/model new file mode 100644 index 0000000..fb5886d --- /dev/null +++ b/hw/hank/emisar-d1s/model @@ -0,0 +1 @@ +0122 diff --git a/hw/hank/emisar-d1v2/7135-fet/anduril.h b/hw/hank/emisar-d1v2/7135-fet/anduril.h index 200f93f..968162a 100644 --- a/hw/hank/emisar-d1v2/7135-fet/anduril.h +++ b/hw/hank/emisar-d1v2/7135-fet/anduril.h @@ -3,12 +3,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -// ATTINY: 1634 // same as Emisar D4v2, mostly // (was only made for a short time, not many people have one) #include "hank/emisar-d4v2/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0123" // some models use a simple button LED, others use RGB... // ... so include support for both diff --git a/hw/hank/emisar-d1v2/7135-fet/model b/hw/hank/emisar-d1v2/7135-fet/model new file mode 100644 index 0000000..40381e2 --- /dev/null +++ b/hw/hank/emisar-d1v2/7135-fet/model @@ -0,0 +1 @@ +0123 diff --git a/hw/hank/emisar-d1v2/arch b/hw/hank/emisar-d1v2/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/emisar-d1v2/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/emisar-d1v2/linear-fet/anduril.h b/hw/hank/emisar-d1v2/linear-fet/anduril.h index 7131759..1d09001 100644 --- a/hw/hank/emisar-d1v2/linear-fet/anduril.h +++ b/hw/hank/emisar-d1v2/linear-fet/anduril.h @@ -4,11 +4,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -// ATTINY: 1634 // similar to a Noctigon KR4, sort of #include "hank/noctigon-kr4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0124" // some models use a simple button LED, others use RGB... // ... so include support for both diff --git a/hw/hank/emisar-d1v2/linear-fet/model b/hw/hank/emisar-d1v2/linear-fet/model new file mode 100644 index 0000000..0e92a1c --- /dev/null +++ b/hw/hank/emisar-d1v2/linear-fet/model @@ -0,0 +1 @@ +0124 diff --git a/hw/hank/emisar-d1v2/nofet/anduril.h b/hw/hank/emisar-d1v2/nofet/anduril.h index eae6215..1c320e7 100644 --- a/hw/hank/emisar-d1v2/nofet/anduril.h +++ b/hw/hank/emisar-d1v2/nofet/anduril.h @@ -4,11 +4,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -// ATTINY: 1634 // similar to a Noctigon KR4, sort of #include "hank/noctigon-kr4/nofet/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0125" // some models use a simple button LED, others use RGB... // ... so include support for both diff --git a/hw/hank/emisar-d1v2/nofet/model b/hw/hank/emisar-d1v2/nofet/model new file mode 100644 index 0000000..6f55c26 --- /dev/null +++ b/hw/hank/emisar-d1v2/nofet/model @@ -0,0 +1 @@ +0125 diff --git a/hw/hank/emisar-d4/219/anduril.h b/hw/hank/emisar-d4/219/anduril.h index ff6f1f1..d56ac66 100644 --- a/hw/hank/emisar-d4/219/anduril.h +++ b/hw/hank/emisar-d4/219/anduril.h @@ -6,8 +6,6 @@ // same as D4 but with FET modes limited to 80% power // to avoid destroying the LEDs #include "hank/emisar-d4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0112" // don't turn off first channel at turbo level #undef PWM1_LEVELS diff --git a/hw/hank/emisar-d4/219/model b/hw/hank/emisar-d4/219/model new file mode 100644 index 0000000..d9cf734 --- /dev/null +++ b/hw/hank/emisar-d4/219/model @@ -0,0 +1 @@ +0112 diff --git a/hw/hank/emisar-d4/anduril.h b/hw/hank/emisar-d4/anduril.h index 60919f9..1da45db 100644 --- a/hw/hank/emisar-d4/anduril.h +++ b/hw/hank/emisar-d4/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0111" #include "hank/emisar-d4/hwdef.h" #include "hank/anduril.h" -// ATTINY: 85 #define RAMP_SIZE 150 diff --git a/hw/hank/emisar-d4/arch b/hw/hank/emisar-d4/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/hank/emisar-d4/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/hank/emisar-d4/hwdef.h b/hw/hank/emisar-d4/hwdef.h index ffdcbfd..55ef72e 100644 --- a/hw/hank/emisar-d4/hwdef.h +++ b/hw/hank/emisar-d4/hwdef.h @@ -12,7 +12,6 @@ * ---- */ -#define ATTINY 85 #include <avr/io.h> #define HWDEF_C_FILE hank/emisar-d4/hwdef.c diff --git a/hw/hank/emisar-d4/model b/hw/hank/emisar-d4/model new file mode 100644 index 0000000..a106d0c --- /dev/null +++ b/hw/hank/emisar-d4/model @@ -0,0 +1 @@ +0111 diff --git a/hw/hank/emisar-d4k-3ch/anduril.h b/hw/hank/emisar-d4k-3ch/anduril.h index 64cc93b..722fa89 100644 --- a/hw/hank/emisar-d4k-3ch/anduril.h +++ b/hw/hank/emisar-d4k-3ch/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0151" #include "hank/emisar-d4k-3ch/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/emisar-d4k-3ch/arch b/hw/hank/emisar-d4k-3ch/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/emisar-d4k-3ch/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/emisar-d4k-3ch/hwdef.h b/hw/hank/emisar-d4k-3ch/hwdef.h index 81a64ed..7cfe699 100644 --- a/hw/hank/emisar-d4k-3ch/hwdef.h +++ b/hw/hank/emisar-d4k-3ch/hwdef.h @@ -35,7 +35,6 @@ * So this code should support both wire layouts. */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/emisar-d4k-3ch/hwdef.c diff --git a/hw/hank/emisar-d4k-3ch/model b/hw/hank/emisar-d4k-3ch/model new file mode 100644 index 0000000..aacfeca --- /dev/null +++ b/hw/hank/emisar-d4k-3ch/model @@ -0,0 +1 @@ +0151 diff --git a/hw/hank/emisar-d4s/219/anduril.h b/hw/hank/emisar-d4s/219/anduril.h index 81ce6f3..7d9503b 100644 --- a/hw/hank/emisar-d4s/219/anduril.h +++ b/hw/hank/emisar-d4s/219/anduril.h @@ -6,8 +6,6 @@ // same as D4S but with FET modes limited to 80% power // to avoid destroying the LEDs #include "hank/emisar-d4s/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0132" // don't turn off first channel at turbo level #undef PWM1_LEVELS diff --git a/hw/hank/emisar-d4s/219/model b/hw/hank/emisar-d4s/219/model new file mode 100644 index 0000000..2c9caac --- /dev/null +++ b/hw/hank/emisar-d4s/219/model @@ -0,0 +1 @@ +0132 diff --git a/hw/hank/emisar-d4s/anduril.h b/hw/hank/emisar-d4s/anduril.h index 0efe107..3f53cc9 100644 --- a/hw/hank/emisar-d4s/anduril.h +++ b/hw/hank/emisar-d4s/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0131" #include "hank/emisar-d4s/hwdef.h" #include "hank/anduril.h" -// ATTINY: 85 // the button lights up (on some models) #define USE_INDICATOR_LED diff --git a/hw/hank/emisar-d4s/arch b/hw/hank/emisar-d4s/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/hank/emisar-d4s/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/hank/emisar-d4s/model b/hw/hank/emisar-d4s/model new file mode 100644 index 0000000..7063c46 --- /dev/null +++ b/hw/hank/emisar-d4s/model @@ -0,0 +1 @@ +0131 diff --git a/hw/hank/emisar-d4sv2/219/anduril.h b/hw/hank/emisar-d4sv2/219/anduril.h index 71815c4..2726460 100644 --- a/hw/hank/emisar-d4sv2/219/anduril.h +++ b/hw/hank/emisar-d4sv2/219/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "hank/emisar-d4sv2/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0134" -// ATTINY: 1634 // don't turn off first channel at turbo level #undef PWM1_LEVELS diff --git a/hw/hank/emisar-d4sv2/219/model b/hw/hank/emisar-d4sv2/219/model new file mode 100644 index 0000000..73ccc29 --- /dev/null +++ b/hw/hank/emisar-d4sv2/219/model @@ -0,0 +1 @@ +0134 diff --git a/hw/hank/emisar-d4sv2/anduril.h b/hw/hank/emisar-d4sv2/anduril.h index 7f93510..139baf3 100644 --- a/hw/hank/emisar-d4sv2/anduril.h +++ b/hw/hank/emisar-d4sv2/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0133" #include "hank/emisar-d4sv2/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 #define RAMP_SIZE 150 diff --git a/hw/hank/emisar-d4sv2/arch b/hw/hank/emisar-d4sv2/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/emisar-d4sv2/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/emisar-d4sv2/hwdef.h b/hw/hank/emisar-d4sv2/hwdef.h index 3dae90d..d1e0452 100644 --- a/hw/hank/emisar-d4sv2/hwdef.h +++ b/hw/hank/emisar-d4sv2/hwdef.h @@ -30,7 +30,6 @@ * ADC12 thermal sensor */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/emisar-d4sv2/hwdef.c diff --git a/hw/hank/emisar-d4sv2/model b/hw/hank/emisar-d4sv2/model new file mode 100644 index 0000000..61c3188 --- /dev/null +++ b/hw/hank/emisar-d4sv2/model @@ -0,0 +1 @@ +0133 diff --git a/hw/hank/emisar-d4v2/219/anduril.h b/hw/hank/emisar-d4v2/219/anduril.h index 1022a04..d4cd7c9 100644 --- a/hw/hank/emisar-d4v2/219/anduril.h +++ b/hw/hank/emisar-d4v2/219/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "hank/emisar-d4v2/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0114" -// ATTINY: 1634 // don't turn off the low channel at turbo level #undef LOW_PWM_LEVELS diff --git a/hw/hank/emisar-d4v2/219/model b/hw/hank/emisar-d4v2/219/model new file mode 100644 index 0000000..8b42d66 --- /dev/null +++ b/hw/hank/emisar-d4v2/219/model @@ -0,0 +1 @@ +0114 diff --git a/hw/hank/emisar-d4v2/anduril.h b/hw/hank/emisar-d4v2/anduril.h index 053db32..7ab5152 100644 --- a/hw/hank/emisar-d4v2/anduril.h +++ b/hw/hank/emisar-d4v2/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0113" #include "hank/emisar-d4v2/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 #define RAMP_SIZE 150 diff --git a/hw/hank/emisar-d4v2/arch b/hw/hank/emisar-d4v2/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/emisar-d4v2/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/emisar-d4v2/hwdef.h b/hw/hank/emisar-d4v2/hwdef.h index bda49bc..9e3f755 100644 --- a/hw/hank/emisar-d4v2/hwdef.h +++ b/hw/hank/emisar-d4v2/hwdef.h @@ -28,7 +28,6 @@ * ADC12 thermal sensor */ -#define ATTINY 1634 #include <avr/io.h> #ifndef HWDEF_C_FILE diff --git a/hw/hank/emisar-d4v2/model b/hw/hank/emisar-d4v2/model new file mode 100644 index 0000000..d07a457 --- /dev/null +++ b/hw/hank/emisar-d4v2/model @@ -0,0 +1 @@ +0113 diff --git a/hw/hank/emisar-d4v2/nofet/anduril.h b/hw/hank/emisar-d4v2/nofet/anduril.h index b0a9960..b5f9304 100644 --- a/hw/hank/emisar-d4v2/nofet/anduril.h +++ b/hw/hank/emisar-d4v2/nofet/anduril.h @@ -7,9 +7,6 @@ #define HWDEF_C_FILE hank/emisar-d4v2/nofet/hwdef.c #include "hank/emisar-d4v2/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0115" -// ATTINY: 1634 // the ramp uses only 1x7135 chip, max ~130 lm #undef PWM_CHANNELS diff --git a/hw/hank/emisar-d4v2/nofet/model b/hw/hank/emisar-d4v2/nofet/model new file mode 100644 index 0000000..b128369 --- /dev/null +++ b/hw/hank/emisar-d4v2/nofet/model @@ -0,0 +1 @@ +0115 diff --git a/hw/hank/noctigon-dm11/anduril.h b/hw/hank/noctigon-dm11/anduril.h index f588b03..3524f03 100644 --- a/hw/hank/noctigon-dm11/anduril.h +++ b/hw/hank/noctigon-dm11/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0271" #include "hank/noctigon-dm11/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/noctigon-dm11/arch b/hw/hank/noctigon-dm11/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/noctigon-dm11/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/noctigon-dm11/boost/anduril.h b/hw/hank/noctigon-dm11/boost/anduril.h index 7b62173..a12c158 100644 --- a/hw/hank/noctigon-dm11/boost/anduril.h +++ b/hw/hank/noctigon-dm11/boost/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0273" #include "hank/noctigon-dm11/boost/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 #define RAMP_SIZE 150 diff --git a/hw/hank/noctigon-dm11/boost/hwdef.h b/hw/hank/noctigon-dm11/boost/hwdef.h index 513d32f..5ac2daf 100644 --- a/hw/hank/noctigon-dm11/boost/hwdef.h +++ b/hw/hank/noctigon-dm11/boost/hwdef.h @@ -36,7 +36,6 @@ * not to change brightness. */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c diff --git a/hw/hank/noctigon-dm11/boost/model b/hw/hank/noctigon-dm11/boost/model new file mode 100644 index 0000000..451ce28 --- /dev/null +++ b/hw/hank/noctigon-dm11/boost/model @@ -0,0 +1 @@ +0273 diff --git a/hw/hank/noctigon-dm11/hwdef.h b/hw/hank/noctigon-dm11/hwdef.h index 9ce5629..cd21eae 100644 --- a/hw/hank/noctigon-dm11/hwdef.h +++ b/hw/hank/noctigon-dm11/hwdef.h @@ -37,7 +37,6 @@ * Some models also have a direct-drive FET for turbo. */ -#define ATTINY 1634 #include <avr/io.h> #ifndef HWDEF_C_FILE diff --git a/hw/hank/noctigon-dm11/model b/hw/hank/noctigon-dm11/model new file mode 100644 index 0000000..31171cd --- /dev/null +++ b/hw/hank/noctigon-dm11/model @@ -0,0 +1 @@ +0271 diff --git a/hw/hank/noctigon-dm11/nofet/anduril.h b/hw/hank/noctigon-dm11/nofet/anduril.h index 6d6af70..12336f1 100644 --- a/hw/hank/noctigon-dm11/nofet/anduril.h +++ b/hw/hank/noctigon-dm11/nofet/anduril.h @@ -6,9 +6,6 @@ // same support functions as a KR4 #define HWDEF_C_FILE hank/noctigon-kr4/nofet/hwdef.c #include "hank/noctigon-dm11/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0272" -// ATTINY: 1634 // turn off the DD FET #undef PWM_CHANNELS diff --git a/hw/hank/noctigon-dm11/nofet/model b/hw/hank/noctigon-dm11/nofet/model new file mode 100644 index 0000000..f394182 --- /dev/null +++ b/hw/hank/noctigon-dm11/nofet/model @@ -0,0 +1 @@ +0272 diff --git a/hw/hank/noctigon-dm11/sbt90/anduril.h b/hw/hank/noctigon-dm11/sbt90/anduril.h index 8c0d1de..4fe58bf 100644 --- a/hw/hank/noctigon-dm11/sbt90/anduril.h +++ b/hw/hank/noctigon-dm11/sbt90/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "hank/noctigon-kr4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0274" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/noctigon-dm11/sbt90/model b/hw/hank/noctigon-dm11/sbt90/model new file mode 100644 index 0000000..1eadd7f --- /dev/null +++ b/hw/hank/noctigon-dm11/sbt90/model @@ -0,0 +1 @@ +0274 diff --git a/hw/hank/noctigon-k1/anduril.h b/hw/hank/noctigon-k1/anduril.h index 115e730..06a9b69 100644 --- a/hw/hank/noctigon-k1/anduril.h +++ b/hw/hank/noctigon-k1/anduril.h @@ -3,11 +3,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0251" // (originally known as Emisar D1S v2) #include "hank/noctigon-k1/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light can safely run a bit hotter than most #undef DEFAULT_THERM_CEIL diff --git a/hw/hank/noctigon-k1/arch b/hw/hank/noctigon-k1/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/noctigon-k1/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/noctigon-k1/boost/anduril.h b/hw/hank/noctigon-k1/boost/anduril.h index 8d023a6..cfbab16 100644 --- a/hw/hank/noctigon-k1/boost/anduril.h +++ b/hw/hank/noctigon-k1/boost/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0253" #include "hank/noctigon-k1/boost/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // Most K1 lights can run hotter than default, but the 12V model // is known to have issues with the driver itself getting too hot. diff --git a/hw/hank/noctigon-k1/boost/hwdef.h b/hw/hank/noctigon-k1/boost/hwdef.h index 20bd47d..951932a 100644 --- a/hw/hank/noctigon-k1/boost/hwdef.h +++ b/hw/hank/noctigon-k1/boost/hwdef.h @@ -34,7 +34,6 @@ * not to change brightness. */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c diff --git a/hw/hank/noctigon-k1/boost/model b/hw/hank/noctigon-k1/boost/model new file mode 100644 index 0000000..3b64c1d --- /dev/null +++ b/hw/hank/noctigon-k1/boost/model @@ -0,0 +1 @@ +0253 diff --git a/hw/hank/noctigon-k1/hwdef.h b/hw/hank/noctigon-k1/hwdef.h index f6e714d..9a68401 100644 --- a/hw/hank/noctigon-k1/hwdef.h +++ b/hw/hank/noctigon-k1/hwdef.h @@ -36,7 +36,6 @@ * not to change brightness. */ -#define ATTINY 1634 #include <avr/io.h> #ifndef HWDEF_C_FILE diff --git a/hw/hank/noctigon-k1/model b/hw/hank/noctigon-k1/model new file mode 100644 index 0000000..13156be --- /dev/null +++ b/hw/hank/noctigon-k1/model @@ -0,0 +1 @@ +0251 diff --git a/hw/hank/noctigon-k1/sbt90/anduril.h b/hw/hank/noctigon-k1/sbt90/anduril.h index 4766ce7..6943a0a 100644 --- a/hw/hank/noctigon-k1/sbt90/anduril.h +++ b/hw/hank/noctigon-k1/sbt90/anduril.h @@ -4,10 +4,8 @@ #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 diff --git a/hw/hank/noctigon-k1/sbt90/hwdef.h b/hw/hank/noctigon-k1/sbt90/hwdef.h index bdea32d..8186b49 100644 --- a/hw/hank/noctigon-k1/sbt90/hwdef.h +++ b/hw/hank/noctigon-k1/sbt90/hwdef.h @@ -37,7 +37,6 @@ * Also has a direct-drive FET for turbo. */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c diff --git a/hw/hank/noctigon-k1/sbt90/model b/hw/hank/noctigon-k1/sbt90/model new file mode 100644 index 0000000..0d8949d --- /dev/null +++ b/hw/hank/noctigon-k1/sbt90/model @@ -0,0 +1 @@ +0252 diff --git a/hw/hank/noctigon-k9.3/219/anduril.h b/hw/hank/noctigon-k9.3/219/anduril.h index 3699277..e4eeae2 100644 --- a/hw/hank/noctigon-k9.3/219/anduril.h +++ b/hw/hank/noctigon-k9.3/219/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "hank/noctigon-k9.3/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0263" -// ATTINY: 1634 // main LEDs #undef PWM2_LEVELS diff --git a/hw/hank/noctigon-k9.3/anduril.h b/hw/hank/noctigon-k9.3/anduril.h index ad63fa2..9c60f39 100644 --- a/hw/hank/noctigon-k9.3/anduril.h +++ b/hw/hank/noctigon-k9.3/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0261" #include "hank/emisar-2ch/fet/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/noctigon-k9.3/nofet/anduril.h b/hw/hank/noctigon-k9.3/nofet/anduril.h index ab0dab6..9556f9a 100644 --- a/hw/hank/noctigon-k9.3/nofet/anduril.h +++ b/hw/hank/noctigon-k9.3/nofet/anduril.h @@ -6,7 +6,4 @@ // no functional differences from generic emisar-2ch build // (just use that one instead, this is only here for legacy reasons) #include "hank/emisar-2ch/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0262" -// ATTINY: 1634 diff --git a/hw/hank/noctigon-kr4/219/anduril.h b/hw/hank/noctigon-kr4/219/anduril.h index cd3e118..b0c85a1 100644 --- a/hw/hank/noctigon-kr4/219/anduril.h +++ b/hw/hank/noctigon-kr4/219/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "hank/noctigon-kr4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0213" -// ATTINY: 1634 // don't turn off first channel at turbo level #undef PWM1_LEVELS diff --git a/hw/hank/noctigon-kr4/219/model b/hw/hank/noctigon-kr4/219/model new file mode 100644 index 0000000..ebf3188 --- /dev/null +++ b/hw/hank/noctigon-kr4/219/model @@ -0,0 +1 @@ +0213 diff --git a/hw/hank/noctigon-kr4/219b/anduril.h b/hw/hank/noctigon-kr4/219b/anduril.h index 9c113f9..6e23704 100644 --- a/hw/hank/noctigon-kr4/219b/anduril.h +++ b/hw/hank/noctigon-kr4/219b/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "hank/noctigon-kr4/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0214" -// ATTINY: 1634 // don't turn off first channel at turbo level #undef PWM1_LEVELS diff --git a/hw/hank/noctigon-kr4/219b/model b/hw/hank/noctigon-kr4/219b/model new file mode 100644 index 0000000..31afea2 --- /dev/null +++ b/hw/hank/noctigon-kr4/219b/model @@ -0,0 +1 @@ +0214 diff --git a/hw/hank/noctigon-kr4/2ch/anduril.h b/hw/hank/noctigon-kr4/2ch/anduril.h index be7c4d0..c750f6d 100644 --- a/hw/hank/noctigon-kr4/2ch/anduril.h +++ b/hw/hank/noctigon-kr4/2ch/anduril.h @@ -5,11 +5,8 @@ // (basically the same as Emisar generic 2-channel build, // but switch on a different pin, and no lighted button) -// ATTINY: 1634 #include "hank/noctigon-kr4/2ch/hwdef.h" #include "hank/emisar-2ch/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0215" // the button doesn't light up #undef USE_BUTTON_LED diff --git a/hw/hank/noctigon-kr4/2ch/hwdef.h b/hw/hank/noctigon-kr4/2ch/hwdef.h index 081fccc..b23c7cc 100644 --- a/hw/hank/noctigon-kr4/2ch/hwdef.h +++ b/hw/hank/noctigon-kr4/2ch/hwdef.h @@ -30,7 +30,6 @@ * ADC12 thermal sensor */ -#define ATTINY 1634 #include <avr/io.h> // move the switch to a different pin diff --git a/hw/hank/noctigon-kr4/2ch/model b/hw/hank/noctigon-kr4/2ch/model new file mode 100644 index 0000000..684b693 --- /dev/null +++ b/hw/hank/noctigon-kr4/2ch/model @@ -0,0 +1 @@ +0215 diff --git a/hw/hank/noctigon-kr4/anduril.h b/hw/hank/noctigon-kr4/anduril.h index b71f346..c60926b 100644 --- a/hw/hank/noctigon-kr4/anduril.h +++ b/hw/hank/noctigon-kr4/anduril.h @@ -4,10 +4,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0211" #include "hank/noctigon-kr4/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // brightness w/ SST-20 4000K LEDs: // 0/1023: 0.35 lm diff --git a/hw/hank/noctigon-kr4/arch b/hw/hank/noctigon-kr4/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/noctigon-kr4/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/noctigon-kr4/boost/anduril.h b/hw/hank/noctigon-kr4/boost/anduril.h index a3b33ee..160d9c1 100644 --- a/hw/hank/noctigon-kr4/boost/anduril.h +++ b/hw/hank/noctigon-kr4/boost/anduril.h @@ -9,8 +9,5 @@ // - different model number #include "hank/noctigon-dm11/boost/anduril.h" #include "hank/noctigon-kr4/boost/hwdef.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0216" #include "hank/anduril.h" -// ATTINY: 1634 diff --git a/hw/hank/noctigon-kr4/boost/model b/hw/hank/noctigon-kr4/boost/model new file mode 100644 index 0000000..569cb3a --- /dev/null +++ b/hw/hank/noctigon-kr4/boost/model @@ -0,0 +1 @@ +0216 diff --git a/hw/hank/noctigon-kr4/hwdef.h b/hw/hank/noctigon-kr4/hwdef.h index a830910..586f848 100644 --- a/hw/hank/noctigon-kr4/hwdef.h +++ b/hw/hank/noctigon-kr4/hwdef.h @@ -35,7 +35,6 @@ * Some models also have a direct-drive FET for turbo. */ -#define ATTINY 1634 #include <avr/io.h> #ifndef HWDEF_C_FILE diff --git a/hw/hank/noctigon-kr4/model b/hw/hank/noctigon-kr4/model new file mode 100644 index 0000000..6e87763 --- /dev/null +++ b/hw/hank/noctigon-kr4/model @@ -0,0 +1 @@ +0211 diff --git a/hw/hank/noctigon-kr4/nofet/anduril.h b/hw/hank/noctigon-kr4/nofet/anduril.h index 10c0bf8..4522cde 100644 --- a/hw/hank/noctigon-kr4/nofet/anduril.h +++ b/hw/hank/noctigon-kr4/nofet/anduril.h @@ -7,9 +7,6 @@ // (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 diff --git a/hw/hank/noctigon-kr4/nofet/model b/hw/hank/noctigon-kr4/nofet/model new file mode 100644 index 0000000..eaaa95e --- /dev/null +++ b/hw/hank/noctigon-kr4/nofet/model @@ -0,0 +1 @@ +0212 diff --git a/hw/hank/noctigon-m44/anduril.h b/hw/hank/noctigon-m44/anduril.h index 2add6d4..88411be 100644 --- a/hw/hank/noctigon-m44/anduril.h +++ b/hw/hank/noctigon-m44/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0143" #include "hank/noctigon-m44/hwdef.h" #include "hank/anduril.h" -// ATTINY: 1634 // this light has three aux LED channels: R, G, B #define USE_AUX_RGB_LEDS diff --git a/hw/hank/noctigon-m44/arch b/hw/hank/noctigon-m44/arch new file mode 100644 index 0000000..5d99bab --- /dev/null +++ b/hw/hank/noctigon-m44/arch @@ -0,0 +1 @@ +attiny1634 diff --git a/hw/hank/noctigon-m44/hwdef.h b/hw/hank/noctigon-m44/hwdef.h index 7bacfd1..af942d9 100644 --- a/hw/hank/noctigon-m44/hwdef.h +++ b/hw/hank/noctigon-m44/hwdef.h @@ -28,7 +28,6 @@ * ADC12 thermal sensor */ -#define ATTINY 1634 #include <avr/io.h> #define HWDEF_C_FILE hank/noctigon-m44/hwdef.c diff --git a/hw/hank/noctigon-m44/model b/hw/hank/noctigon-m44/model new file mode 100644 index 0000000..e75de03 --- /dev/null +++ b/hw/hank/noctigon-m44/model @@ -0,0 +1 @@ +0143 |