39 files changed, 21 insertions, 20 deletions
diff --git a/bin/build-all.sh b/bin/build-all.sh
index e3888fb..582ed87 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -25,18 +25,20 @@ FAILED=''
 # build targets are hw/*/**/$UI.h
 for TARGET in $( find hw/*/*/ -name "$UI".h ) ; do
 
+  # friendly name for this build
+  NAME=$(echo "$TARGET" | perl -ne 's|/|-|g; /hw-(.*)-'"$UI"'.h/ && print "$1\n";')
+
   # limit builds to searched patterns, if given
   SKIP=0
   if [ ! -z "$SEARCH" ]; then
     for text in $SEARCH ; do
-        echo "$TARGET" | grep -i "$text" > /dev/null
+        echo "$NAME $TARGET" | grep -i "$text" > /dev/null
         if [ 0 != $? ]; then SKIP=1 ; fi
     done
   fi
   if [ 1 = $SKIP ]; then continue ; fi
 
-  # friendly name for this build
-  NAME=$(echo "$TARGET" | perl -ne 's|/|-|g; /hw-(.*)-'"$UI"'.h/ && print "$1\n";')
+  # announce what we're going to build
   echo "===== $UI : $NAME ====="
 
   # figure out MCU type
@@ -44,7 +46,6 @@ for TARGET in $( find hw/*/*/ -name "$UI".h ) ; do
   #if [ -z "$ATTINY" ]; then ATTINY=85 ; fi
 
   # try to compile
-  #echo bin/build.sh "$UI" "$TARGET"
   bin/build.sh "$TARGET"
 
   # track result, and rename compiled files
diff --git a/hw/fireflies/pl47-219/anduril.h b/hw/fireflies/pl47/219/anduril.h
index 28882bc..28882bc 100644
--- a/hw/fireflies/pl47-219/anduril.h
+++ b/hw/fireflies/pl47/219/anduril.h
diff --git a/hw/fireflies/rot66-219/anduril.h b/hw/fireflies/rot66/219/anduril.h
index f115541..f115541 100644
--- a/hw/fireflies/rot66-219/anduril.h
+++ b/hw/fireflies/rot66/219/anduril.h
diff --git a/hw/hank/emisar-2ch-fet/anduril.h b/hw/hank/emisar-2ch/fet/anduril.h
index 03ad748..3a9e513 100644
--- a/hw/hank/emisar-2ch-fet/anduril.h
+++ b/hw/hank/emisar-2ch/fet/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0136"
-#include "hank/emisar-2ch-fet/hwdef.h"
+#include "hank/emisar-2ch/fet/hwdef.h"
 #include "hank/anduril.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/emisar-2ch-fet/hwdef.c b/hw/hank/emisar-2ch/fet/hwdef.c
index 4309a42..4309a42 100644
--- a/hw/hank/emisar-2ch-fet/hwdef.c
+++ b/hw/hank/emisar-2ch/fet/hwdef.c
diff --git a/hw/hank/emisar-2ch-fet/hwdef.h b/hw/hank/emisar-2ch/fet/hwdef.h
index a429a6c..1569d41 100644
--- a/hw/hank/emisar-2ch-fet/hwdef.h
+++ b/hw/hank/emisar-2ch/fet/hwdef.h
@@ -35,7 +35,7 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hank/emisar-2ch-fet/hwdef.c
+#define HWDEF_C_FILE hank/emisar-2ch/fet/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
diff --git a/hw/hank/emisar-d18-219/anduril.h b/hw/hank/emisar-d18/219/anduril.h
index f9e07e4..f9e07e4 100644
--- a/hw/hank/emisar-d18-219/anduril.h
+++ b/hw/hank/emisar-d18/219/anduril.h
diff --git a/hw/hank/emisar-d1v2-7135-fet/anduril.h b/hw/hank/emisar-d1v2/7135-fet/anduril.h
index 200f93f..200f93f 100644
--- a/hw/hank/emisar-d1v2-7135-fet/anduril.h
+++ b/hw/hank/emisar-d1v2/7135-fet/anduril.h
diff --git a/hw/hank/emisar-d1v2-linear-fet/anduril.h b/hw/hank/emisar-d1v2/linear-fet/anduril.h
index 7131759..7131759 100644
--- a/hw/hank/emisar-d1v2-linear-fet/anduril.h
+++ b/hw/hank/emisar-d1v2/linear-fet/anduril.h
diff --git a/hw/hank/emisar-d1v2-nofet/anduril.h b/hw/hank/emisar-d1v2/nofet/anduril.h
index 3010fcd..eae6215 100644
--- a/hw/hank/emisar-d1v2-nofet/anduril.h
+++ b/hw/hank/emisar-d1v2/nofet/anduril.h
@@ -6,7 +6,7 @@
 
 // ATTINY: 1634
 // similar to a Noctigon KR4, sort of
