moved ATTINY and MODEL_NUMBER into $target/arch and $target/model,

and updated other scripts and files accordingly

29 files changed, 15 insertions, 27 deletions

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