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

and updated other scripts and files accordingly

19 files changed, 11 insertions, 17 deletions

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