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/sofirn/blf-lt1-t1616/cfg.h   | 2 +-
 hw/sofirn/blf-lt1-t1616/hwdef.c | 2 +-
 hw/sofirn/blf-lt1-t1616/hwdef.h | 4 ++--
 hw/sofirn/blf-lt1/cfg.h         | 2 +-
 hw/sofirn/blf-lt1/hwdef.h       | 2 +-
 hw/sofirn/blf-q8-t1616/cfg.h    | 4 ++--
 hw/sofirn/blf-q8-t1616/hwdef.h  | 4 ++--
 hw/sofirn/blf-q8/cfg.h          | 2 +-
 hw/sofirn/blf-q8/hwdef.h        | 2 +-
 hw/sofirn/lt1s-pro/cfg.h        | 2 +-
 hw/sofirn/lt1s-pro/hwdef.h      | 2 +-
 hw/sofirn/sc21-pro/cfg.h        | 2 +-
 hw/sofirn/sp10-pro/cfg.h        | 2 +-
 hw/sofirn/sp10-pro/hwdef.h      | 2 +-
 hw/sofirn/sp36-t1616/cfg.h      | 2 +-
 hw/sofirn/sp36/cfg.h            | 2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'hw/sofirn')

diff --git a/hw/sofirn/blf-lt1-t1616/cfg.h b/hw/sofirn/blf-lt1-t1616/cfg.h
index fc02619..eea5ef5 100644
--- a/hw/sofirn/blf-lt1-t1616/cfg.h
+++ b/hw/sofirn/blf-lt1-t1616/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0622"
-#include "hwdef-blf-lt1-t1616.h"
+#include "sofirn/blf-lt1-t1616/hwdef.h"
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/sofirn/blf-lt1-t1616/hwdef.c b/hw/sofirn/blf-lt1-t1616/hwdef.c
index 9d268a4..5a83849 100644
--- a/hw/sofirn/blf-lt1-t1616/hwdef.c
+++ b/hw/sofirn/blf-lt1-t1616/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-aux.c"
+#include "fsm/chan-aux.c"
 
 
 void set_level_zero();
diff --git a/hw/sofirn/blf-lt1-t1616/hwdef.h b/hw/sofirn/blf-lt1-t1616/hwdef.h
index 7c1f10b..203cdc8 100644
--- a/hw/sofirn/blf-lt1-t1616/hwdef.h
+++ b/hw/sofirn/blf-lt1-t1616/hwdef.h
@@ -15,10 +15,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-blf-lt1-t1616.c
+#define HWDEF_C_FILE sofirn/blf-lt1-t1616/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. warm only
diff --git a/hw/sofirn/blf-lt1/cfg.h b/hw/sofirn/blf-lt1/cfg.h
index 53c3203..e60c9f7 100644
--- a/hw/sofirn/blf-lt1/cfg.h
+++ b/hw/sofirn/blf-lt1/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0621"
-#include "hwdef-blf-lt1.h"
+#include "sofirn/blf-lt1/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/sofirn/blf-lt1/hwdef.h b/hw/sofirn/blf-lt1/hwdef.h
index b113fd4..192d067 100644
--- a/hw/sofirn/blf-lt1/hwdef.h
+++ b/hw/sofirn/blf-lt1/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 85
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-blf-lt1.c
+#define HWDEF_C_FILE sofirn/blf-lt1/hwdef.c
 
 // channel modes:
 // * 0. channel 1 only
diff --git a/hw/sofirn/blf-q8-t1616/cfg.h b/hw/sofirn/blf-q8-t1616/cfg.h
index 9f0402c..dca3aa8 100644
--- a/hw/sofirn/blf-q8-t1616/cfg.h
+++ b/hw/sofirn/blf-q8-t1616/cfg.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #define MODEL_NUMBER "0613"
-#include "hwdef-blf-q8-t1616.h"
-#include "wurkkos-cfg.h"  // Sofirn lights are closely related to Wurkkos
+#include "sofirn/blf-q8-t1616/hwdef.h"
+#include "wurkkos/cfg.h"  // Sofirn lights are closely related to Wurkkos
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/sofirn/blf-q8-t1616/hwdef.h b/hw/sofirn/blf-q8-t1616/hwdef.h
index d9b981f..9098022 100644
--- a/hw/sofirn/blf-q8-t1616/hwdef.h
+++ b/hw/sofirn/blf-q8-t1616/hwdef.h
@@ -20,10 +20,10 @@
 
 // nearly all t1616-based FET+1 drivers work pretty much the same
 // (this one has single-color aux like the TS10)
