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/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h   | 2 +-
 hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h | 4 ++--
 hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h     | 2 +-
 hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c   | 2 +-
 hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h   | 4 ++--
 hw/thefreeman/lin16dac/cfg.h                        | 2 +-
 hw/thefreeman/lin16dac/hwdef.c                      | 2 +-
 hw/thefreeman/lin16dac/hwdef.h                      | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'hw/thefreeman')

diff --git a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h
index 460346e..e30a218 100644
--- a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h
+++ b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1632"
-#include "hwdef-thefreeman-boost-fwaa-mp3432-hdr-dac-rgb.h"
+#include "thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h"
 // ATTINY: 1616
 
 // HPRsense : 4.2+0.3+20 = 24.5mR (DMN1004UFDF+trace resistance+20mR)
diff --git a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
index 9126a1a..91fca72 100644
--- a/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
+++ b/hw/thefreeman/boost-fwaa-mp3432-hdr-dac-rgb/hwdef.h
@@ -39,10 +39,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-thefreeman-boost21-mp3431-hdr-dac-argb.c
+#define HWDEF_C_FILE thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h
index 66cc2d0..2ed8fae 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1631"
-#include "hwdef-thefreeman-boost21-mp3431-hdr-dac-argb.h"
+#include "thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h"
 // ATTINY: 1616
 
 // HPRsense : 1.7+0.3+5 = 7mR (DMN22M5UFG+trace resistance+5mR)
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
index 31feec9..97f5fc9 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "chan-rgbaux.c"
+#include "fsm/chan-rgbaux.c"
 
 void set_level_zero();
 
diff --git a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
index 1c35014..1ca4a14 100644
--- a/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
+++ b/hw/thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.h
@@ -40,10 +40,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-thefreeman-boost21-mp3431-hdr-dac-argb.c
+#define HWDEF_C_FILE thefreeman/boost21-mp3431-hdr-dac-argb/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
+#include "fsm/chan-rgbaux.h"
 
 // channel modes:
 // * 0. main LEDs
diff --git a/hw/thefreeman/lin16dac/cfg.h b/hw/thefreeman/lin16dac/cfg.h
index 20d2bf5..62230e8 100644
--- a/hw/thefreeman/lin16dac/cfg.h
+++ b/hw/thefreeman/lin16dac/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "1630"
-#include "hwdef-thefreeman-lin16dac.h"
+#include "thefreeman/lin16dac/hwdef.h"
 // ATTINY: 1616
 
 // the button lights up
diff --git a/hw/thefreeman/lin16dac/hwdef.c b/hw/thefreeman/lin16dac/hwdef.c
index 07c7f9e..191444e 100644
--- a/hw/thefreeman/lin16dac/hwdef.c
+++ b/hw/thefreeman/lin16dac/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/thefreeman/lin16dac/hwdef.h b/hw/thefreeman/lin16dac/hwdef.h
index c0d0638..79f8382 100644
--- a/hw/thefreeman/lin16dac/hwdef.h
+++ b/hw/thefreeman/lin16dac/hwdef.h
@@ -15,10 +15,10 @@
 #define ATTINY 1616
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hwdef-thefreeman-lin16dac.c
+#define HWDEF_C_FILE thefreeman/lin16dac/hwdef.c
 
 // allow using aux LEDs as extra channel modes
-#include "chan-aux.h"
+#include "fsm/chan-aux.h"
 
 // channel modes:
 // * 0. main LEDs
-- 
cgit v1.2.3