-#include "hank/noctigon-kr4-nofet/anduril.h"
+#include "hank/noctigon-kr4/nofet/anduril.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0125"
 
diff --git a/hw/hank/emisar-d4-219/anduril.h b/hw/hank/emisar-d4/219/anduril.h
index ff6f1f1..ff6f1f1 100644
--- a/hw/hank/emisar-d4-219/anduril.h
+++ b/hw/hank/emisar-d4/219/anduril.h
diff --git a/hw/hank/emisar-d4s-219/anduril.h b/hw/hank/emisar-d4s/219/anduril.h
index 81ce6f3..81ce6f3 100644
--- a/hw/hank/emisar-d4s-219/anduril.h
+++ b/hw/hank/emisar-d4s/219/anduril.h
diff --git a/hw/hank/emisar-d4sv2-219/anduril.h b/hw/hank/emisar-d4sv2/219/anduril.h
index 71815c4..71815c4 100644
--- a/hw/hank/emisar-d4sv2-219/anduril.h
+++ b/hw/hank/emisar-d4sv2/219/anduril.h
diff --git a/hw/hank/emisar-d4v2-219/anduril.h b/hw/hank/emisar-d4v2/219/anduril.h
index 1022a04..1022a04 100644
--- a/hw/hank/emisar-d4v2-219/anduril.h
+++ b/hw/hank/emisar-d4v2/219/anduril.h
diff --git a/hw/hank/emisar-d4v2-nofet/anduril.h b/hw/hank/emisar-d4v2/nofet/anduril.h
index e0f8692..b0a9960 100644
--- a/hw/hank/emisar-d4v2-nofet/anduril.h
+++ b/hw/hank/emisar-d4v2/nofet/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // switch to 1-channel support functions
-#define HWDEF_C_FILE hank/emisar-d4v2-nofet/hwdef.c
+#define HWDEF_C_FILE hank/emisar-d4v2/nofet/hwdef.c
 
 #include "hank/emisar-d4v2/anduril.h"
 #undef MODEL_NUMBER
diff --git a/hw/hank/emisar-d4v2-nofet/hwdef.c b/hw/hank/emisar-d4v2/nofet/hwdef.c
index 971c06e..971c06e 100644
--- a/hw/hank/emisar-d4v2-nofet/hwdef.c
+++ b/hw/hank/emisar-d4v2/nofet/hwdef.c
diff --git a/hw/hank/noctigon-dm11-boost/anduril.h b/hw/hank/noctigon-dm11/boost/anduril.h
index de6451f..7b62173 100644
--- a/hw/hank/noctigon-dm11-boost/anduril.h
+++ b/hw/hank/noctigon-dm11/boost/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0273"
-#include "hank/noctigon-dm11-boost/hwdef.h"
+#include "hank/noctigon-dm11/boost/hwdef.h"
 #include "hank/anduril.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/noctigon-dm11-boost/hwdef.c b/hw/hank/noctigon-dm11/boost/hwdef.c
index e601132..e601132 100644
--- a/hw/hank/noctigon-dm11-boost/hwdef.c
+++ b/hw/hank/noctigon-dm11/boost/hwdef.c
diff --git a/hw/hank/noctigon-dm11-boost/hwdef.h b/hw/hank/noctigon-dm11/boost/hwdef.h
index dffd462..513d32f 100644
--- a/hw/hank/noctigon-dm11-boost/hwdef.h
+++ b/hw/hank/noctigon-dm11/boost/hwdef.h
@@ -39,7 +39,7 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hank/noctigon-dm11-boost/hwdef.c
+#define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
diff --git a/hw/hank/noctigon-dm11-nofet/anduril.h b/hw/hank/noctigon-dm11/nofet/anduril.h
index 06e8615..6d6af70 100644
--- a/hw/hank/noctigon-dm11-nofet/anduril.h
+++ b/hw/hank/noctigon-dm11/nofet/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 // same support functions as a KR4
-#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#define HWDEF_C_FILE hank/noctigon-kr4/nofet/hwdef.c
 #include "hank/noctigon-dm11/anduril.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0272"
