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

and updated other scripts and files accordingly

15 files changed, 8 insertions, 13 deletions

diff --git a/hw/fireflies/arch b/hw/fireflies/arch
new file mode 100644
index 0000000..d16b0f8
--- /dev/null
+++ b/hw/fireflies/arch
@@ -0,0 +1 @@
+attiny85
diff --git a/hw/fireflies/e01/anduril.h b/hw/fireflies/e01/anduril.h
index cae5d14..be745a1 100644
--- a/hw/fireflies/e01/anduril.h
+++ b/hw/fireflies/e01/anduril.h
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0441"
 #include "fireflies/pl47/hwdef.h"
-// ATTINY: 85
 
 // disable indicator LED; it's hardwired
 #ifdef USE_INDICATOR_LED
diff --git a/hw/fireflies/e01/model b/hw/fireflies/e01/model
new file mode 100644
index 0000000..25de1eb
--- /dev/null
+++ b/hw/fireflies/e01/model
@@ -0,0 +1 @@
+0441
diff --git a/hw/fireflies/pl47/219/anduril.h b/hw/fireflies/pl47/219/anduril.h
index 28882bc..5a70916 100644
--- a/hw/fireflies/pl47/219/anduril.h
+++ b/hw/fireflies/pl47/219/anduril.h
@@ -6,8 +6,6 @@
 // same as PL47 but with FET modes limited to 67% power
 // to avoid destroying the LEDs
 #include "fireflies/pl47/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0422"
 
 #undef PWM1_LEVELS
 #undef PWM2_LEVELS
diff --git a/hw/fireflies/pl47/219/model b/hw/fireflies/pl47/219/model
new file mode 100644
index 0000000..fcfd89b
--- /dev/null
+++ b/hw/fireflies/pl47/219/model
@@ -0,0 +1 @@
+0422
diff --git a/hw/fireflies/pl47/anduril.h b/hw/fireflies/pl47/anduril.h
index 315eea2..35e4f45 100644
--- a/hw/fireflies/pl47/anduril.h
+++ b/hw/fireflies/pl47/anduril.h
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0421"
 #include "fireflies/pl47/hwdef.h"
-// ATTINY: 85
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/fireflies/pl47/model b/hw/fireflies/pl47/model
new file mode 100644
index 0000000..7520ff4
--- /dev/null
+++ b/hw/fireflies/pl47/model
@@ -0,0 +1 @@
+0421
diff --git a/hw/fireflies/pl47g2/anduril.h b/hw/fireflies/pl47g2/anduril.h
index e64289e..060087c 100644
--- a/hw/fireflies/pl47g2/anduril.h
+++ b/hw/fireflies/pl47g2/anduril.h
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0423"
 #include "fireflies/pl47/hwdef.h"
-// ATTINY: 85
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/fireflies/pl47g2/model b/hw/fireflies/pl47g2/model
new file mode 100644
index 0000000..885f7f4
--- /dev/null
+++ b/hw/fireflies/pl47g2/model
@@ -0,0 +1 @@
+0423
diff --git a/hw/fireflies/rot66/219/anduril.h b/hw/fireflies/rot66/219/anduril.h
index f115541..172df19 100644
--- a/hw/fireflies/rot66/219/anduril.h
+++ b/hw/fireflies/rot66/219/anduril.h
@@ -5,8 +5,6 @@
 
 // same as regular ROT66, but calibrated for Nichia 219B with 7x7135 chips
 #include "fireflies/rot66/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0412"
 
 // driver is a FET+N+1,
 // where N=6 for the 219b version
diff --git a/hw/fireflies/rot66/219/model b/hw/fireflies/rot66/219/model
new file mode 100644
index 0000000..893a847
--- /dev/null
+++ b/hw/fireflies/rot66/219/model
@@ -0,0 +1 @@
+0412
diff --git a/hw/fireflies/rot66/anduril.h b/hw/fireflies/rot66/anduril.h
index 5184513..ec26ae1 100644
--- a/hw/fireflies/rot66/anduril.h
+++ b/hw/fireflies/rot66/anduril.h
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0411"
 #include "fireflies/rot66/hwdef.h"
 
 // the button lights up
diff --git a/hw/fireflies/rot66/model b/hw/fireflies/rot66/model
new file mode 100644
index 0000000..241c2a1
--- /dev/null
+++ b/hw/fireflies/rot66/model
@@ -0,0 +1 @@
+0411
diff --git a/hw/fireflies/rot66g2/anduril.h b/hw/fireflies/rot66g2/anduril.h
index bf47065..d24bd93 100644
--- a/hw/fireflies/rot66g2/anduril.h
+++ b/hw/fireflies/rot66g2/anduril.h
@@ -4,8 +4,6 @@
 #pragma once
 
 #include "fireflies/rot66/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0413"
 
 // if the "low" mode was disabled, turn it back on
 #ifdef INDICATOR_LED_SKIP_LOW
diff --git a/hw/fireflies/rot66g2/model b/hw/fireflies/rot66g2/model
new file mode 100644
index 0000000..1cd9bca
--- /dev/null
+++ b/hw/fireflies/rot66g2/model
@@ -0,0 +1 @@
+0413