got things to compile again, renamed #includes

(also modified the build scripts to work with the new file structure)

9 files changed, 9 insertions, 9 deletions

diff --git a/hw/fireflies/e01/cfg.h b/hw/fireflies/e01/cfg.h
index 07bda87..cae5d14 100644
--- a/hw/fireflies/e01/cfg.h
+++ b/hw/fireflies/e01/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0441"
-#include "hwdef-ff-pl47.h"
+#include "fireflies/pl47/hwdef.h"
 // ATTINY: 85
 
 // disable indicator LED; it's hardwired
diff --git a/hw/fireflies/pl47-219/cfg.h b/hw/fireflies/pl47-219/cfg.h
index 11bd5b1..e42e17c 100644
--- a/hw/fireflies/pl47-219/cfg.h
+++ b/hw/fireflies/pl47-219/cfg.h
@@ -5,7 +5,7 @@
 
 // same as PL47 but with FET modes limited to 67% power
 // to avoid destroying the LEDs
-#include "cfg-ff-pl47.h"
+#include "fireflies/pl47/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0422"
 
diff --git a/hw/fireflies/pl47/cfg.h b/hw/fireflies/pl47/cfg.h
index 6436477..315eea2 100644
--- a/hw/fireflies/pl47/cfg.h
+++ b/hw/fireflies/pl47/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0421"
-#include "hwdef-ff-pl47.h"
+#include "fireflies/pl47/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/fireflies/pl47/hwdef.h b/hw/fireflies/pl47/hwdef.h
index 7ce7070..5eee98a 100644
--- a/hw/fireflies/pl47/hwdef.h
+++ b/hw/fireflies/pl47/hwdef.h
@@ -20,7 +20,7 @@
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
 #endif
 
-#include "hwdef-emisar-d4s.h"
+#include "hank/emisar-d4s/hwdef.h"
 #undef FSM_EMISAR_D4S_DRIVER
 #undef FSM_EMISAR_D4_DRIVER
 
diff --git a/hw/fireflies/pl47g2/cfg.h b/hw/fireflies/pl47g2/cfg.h
index 830d7e8..e64289e 100644
--- a/hw/fireflies/pl47g2/cfg.h
+++ b/hw/fireflies/pl47g2/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0423"
-#include "hwdef-ff-pl47.h"
+#include "fireflies/pl47/hwdef.h"
 // ATTINY: 85
 
 // the button lights up
diff --git a/hw/fireflies/rot66-219/cfg.h b/hw/fireflies/rot66-219/cfg.h
index 4dad4e2..068f4a8 100644
--- a/hw/fireflies/rot66-219/cfg.h
+++ b/hw/fireflies/rot66-219/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same as regular ROT66, but calibrated for Nichia 219B with 7x7135 chips
-#include "cfg-ff-rot66.h"
+#include "fireflies/rot66/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0412"
 
diff --git a/hw/fireflies/rot66/cfg.h b/hw/fireflies/rot66/cfg.h
index 752ddbb..5184513 100644
--- a/hw/fireflies/rot66/cfg.h
+++ b/hw/fireflies/rot66/cfg.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0411"
-#include "hwdef-ff-rot66.h"
+#include "fireflies/rot66/hwdef.h"
 
 // the button lights up
 #define USE_INDICATOR_LED
diff --git a/hw/fireflies/rot66/hwdef.h b/hw/fireflies/rot66/hwdef.h
index 3fea9f1..dd8855d 100644
--- a/hw/fireflies/rot66/hwdef.h
+++ b/hw/fireflies/rot66/hwdef.h
@@ -15,7 +15,7 @@
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
 #endif
 
-#include "hwdef-fw3a.h"
+#include "lumintop/fw3a/hwdef.h"
 
 // ... and no optic nerve
 #ifdef VISION_PIN
diff --git a/hw/fireflies/rot66g2/cfg.h b/hw/fireflies/rot66g2/cfg.h
index 04aac53..f628b51 100644
--- a/hw/fireflies/rot66g2/cfg.h
+++ b/hw/fireflies/rot66g2/cfg.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include "cfg-ff-rot66.h"
+#include "fireflies/rot66/cfg.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0413"