diff --git a/hw/hank/noctigon-dm11-sbt90/anduril.h b/hw/hank/noctigon-dm11/sbt90/anduril.h
index 8c0d1de..8c0d1de 100644
--- a/hw/hank/noctigon-dm11-sbt90/anduril.h
+++ b/hw/hank/noctigon-dm11/sbt90/anduril.h
diff --git a/hw/hank/noctigon-k1-boost/anduril.h b/hw/hank/noctigon-k1/boost/anduril.h
index e18a015..8d023a6 100644
--- a/hw/hank/noctigon-k1-boost/anduril.h
+++ b/hw/hank/noctigon-k1/boost/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0253"
-#include "hank/noctigon-k1-boost/hwdef.h"
+#include "hank/noctigon-k1/boost/hwdef.h"
 #include "hank/anduril.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/noctigon-k1-boost/hwdef.h b/hw/hank/noctigon-k1/boost/hwdef.h
index 1c6a06d..20bd47d 100644
--- a/hw/hank/noctigon-k1-boost/hwdef.h
+++ b/hw/hank/noctigon-k1/boost/hwdef.h
@@ -37,7 +37,7 @@
 #define ATTINY 1634
 #include <avr/io.h>
 
-#define HWDEF_C_FILE hank/noctigon-dm11-boost/hwdef.c
+#define HWDEF_C_FILE hank/noctigon-dm11/boost/hwdef.c
 
 // allow using aux LEDs as extra channel modes
 #include "fsm/chan-rgbaux.h"
diff --git a/hw/hank/noctigon-k1-sbt90/anduril.h b/hw/hank/noctigon-k1/sbt90/anduril.h
index 71541e0..4766ce7 100644
--- a/hw/hank/noctigon-k1-sbt90/anduril.h
+++ b/hw/hank/noctigon-k1/sbt90/anduril.h
@@ -5,7 +5,7 @@
 
 // (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/noctigon-k1/sbt90/hwdef.h"
 #include "hank/anduril.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/noctigon-k1-sbt90/hwdef.h b/hw/hank/noctigon-k1/sbt90/hwdef.h
index bdea32d..bdea32d 100644
--- a/hw/hank/noctigon-k1-sbt90/hwdef.h
+++ b/hw/hank/noctigon-k1/sbt90/hwdef.h
diff --git a/hw/hank/noctigon-k9.3-219/anduril.h b/hw/hank/noctigon-k9.3/219/anduril.h
index 3699277..3699277 100644
--- a/hw/hank/noctigon-k9.3-219/anduril.h
+++ b/hw/hank/noctigon-k9.3/219/anduril.h
diff --git a/hw/hank/noctigon-k9.3/anduril.h b/hw/hank/noctigon-k9.3/anduril.h
index 36a726d..ad63fa2 100644
--- a/hw/hank/noctigon-k9.3/anduril.h
+++ b/hw/hank/noctigon-k9.3/anduril.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #define MODEL_NUMBER "0261"
-#include "hank/emisar-2ch-fet/hwdef.h"
+#include "hank/emisar-2ch/fet/hwdef.h"
 #include "hank/anduril.h"
 // ATTINY: 1634
 
diff --git a/hw/hank/noctigon-k9.3-nofet/anduril.h b/hw/hank/noctigon-k9.3/nofet/anduril.h
index ab0dab6..ab0dab6 100644
--- a/hw/hank/noctigon-k9.3-nofet/anduril.h
+++ b/hw/hank/noctigon-k9.3/nofet/anduril.h
diff --git a/hw/hank/noctigon-kr4-219/anduril.h b/hw/hank/noctigon-kr4/219/anduril.h
index cd3e118..cd3e118 100644
--- a/hw/hank/noctigon-kr4-219/anduril.h
+++ b/hw/hank/noctigon-kr4/219/anduril.h
diff --git a/hw/hank/noctigon-kr4-219b/anduril.h b/hw/hank/noctigon-kr4/219b/anduril.h
index 9c113f9..9c113f9 100644
--- a/hw/hank/noctigon-kr4-219b/anduril.h
+++ b/hw/hank/noctigon-kr4/219b/anduril.h
diff --git a/hw/hank/noctigon-kr4-2ch/anduril.h b/hw/hank/noctigon-kr4/2ch/anduril.h
index 9ebeb0b..be7c4d0 100644
--- a/hw/hank/noctigon-kr4-2ch/anduril.h
+++ b/hw/hank/noctigon-kr4/2ch/anduril.h
@@ -6,7 +6,7 @@
 // (basically the same as Emisar generic 2-channel build,
 // but switch on a different pin, and no lighted button)
 // ATTINY: 1634
