From c798ab3e78d4ca857c9aa6dc283176df1769becd Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 3 Nov 2023 10:53:34 -0600 Subject: moved ATTINY and MODEL_NUMBER into $target/arch and $target/model, and updated other scripts and files accordingly --- hw/sofirn/blf-lt1-t1616/anduril.h | 2 -- hw/sofirn/blf-lt1-t1616/arch | 1 + hw/sofirn/blf-lt1-t1616/hwdef.h | 1 - hw/sofirn/blf-lt1-t1616/model | 1 + hw/sofirn/blf-lt1/anduril.h | 2 -- hw/sofirn/blf-lt1/arch | 1 + hw/sofirn/blf-lt1/hwdef.h | 1 - hw/sofirn/blf-lt1/model | 1 + hw/sofirn/blf-q8-t1616/anduril.h | 2 -- hw/sofirn/blf-q8-t1616/arch | 1 + hw/sofirn/blf-q8-t1616/hwdef.h | 1 - hw/sofirn/blf-q8-t1616/model | 1 + hw/sofirn/blf-q8/anduril.h | 1 - hw/sofirn/blf-q8/arch | 1 + hw/sofirn/blf-q8/model | 1 + hw/sofirn/lt1s-pro/anduril.h | 2 -- hw/sofirn/lt1s-pro/arch | 1 + hw/sofirn/lt1s-pro/hwdef.h | 1 - hw/sofirn/lt1s-pro/model | 1 + hw/sofirn/sc21-pro/anduril.h | 3 --- hw/sofirn/sc21-pro/arch | 1 + hw/sofirn/sc21-pro/model | 1 + hw/sofirn/sp10-pro/anduril.h | 2 -- hw/sofirn/sp10-pro/arch | 1 + hw/sofirn/sp10-pro/hwdef.h | 1 - hw/sofirn/sp10-pro/model | 1 + hw/sofirn/sp36-t1616/anduril.h | 3 --- hw/sofirn/sp36-t1616/arch | 1 + hw/sofirn/sp36-t1616/model | 1 + hw/sofirn/sp36/anduril.h | 2 -- hw/sofirn/sp36/arch | 1 + hw/sofirn/sp36/model | 1 + 32 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 hw/sofirn/blf-lt1-t1616/arch create mode 100644 hw/sofirn/blf-lt1-t1616/model create mode 100644 hw/sofirn/blf-lt1/arch create mode 100644 hw/sofirn/blf-lt1/model create mode 100644 hw/sofirn/blf-q8-t1616/arch create mode 100644 hw/sofirn/blf-q8-t1616/model create mode 100644 hw/sofirn/blf-q8/arch create mode 100644 hw/sofirn/blf-q8/model create mode 100644 hw/sofirn/lt1s-pro/arch create mode 100644 hw/sofirn/lt1s-pro/model create mode 100644 hw/sofirn/sc21-pro/arch create mode 100644 hw/sofirn/sc21-pro/model create mode 100644 hw/sofirn/sp10-pro/arch create mode 100644 hw/sofirn/sp10-pro/model create mode 100644 hw/sofirn/sp36-t1616/arch create mode 100644 hw/sofirn/sp36-t1616/model create mode 100644 hw/sofirn/sp36/arch create mode 100644 hw/sofirn/sp36/model (limited to 'hw/sofirn') diff --git a/hw/sofirn/blf-lt1-t1616/anduril.h b/hw/sofirn/blf-lt1-t1616/anduril.h index eea5ef5..4c40290 100644 --- a/hw/sofirn/blf-lt1-t1616/anduril.h +++ b/hw/sofirn/blf-lt1-t1616/anduril.h @@ -3,9 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0622" #include "sofirn/blf-lt1-t1616/hwdef.h" -// ATTINY: 1616 // the button lights up #define USE_INDICATOR_LED diff --git a/hw/sofirn/blf-lt1-t1616/arch b/hw/sofirn/blf-lt1-t1616/arch new file mode 100644 index 0000000..cda1996 --- /dev/null +++ b/hw/sofirn/blf-lt1-t1616/arch @@ -0,0 +1 @@ +attiny1616 diff --git a/hw/sofirn/blf-lt1-t1616/hwdef.h b/hw/sofirn/blf-lt1-t1616/hwdef.h index 203cdc8..66575de 100644 --- a/hw/sofirn/blf-lt1-t1616/hwdef.h +++ b/hw/sofirn/blf-lt1-t1616/hwdef.h @@ -12,7 +12,6 @@ * Voltage: VCC */ -#define ATTINY 1616 #include #define HWDEF_C_FILE sofirn/blf-lt1-t1616/hwdef.c diff --git a/hw/sofirn/blf-lt1-t1616/model b/hw/sofirn/blf-lt1-t1616/model new file mode 100644 index 0000000..3d825a6 --- /dev/null +++ b/hw/sofirn/blf-lt1-t1616/model @@ -0,0 +1 @@ +0622 diff --git a/hw/sofirn/blf-lt1/anduril.h b/hw/sofirn/blf-lt1/anduril.h index e60c9f7..ad0befd 100644 --- a/hw/sofirn/blf-lt1/anduril.h +++ b/hw/sofirn/blf-lt1/anduril.h @@ -3,9 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0621" #include "sofirn/blf-lt1/hwdef.h" -// ATTINY: 85 // the button lights up #define USE_INDICATOR_LED diff --git a/hw/sofirn/blf-lt1/arch b/hw/sofirn/blf-lt1/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/sofirn/blf-lt1/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/sofirn/blf-lt1/hwdef.h b/hw/sofirn/blf-lt1/hwdef.h index 192d067..03f3568 100644 --- a/hw/sofirn/blf-lt1/hwdef.h +++ b/hw/sofirn/blf-lt1/hwdef.h @@ -12,7 +12,6 @@ * ---- */ -#define ATTINY 85 #include #define HWDEF_C_FILE sofirn/blf-lt1/hwdef.c diff --git a/hw/sofirn/blf-lt1/model b/hw/sofirn/blf-lt1/model new file mode 100644 index 0000000..9a0c852 --- /dev/null +++ b/hw/sofirn/blf-lt1/model @@ -0,0 +1 @@ +0621 diff --git a/hw/sofirn/blf-q8-t1616/anduril.h b/hw/sofirn/blf-q8-t1616/anduril.h index 0307e02..c2c27d7 100644 --- a/hw/sofirn/blf-q8-t1616/anduril.h +++ b/hw/sofirn/blf-q8-t1616/anduril.h @@ -3,10 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0613" #include "sofirn/blf-q8-t1616/hwdef.h" #include "wurkkos/anduril.h" // Sofirn lights are closely related to Wurkkos -// ATTINY: 1616 // the button lights up #define USE_INDICATOR_LED diff --git a/hw/sofirn/blf-q8-t1616/arch b/hw/sofirn/blf-q8-t1616/arch new file mode 100644 index 0000000..cda1996 --- /dev/null +++ b/hw/sofirn/blf-q8-t1616/arch @@ -0,0 +1 @@ +attiny1616 diff --git a/hw/sofirn/blf-q8-t1616/hwdef.h b/hw/sofirn/blf-q8-t1616/hwdef.h index 9098022..29c2ffa 100644 --- a/hw/sofirn/blf-q8-t1616/hwdef.h +++ b/hw/sofirn/blf-q8-t1616/hwdef.h @@ -15,7 +15,6 @@ * Voltage: VCC */ -#define ATTINY 1616 #include // nearly all t1616-based FET+1 drivers work pretty much the same diff --git a/hw/sofirn/blf-q8-t1616/model b/hw/sofirn/blf-q8-t1616/model new file mode 100644 index 0000000..c87e2f1 --- /dev/null +++ b/hw/sofirn/blf-q8-t1616/model @@ -0,0 +1 @@ +0613 diff --git a/hw/sofirn/blf-q8/anduril.h b/hw/sofirn/blf-q8/anduril.h index 622d885..5873bf5 100644 --- a/hw/sofirn/blf-q8/anduril.h +++ b/hw/sofirn/blf-q8/anduril.h @@ -3,7 +3,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0611" #include "sofirn/blf-q8/hwdef.h" #define RAMP_SIZE 150 diff --git a/hw/sofirn/blf-q8/arch b/hw/sofirn/blf-q8/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/sofirn/blf-q8/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/sofirn/blf-q8/model b/hw/sofirn/blf-q8/model new file mode 100644 index 0000000..7949b34 --- /dev/null +++ b/hw/sofirn/blf-q8/model @@ -0,0 +1 @@ +0611 diff --git a/hw/sofirn/lt1s-pro/anduril.h b/hw/sofirn/lt1s-pro/anduril.h index c6a0f3e..1840b58 100644 --- a/hw/sofirn/lt1s-pro/anduril.h +++ b/hw/sofirn/lt1s-pro/anduril.h @@ -3,9 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0623" #include "sofirn/lt1s-pro/hwdef.h" -// ATTINY: 1616 // off mode: low (1) // lockout: blinking (3) diff --git a/hw/sofirn/lt1s-pro/arch b/hw/sofirn/lt1s-pro/arch new file mode 100644 index 0000000..cda1996 --- /dev/null +++ b/hw/sofirn/lt1s-pro/arch @@ -0,0 +1 @@ +attiny1616 diff --git a/hw/sofirn/lt1s-pro/hwdef.h b/hw/sofirn/lt1s-pro/hwdef.h index 4179c67..cd4dd4e 100644 --- a/hw/sofirn/lt1s-pro/hwdef.h +++ b/hw/sofirn/lt1s-pro/hwdef.h @@ -13,7 +13,6 @@ * Voltage: VCC */ -#define ATTINY 1616 #include #define HWDEF_C_FILE sofirn/lt1s-pro/hwdef.c diff --git a/hw/sofirn/lt1s-pro/model b/hw/sofirn/lt1s-pro/model new file mode 100644 index 0000000..97fc6c0 --- /dev/null +++ b/hw/sofirn/lt1s-pro/model @@ -0,0 +1 @@ +0623 diff --git a/hw/sofirn/sc21-pro/anduril.h b/hw/sofirn/sc21-pro/anduril.h index 2fdc91f..5f69905 100644 --- a/hw/sofirn/sc21-pro/anduril.h +++ b/hw/sofirn/sc21-pro/anduril.h @@ -4,9 +4,6 @@ #pragma once #include "wurkkos/ts10/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0632" -// ATTINY: 1616 // turn on the aux LED while main LED is on #ifndef USE_INDICATOR_LED_WHILE_RAMPING diff --git a/hw/sofirn/sc21-pro/arch b/hw/sofirn/sc21-pro/arch new file mode 100644 index 0000000..cda1996 --- /dev/null +++ b/hw/sofirn/sc21-pro/arch @@ -0,0 +1 @@ +attiny1616 diff --git a/hw/sofirn/sc21-pro/model b/hw/sofirn/sc21-pro/model new file mode 100644 index 0000000..517287a --- /dev/null +++ b/hw/sofirn/sc21-pro/model @@ -0,0 +1 @@ +0632 diff --git a/hw/sofirn/sp10-pro/anduril.h b/hw/sofirn/sp10-pro/anduril.h index e265918..50c1d4e 100644 --- a/hw/sofirn/sp10-pro/anduril.h +++ b/hw/sofirn/sp10-pro/anduril.h @@ -3,9 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define MODEL_NUMBER "0631" #include "sofirn/sp10-pro/hwdef.h" -// ATTINY: 1616 // 1....15: level_calc.py 3.01 1 15 7135 1 0.1 2 --pwm dyn:15:64:64 // 16..150: level_calc.py 5.01 1 135 7135 1 2 800 --pwm dyn:49:3072:255:3.0 diff --git a/hw/sofirn/sp10-pro/arch b/hw/sofirn/sp10-pro/arch new file mode 100644 index 0000000..cda1996 --- /dev/null +++ b/hw/sofirn/sp10-pro/arch @@ -0,0 +1 @@ +attiny1616 diff --git a/hw/sofirn/sp10-pro/hwdef.h b/hw/sofirn/sp10-pro/hwdef.h index 1d1ec25..a52166d 100644 --- a/hw/sofirn/sp10-pro/hwdef.h +++ b/hw/sofirn/sp10-pro/hwdef.h @@ -12,7 +12,6 @@ * PA1 : Boost Enable */ -#define ATTINY 1616 #include #define HWDEF_C_FILE sofirn/sp10-pro/hwdef.c diff --git a/hw/sofirn/sp10-pro/model b/hw/sofirn/sp10-pro/model new file mode 100644 index 0000000..a7cda42 --- /dev/null +++ b/hw/sofirn/sp10-pro/model @@ -0,0 +1 @@ +0631 diff --git a/hw/sofirn/sp36-t1616/anduril.h b/hw/sofirn/sp36-t1616/anduril.h index 03f1506..f08ed73 100644 --- a/hw/sofirn/sp36-t1616/anduril.h +++ b/hw/sofirn/sp36-t1616/anduril.h @@ -5,9 +5,6 @@ // same as the BLF Q8, mostly #include "sofirn/blf-q8-t1616/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0614" -// ATTINY: 1616 // voltage readings were a little high with the Q8 value #undef VOLTAGE_FUDGE_FACTOR diff --git a/hw/sofirn/sp36-t1616/arch b/hw/sofirn/sp36-t1616/arch new file mode 100644 index 0000000..cda1996 --- /dev/null +++ b/hw/sofirn/sp36-t1616/arch @@ -0,0 +1 @@ +attiny1616 diff --git a/hw/sofirn/sp36-t1616/model b/hw/sofirn/sp36-t1616/model new file mode 100644 index 0000000..fd22bce --- /dev/null +++ b/hw/sofirn/sp36-t1616/model @@ -0,0 +1 @@ +0614 diff --git a/hw/sofirn/sp36/anduril.h b/hw/sofirn/sp36/anduril.h index bad7952..283bf38 100644 --- a/hw/sofirn/sp36/anduril.h +++ b/hw/sofirn/sp36/anduril.h @@ -5,8 +5,6 @@ // same as the BLF Q8, mostly #include "sofirn/blf-q8/anduril.h" -#undef MODEL_NUMBER -#define MODEL_NUMBER "0612" // voltage readings were a little high with the Q8 value #undef VOLTAGE_FUDGE_FACTOR diff --git a/hw/sofirn/sp36/arch b/hw/sofirn/sp36/arch new file mode 100644 index 0000000..d16b0f8 --- /dev/null +++ b/hw/sofirn/sp36/arch @@ -0,0 +1 @@ +attiny85 diff --git a/hw/sofirn/sp36/model b/hw/sofirn/sp36/model new file mode 100644 index 0000000..7349c5a --- /dev/null +++ b/hw/sofirn/sp36/model @@ -0,0 +1 @@ +0612 -- cgit v1.2.3