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

and updated other scripts and files accordingly

15 files changed, 7 insertions, 19 deletions

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