From c798ab3e78d4ca857c9aa6dc283176df1769becd Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Fri, 3 Nov 2023 10:53:34 -0600
Subject: moved ATTINY and MODEL_NUMBER into $target/arch and $target/model,
 and updated other scripts and files accordingly

---
 hw/hank/noctigon-k1/anduril.h       | 2 --
 hw/hank/noctigon-k1/arch            | 1 +
 hw/hank/noctigon-k1/boost/anduril.h | 2 --
 hw/hank/noctigon-k1/boost/hwdef.h   | 1 -
 hw/hank/noctigon-k1/boost/model     | 1 +
 hw/hank/noctigon-k1/hwdef.h         | 1 -
 hw/hank/noctigon-k1/model           | 1 +
 hw/hank/noctigon-k1/sbt90/anduril.h | 2 --
 hw/hank/noctigon-k1/sbt90/hwdef.h   | 1 -
 hw/hank/noctigon-k1/sbt90/model     | 1 +
 10 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 hw/hank/noctigon-k1/arch
 create mode 100644 hw/hank/noctigon-k1/boost/model
 create mode 100644 hw/hank/noctigon-k1/model
 create mode 100644 hw/hank/noctigon-k1/sbt90/model

(limited to 'hw/hank/noctigon-k1')

diff --git a/hw/hank/noctigon-k1/anduril.h b/hw/hank/noctigon-k1/anduril.h
index 115e730..06a9b69 100644
--- a/hw/hank/noctigon-k1/anduril.h
+++ b/hw/hank/noctigon-k1/anduril.h
@@ -3,11 +3,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0251"
 // (originally known as Emisar D1S v2)
 #include "hank/noctigon-k1/hwdef.h"
 #include "hank/anduril.h"
-// ATTINY: 1634
 
 // this light can safely run a bit hotter than most
 #undef DEFAULT_THERM_CEIL
diff --git a/hw/hank/noctigon-k1/arch b/hw/hank/noctigon-k1/arch
new file mode 100644
index 0000000..5d99bab
--- /dev/null
+++ b/hw/hank/noctigon-k1/arch
@@ -0,0 +1 @@
+attiny1634
diff --git a/hw/hank/noctigon-k1/boost/anduril.h b/hw/hank/noctigon-k1/boost/anduril.h
index 8d023a6..cfbab16 100644
--- a/hw/hank/noctigon-k1/boost/anduril.h
+++ b/hw/hank/noctigon-k1/boost/anduril.h
@@ -3,10 +3,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#define MODEL_NUMBER "0253"
 #include "hank/noctigon-k1/boost/hwdef.h"
 #include "hank/anduril.h"
-// ATTINY: 1634
 
 // Most K1 lights can run hotter than default, but the 12V model
 // is known to have issues with the driver itself getting too hot.
diff --git a/hw/hank/noctigon-k1/boost/hwdef.h b/hw/hank/noctigon-k1/boost/hwdef.h
index 20bd47d..951932a 100644
--- a/hw/hank/noctigon-k1/boost/hwdef.h
+++ b/hw/hank/noctigon-k1/boost/hwdef.h
@@ -34,7 +34,6 @@
  * not to change brightness.
  */
 
-#define ATTINY 1634
 #include <avr/io.h>
 
 #define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c
diff --git a/hw/hank/noctigon-k1/boost/model b/hw/hank/noctigon-k1/boost/model
new file mode 100644
index 0000000..3b64c1d
--- /dev/null
+++ b/hw/hank/noctigon-k1/boost/model
@@ -0,0 +1 @@
+0253
diff --git a/hw/hank/noctigon-k1/hwdef.h b/hw/hank/noctigon-k1/hwdef.h
index f6e714d..9a68401 100644
--- a/hw/hank/noctigon-k1/hwdef.h
+++ b/hw/hank/noctigon-k1/hwdef.h
@@ -36,7 +36,6 @@
  * not to change brightness.
  */
 
-#define ATTINY 1634
 #include <avr/io.h>
 
 #ifndef HWDEF_C_FILE
diff --git a/hw/hank/noctigon-k1/model b/hw/hank/noctigon-k1/model
new file mode 100644
index 0000000..13156be
--- /dev/null
+++ b/hw/hank/noctigon-k1/model
@@ -0,0 +1 @@
+0251
diff --git a/hw/hank/noctigon-k1/sbt90/anduril.h b/hw/hank/noctigon-k1/sbt90/anduril.h
index 4766ce7..6943a0a 100644
--- a/hw/hank/noctigon-k1/sbt90/anduril.h
+++ b/hw/hank/noctigon-k1/sbt90/anduril.h
@@ -4,10 +4,8 @@
 #pragma once
 
 // (is a K1 host with a KR4-like driver and a really high-powered LED)
-#define MODEL_NUMBER "0252"
 #include "hank/noctigon-k1/sbt90/hwdef.h"
 #include "hank/anduril.h"
-// ATTINY: 1634
 
 // this light can safely run a bit hotter than most
 #undef DEFAULT_THERM_CEIL
diff --git a/hw/hank/noctigon-k1/sbt90/hwdef.h b/hw/hank/noctigon-k1/sbt90/hwdef.h
index bdea32d..8186b49 100644
--- a/hw/hank/noctigon-k1/sbt90/hwdef.h
+++ b/hw/hank/noctigon-k1/sbt90/hwdef.h
@@ -37,7 +37,6 @@
  * Also has a direct-drive FET for turbo.
  */
 
-#define ATTINY 1634
 #include <avr/io.h>
 
 #define HWDEF_C_FILE hank/noctigon-kr4/hwdef.c
diff --git a/hw/hank/noctigon-k1/sbt90/model b/hw/hank/noctigon-k1/sbt90/model
new file mode 100644
index 0000000..0d8949d
--- /dev/null
+++ b/hw/hank/noctigon-k1/sbt90/model
@@ -0,0 +1 @@
+0252
-- 
cgit v1.2.3