19 files changed, 10 insertions, 14 deletions
diff --git a/hw/lumintop/blf-gt-mini/anduril.h b/hw/lumintop/blf-gt-mini/anduril.h
index 1137e58..d4c6021 100644
--- a/hw/lumintop/blf-gt-mini/anduril.h
+++ b/hw/lumintop/blf-gt-mini/anduril.h
@@ -6,8 +6,6 @@
 #include "lumintop/blf-gt-mini/hwdef.h"
 // Same as an Emisar D1S, except it has a lighted button
 #include "hank/emisar-d1s/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0322"
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/lumintop/blf-gt-mini/arch b/hw/lumintop/blf-gt-mini/arch
new file mode 100644
index 0000000..d16b0f8
--- /dev/null
+++ b/hw/lumintop/blf-gt-mini/arch
@@ -0,0 +1 @@
+attiny85
diff --git a/hw/lumintop/blf-gt-mini/model b/hw/lumintop/blf-gt-mini/model
new file mode 100644
index 0000000..f248105
--- /dev/null
+++ b/hw/lumintop/blf-gt-mini/model
@@ -0,0 +1 @@
+0322
diff --git a/hw/lumintop/blf-gt/anduril.h b/hw/lumintop/blf-gt/anduril.h
index d06b1fa..2fc359e 100644
--- a/hw/lumintop/blf-gt/anduril.h
+++ b/hw/lumintop/blf-gt/anduril.h
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0321"
 #include "lumintop/blf-gt/hwdef.h"
-// ATTINY: 85
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/lumintop/blf-gt/arch b/hw/lumintop/blf-gt/arch
new file mode 100644
index 0000000..d16b0f8
--- /dev/null
+++ b/hw/lumintop/blf-gt/arch
@@ -0,0 +1 @@
+attiny85
diff --git a/hw/lumintop/blf-gt/hwdef.h b/hw/lumintop/blf-gt/hwdef.h
index bd23086..60306bf 100644
--- a/hw/lumintop/blf-gt/hwdef.h
+++ b/hw/lumintop/blf-gt/hwdef.h
@@ -16,7 +16,6 @@
  * and its output gets PWM'd by pin 5.
  */
 
-#define ATTINY 85
 #include <avr/io.h>
 
 #define HWDEF_C_FILE hank/emisar-d4/hwdef.c
diff --git a/hw/lumintop/blf-gt/model b/hw/lumintop/blf-gt/model
new file mode 100644
index 0000000..b7fb894
--- /dev/null
+++ b/hw/lumintop/blf-gt/model
@@ -0,0 +1 @@
+0321
diff --git a/hw/lumintop/fw3a/219/anduril.h b/hw/lumintop/fw3a/219/anduril.h
index 86b0976..2a964a7 100644
--- a/hw/lumintop/fw3a/219/anduril.h
+++ b/hw/lumintop/fw3a/219/anduril.h
@@ -4,8 +4,6 @@
 #pragma once
 
 #include "lumintop/fw3a/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0312"
 
 #undef PWM1_LEVELS
 #undef PWM2_LEVELS
diff --git a/hw/lumintop/fw3a/219/model b/hw/lumintop/fw3a/219/model
new file mode 100644
index 0000000..50f8a02
--- /dev/null
+++ b/hw/lumintop/fw3a/219/model
@@ -0,0 +1 @@
+0312
diff --git a/hw/lumintop/fw3a/anduril.h b/hw/lumintop/fw3a/anduril.h
index 123a7e1..eae060d 100644
--- a/hw/lumintop/fw3a/anduril.h
+++ b/hw/lumintop/fw3a/anduril.h
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0311"
 #include "lumintop/fw3a/hwdef.h"
 
 #define RAMP_SIZE 150
diff --git a/hw/lumintop/fw3a/arch b/hw/lumintop/fw3a/arch
new file mode 100644
index 0000000..d16b0f8
--- /dev/null
+++ b/hw/lumintop/fw3a/arch
@@ -0,0 +1 @@
+attiny85
diff --git a/hw/lumintop/fw3a/hwdef.h b/hw/lumintop/fw3a/hwdef.h
index fc9ff2a..649dc19 100644
--- a/hw/lumintop/fw3a/hwdef.h
+++ b/hw/lumintop/fw3a/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/lumintop/fw3a/model b/hw/lumintop/fw3a/model
new file mode 100644
index 0000000..3e67e95
--- /dev/null
+++ b/hw/lumintop/fw3a/model
@@ -0,0 +1 @@
+0311
diff --git a/hw/lumintop/fw3a/nofet/anduril.h b/hw/lumintop/fw3a/nofet/anduril.h
index 0559418..b231c16 100644
--- a/hw/lumintop/fw3a/nofet/anduril.h
+++ b/hw/lumintop/fw3a/nofet/anduril.h
@@ -4,8 +4,6 @@
 #pragma once
 
 #include "lumintop/fw3a/anduril.h"
-#undef MODEL_NUMBER
-#define MODEL_NUMBER "0313"
 
 // don't use channel 3 (FET)
 #undef PWM_CHANNELS
diff --git a/hw/lumintop/fw3a/nofet/model b/hw/lumintop/fw3a/nofet/model
new file mode 100644
index 0000000..5eafc32
--- /dev/null
+++ b/hw/lumintop/fw3a/nofet/model
@@ -0,0 +1 @@
+0313
diff --git a/hw/lumintop/fw3x-lume1/anduril.h b/hw/lumintop/fw3x-lume1/anduril.h
index 2ea540c..b208fbc 100644
--- a/hw/lumintop/fw3x-lume1/anduril.h
+++ b/hw/lumintop/fw3x-lume1/anduril.h
@@ -11,9 +11,7 @@
  * - 85: https://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-2586-AVR-8-bit-Microcontroller-ATtiny25-ATtiny45-ATtiny85_Datasheet.pdf
  */
 
-#define MODEL_NUMBER "0314"
 #include "lumintop/fw3x-lume1/hwdef.h"
-// ATTINY: 1634
 
 // set this light for 50C thermal ceiling
 #undef DEFAULT_THERM_CEIL
diff --git a/hw/lumintop/fw3x-lume1/arch b/hw/lumintop/fw3x-lume1/arch
new file mode 100644
index 0000000..5d99bab
--- /dev/null
+++ b/hw/lumintop/fw3x-lume1/arch
@@ -0,0 +1 @@
+attiny1634
diff --git a/hw/lumintop/fw3x-lume1/hwdef.h b/hw/lumintop/fw3x-lume1/hwdef.h
index 8c673b3..4025861 100644
--- a/hw/lumintop/fw3x-lume1/hwdef.h
+++ b/hw/lumintop/fw3x-lume1/hwdef.h
@@ -34,7 +34,6 @@
  * Another pin is used for DD FET control.
  */
 
-#define ATTINY 1634
 #include <avr/io.h>
 
 #define HWDEF_C_FILE lumintop/fw3x-lume1/hwdef.c
diff --git a/hw/lumintop/fw3x-lume1/model b/hw/lumintop/fw3x-lume1/model
new file mode 100644
index 0000000..fb9c4db
--- /dev/null
+++ b/hw/lumintop/fw3x-lume1/model
@@ -0,0 +1 @@
+0314