-#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/sofirn/blf-q8/cfg.h b/hw/sofirn/blf-q8/cfg.h
index 29dbcb7..622d885 100644
--- a/hw/sofirn/blf-q8/cfg.h
+++ b/hw/sofirn/blf-q8/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0611"
-#include "hwdef-blf-q8.h"
+#include "sofirn/blf-q8/hwdef.h"
 
 #define RAMP_SIZE 150
 
diff --git a/hw/sofirn/blf-q8/hwdef.h b/hw/sofirn/blf-q8/hwdef.h
index cdf311d..8549170 100644
--- a/hw/sofirn/blf-q8/hwdef.h
+++ b/hw/sofirn/blf-q8/hwdef.h
@@ -16,5 +16,5 @@
 #endif
 
 // Q8 driver is the same as a D4, basically
-#include "hwdef-emisar-d4.h"
+#include "hank/emisar-d4/hwdef.h"
 
diff --git a/hw/sofirn/lt1s-pro/cfg.h b/hw/sofirn/lt1s-pro/cfg.h
index 440a03d..c6a0f3e 100644
--- a/hw/sofirn/lt1s-pro/cfg.h
+++ b/hw/sofirn/lt1s-pro/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0623"
-#include "hwdef-sofirn-lt1s-pro.h"
+#include "sofirn/lt1s-pro/hwdef.h"
 // ATTINY: 1616
 
 // off mode: low (1)
diff --git a/hw/sofirn/lt1s-pro/hwdef.h b/hw/sofirn/lt1s-pro/hwdef.h
index ae6b3bf..4179c67 100644
--- a/hw/sofirn/lt1s-pro/hwdef.h
+++ b/hw/sofirn/lt1s-pro/hwdef.h
@@ -16,7 +16,7 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-sofirn-lt1s-pro.c
+#define HWDEF_C_FILE sofirn/lt1s-pro/hwdef.c
 
 // channel modes:
 // * 0. warm/cool white blend
diff --git a/hw/sofirn/sc21-pro/cfg.h b/hw/sofirn/sc21-pro/cfg.h
index 8fd2dee..febd1dd 100644
--- a/hw/sofirn/sc21-pro/cfg.h
+++ b/hw/sofirn/sc21-pro/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-wurkkos-ts10.h"
+#include "wurkkos/ts10/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0632"
 // ATTINY: 1616
diff --git a/hw/sofirn/sp10-pro/cfg.h b/hw/sofirn/sp10-pro/cfg.h
index 0e2f28d..e265918 100644
--- a/hw/sofirn/sp10-pro/cfg.h
+++ b/hw/sofirn/sp10-pro/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0631"
-#include "hwdef-sofirn-sp10-pro.h"
+#include "sofirn/sp10-pro/hwdef.h"
 // ATTINY: 1616
 
 // 1....15: level_calc.py 3.01 1  15 7135 1 0.1   2 --pwm dyn:15:64:64
diff --git a/hw/sofirn/sp10-pro/hwdef.h b/hw/sofirn/sp10-pro/hwdef.h
index 5cef6a7..1d1ec25 100644
--- a/hw/sofirn/sp10-pro/hwdef.h
+++ b/hw/sofirn/sp10-pro/hwdef.h
@@ -15,7 +15,7 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-sofirn-sp10-pro.c
+#define HWDEF_C_FILE sofirn/sp10-pro/hwdef.c
 
 // channel modes:
 // * 0. low+high PWM stacked
diff --git a/hw/sofirn/sp36-t1616/cfg.h b/hw/sofirn/sp36-t1616/cfg.h
index cb29e4f..d3e5459 100644
--- a/hw/sofirn/sp36-t1616/cfg.h
+++ b/hw/sofirn/sp36-t1616/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as  the  BLF Q8, mostly
-#include "cfg-blf-q8-t1616.h"
+#include "sofirn/blf-q8-t1616/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0614"
 // ATTINY: 1616
diff --git a/hw/sofirn/sp36/cfg.h b/hw/sofirn/sp36/cfg.h
index 3661686..7b65ad9 100644
--- a/hw/sofirn/sp36/cfg.h
+++ b/hw/sofirn/sp36/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as  the  BLF Q8, mostly
-#include "cfg-blf-q8.h"
+#include "sofirn/blf-q8/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0612"
 
-- 
cgit v1.2.3