From 2dcd56ce3d00fc7414652e6f866bf8eefd42dba9 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 2 Nov 2023 18:51:38 -0600
Subject: got things to compile again, renamed #includes (also modified the
 build scripts to work with the new file structure)

---
 hw/wurkkos/cfg.h             | 26 ++++++++++++++++++++++++++
 hw/wurkkos/fc13/cfg.h        |  2 +-
 hw/wurkkos/ts10-rgbaux/cfg.h |  2 +-
 hw/wurkkos/ts10/cfg.h        |  4 ++--
 hw/wurkkos/ts10/hwdef.c      |  2 +-
 hw/wurkkos/ts10/hwdef.h      |  4 ++--
 hw/wurkkos/ts11/cfg.h        |  2 +-
 hw/wurkkos/ts25/cfg.h        |  4 ++--
 hw/wurkkos/ts25/hwdef.c      |  2 +-
 hw/wurkkos/ts25/hwdef.h      |  4 ++--
 hw/wurkkos/wurkkos-cfg.h     | 26 --------------------------
 11 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 hw/wurkkos/cfg.h
 delete mode 100644 hw/wurkkos/wurkkos-cfg.h

(limited to 'hw/wurkkos')

diff --git a/hw/wurkkos/cfg.h b/hw/wurkkos/cfg.h
new file mode 100644
index 0000000..b9992fb
--- /dev/null
+++ b/hw/wurkkos/cfg.h
@@ -0,0 +1,26 @@
+// Wurkkos config options for Anduril
+// Copyright (C) 2023 Selene ToyKeeper
+// SPDX-License-Identifier: GPL-3.0-or-later
+#pragma once
+
+// allow Aux Config and Strobe Modes in Simple UI
+#define USE_EXTENDED_SIMPLE_UI
+
+// Allow 3C in Simple UI for switching between smooth and stepped ramping
+#define USE_SIMPLE_UI_RAMPING_TOGGLE
+
+// enable 2 click turbo (Anduril 1 style)
+#define DEFAULT_2C_STYLE 1
+
+// enable SOS in the blinkies group
+#define USE_SOS_MODE
+#define USE_SOS_MODE_IN_BLINKY_GROUP
+
+// enable factory reset on 13H without loosening tailcap
+// only really needed on TS10, but doesn't hurt on other models
+#define USE_SOFT_FACTORY_RESET
+
+// higher temperature limit because attiny1616 is more accurate
+#undef DEFAULT_THERM_CEIL
+#define DEFAULT_THERM_CEIL 50
+
diff --git a/hw/wurkkos/fc13/cfg.h b/hw/wurkkos/fc13/cfg.h
index 56161b4..7495f61 100644
--- a/hw/wurkkos/fc13/cfg.h
+++ b/hw/wurkkos/fc13/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // ATTINY: 1616
-#include "cfg-wurkkos-ts25.h"
+#include "wurkkos/ts25/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0716"
 
diff --git a/hw/wurkkos/ts10-rgbaux/cfg.h b/hw/wurkkos/ts10-rgbaux/cfg.h
index 6770c47..dacedea 100644
--- a/hw/wurkkos/ts10-rgbaux/cfg.h
+++ b/hw/wurkkos/ts10-rgbaux/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // most things are the same as TS25
-#include "cfg-wurkkos-ts25.h"
+#include "wurkkos/ts25/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0713"
 // ATTINY: 1616
diff --git a/hw/wurkkos/ts10/cfg.h b/hw/wurkkos/ts10/cfg.h
index 90839e7..b554b21 100644
--- a/hw/wurkkos/ts10/cfg.h
+++ b/hw/wurkkos/ts10/cfg.h
@@ -5,8 +5,8 @@
 
 // same as  the  BLF Q8 T1616, mostly (added Dynamic PWM)
 #define MODEL_NUMBER "0714"
-#include "hwdef-wurkkos-ts10.h"
-#include "wurkkos-cfg.h"
+#include "wurkkos/ts10/hwdef.h"
+#include "wurkkos/cfg.h"
 // ATTINY: 1616
 
 // uses forward-facing aux LEDs
diff --git a/hw/wurkkos/ts10/hwdef.c b/hw/wurkkos/ts10/hwdef.c
index 06f5bac..8fa7e55 100644
--- a/hw/wurkkos/ts10/hwdef.c
+++ b/hw/wurkkos/ts10/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 
 void set_level_zero();
 
diff --git a/hw/wurkkos/ts10/hwdef.h b/hw/wurkkos/ts10/hwdef.h
index e693c99..157f2da 100644
--- a/hw/wurkkos/ts10/hwdef.h
+++ b/hw/wurkkos/ts10/hwdef.h
@@ -16,10 +16,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-wurkkos-ts10.c
+#define HWDEF_C_FILE wurkkos/ts10/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/wurkkos/ts11/cfg.h b/hw/wurkkos/ts11/cfg.h
index 8955731..c4bb59f 100644
--- a/hw/wurkkos/ts11/cfg.h
+++ b/hw/wurkkos/ts11/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // ATTINY: 1616
-#include "cfg-wurkkos-ts25.h"
+#include "wurkkos/ts25/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0717"
 
diff --git a/hw/wurkkos/ts25/cfg.h b/hw/wurkkos/ts25/cfg.h
index 852e91b..9a3f129 100644
--- a/hw/wurkkos/ts25/cfg.h
+++ b/hw/wurkkos/ts25/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0715"
-#include "hwdef-wurkkos-ts25.h"
-#include "wurkkos-cfg.h"
+#include "wurkkos/ts25/hwdef.h"
+#include "wurkkos/cfg.h"
 // ATTINY: 1616
 
 // this light has three aux LED channels: R, G, B
diff --git a/hw/wurkkos/ts25/hwdef.c b/hw/wurkkos/ts25/hwdef.c
index 26c9b0d..f7cef38 100644
--- a/hw/wurkkos/ts25/hwdef.c
+++ b/hw/wurkkos/ts25/hwdef.c
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/wurkkos/ts25/hwdef.h b/hw/wurkkos/ts25/hwdef.h
index 5eed219..0604432 100644
--- a/hw/wurkkos/ts25/hwdef.h
+++ b/hw/wurkkos/ts25/hwdef.h
@@ -17,10 +17,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-wurkkos-ts25.c
+#define HWDEF_C_FILE wurkkos/ts25/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. FET+7135 stacked
diff --git a/hw/wurkkos/wurkkos-cfg.h b/hw/wurkkos/wurkkos-cfg.h
deleted file mode 100644
index b9992fb..0000000
--- a/hw/wurkkos/wurkkos-cfg.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Wurkkos config options for Anduril
-// Copyright (C) 2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-// allow Aux Config and Strobe Modes in Simple UI
-#define USE_EXTENDED_SIMPLE_UI
-
-// Allow 3C in Simple UI for switching between smooth and stepped ramping
-#define USE_SIMPLE_UI_RAMPING_TOGGLE
-
-// enable 2 click turbo (Anduril 1 style)
-#define DEFAULT_2C_STYLE 1
-
-// enable SOS in the blinkies group
-#define USE_SOS_MODE
-#define USE_SOS_MODE_IN_BLINKY_GROUP
-
-// enable factory reset on 13H without loosening tailcap
-// only really needed on TS10, but doesn't hurt on other models
-#define USE_SOFT_FACTORY_RESET
-
-// higher temperature limit because attiny1616 is more accurate
-#undef DEFAULT_THERM_CEIL
-#define DEFAULT_THERM_CEIL 50
-
-- 
cgit v1.2.3