-#include "hank/noctigon-kr4-2ch/hwdef.h"
+#include "hank/noctigon-kr4/2ch/hwdef.h"
 #include "hank/emisar-2ch/anduril.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0215"
diff --git a/hw/hank/noctigon-kr4-2ch/hwdef.h b/hw/hank/noctigon-kr4/2ch/hwdef.h
index 081fccc..081fccc 100644
--- a/hw/hank/noctigon-kr4-2ch/hwdef.h
+++ b/hw/hank/noctigon-kr4/2ch/hwdef.h
diff --git a/hw/hank/noctigon-kr4-boost/anduril.h b/hw/hank/noctigon-kr4/boost/anduril.h
index f0c5b92..a3b33ee 100644
--- a/hw/hank/noctigon-kr4-boost/anduril.h
+++ b/hw/hank/noctigon-kr4/boost/anduril.h
@@ -7,8 +7,8 @@
 // the only things different from dm11-boost are:
 // - e-switch is on a different pin (defined in hwdef)
 // - different model number
-#include "hank/noctigon-dm11-boost/anduril.h"
-#include "hank/noctigon-kr4-boost/hwdef.h"
+#include "hank/noctigon-dm11/boost/anduril.h"
+#include "hank/noctigon-kr4/boost/hwdef.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0216"
 #include "hank/anduril.h"
diff --git a/hw/hank/noctigon-kr4-boost/hwdef.h b/hw/hank/noctigon-kr4/boost/hwdef.h
index 1ee2627..f17d263 100644
--- a/hw/hank/noctigon-kr4-boost/hwdef.h
+++ b/hw/hank/noctigon-kr4/boost/hwdef.h
@@ -37,7 +37,7 @@
  * not to change brightness.
  */
 
-#include "hank/noctigon-dm11-boost/hwdef.h"
+#include "hank/noctigon-dm11/boost/hwdef.h"
 
 // e-switch is on a different pin
 #undef SWITCH_PIN
diff --git a/hw/hank/noctigon-kr4-nofet/anduril.h b/hw/hank/noctigon-kr4/nofet/anduril.h
index 0198e33..10c0bf8 100644
--- a/hw/hank/noctigon-kr4-nofet/anduril.h
+++ b/hw/hank/noctigon-kr4/nofet/anduril.h
@@ -5,7 +5,7 @@
 
 // (and Noctigon KR1)
 // (and Emisar D4v2 E21A, a.k.a. "D4v2.5")
-#define HWDEF_C_FILE hank/noctigon-kr4-nofet/hwdef.c
+#define HWDEF_C_FILE hank/noctigon-kr4/nofet/hwdef.c
 #include "hank/noctigon-kr4/anduril.h"
 #undef MODEL_NUMBER
 #define MODEL_NUMBER "0212"
diff --git a/hw/hank/noctigon-kr4-nofet/hwdef.c b/hw/hank/noctigon-kr4/nofet/hwdef.c
index 783eeed..783eeed 100644
--- a/hw/hank/noctigon-kr4-nofet/hwdef.c
+++ b/hw/hank/noctigon-kr4/nofet/hwdef.c
diff --git a/hw/lumintop/fw3a-219/anduril.h b/hw/lumintop/fw3a/219/anduril.h
index 86b0976..86b0976 100644
--- a/hw/lumintop/fw3a-219/anduril.h
+++ b/hw/lumintop/fw3a/219/anduril.h
diff --git a/hw/lumintop/fw3a-nofet/anduril.h b/hw/lumintop/fw3a/nofet/anduril.h
index 0559418..0559418 100644
--- a/hw/lumintop/fw3a-nofet/anduril.h
+++ b/hw/lumintop/fw3a/nofet/anduril.h
diff --git a/hw/wurkkos/ts10-rgbaux/anduril.h b/hw/wurkkos/ts10/rgbaux/anduril.h
index e4ff8ff..e4ff8ff 100644
--- a/hw/wurkkos/ts10-rgbaux/anduril.h
+++ b/hw/wurkkos/ts10/rgbaux/anduril.h