merged past 2 months of updates from fsm branch:

15 files changed, 79 insertions, 0 deletions

diff --git a/hwdef-BLF_GT.h b/hwdef-BLF_GT.h
index 7dcc8a0..01dbdbd 100644
--- a/hwdef-BLF_GT.h
+++ b/hwdef-BLF_GT.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_BLF_GT_H
+#define HWDEF_BLF_GT_H
+
 /* BLF GT driver layout
  *           ----
  *   Reset -|1  8|- VCC (unused)
@@ -52,3 +55,6 @@
 #define FAST 0xA3           // fast PWM both channels
 #define PHASE 0xA1          // phase-correct PWM both channels
 
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/hwdef-BLF_GT_Mini.h b/hwdef-BLF_GT_Mini.h
index aacbca4..43f74f3 100644
--- a/hwdef-BLF_GT_Mini.h
+++ b/hwdef-BLF_GT_Mini.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_BLF_GT_MINI_H
+#define HWDEF_BLF_GT_MINI_H
+
 /* BLF/Lumintop GT Mini driver layout
  */
 // exactly the same as a D1S, but with a lighted button
@@ -8,3 +11,4 @@
 #define AUXLED_PIN   PB4    // pin 3
 #endif
 
+#endif
diff --git a/hwdef-BLF_Q8.h b/hwdef-BLF_Q8.h
index 6e13faf..5dac5d2 100644
--- a/hwdef-BLF_Q8.h
+++ b/hwdef-BLF_Q8.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_BLF_Q8_H
+#define HWDEF_BLF_Q8_H
+
 /* BLF Q8 driver layout
  * Q8 driver is the same as a D4, basically
  */
@@ -15,3 +18,4 @@
 // Q8 driver is the same as a D4, basically
 #include "hwdef-Emisar_D4.h"
 
+#endif
diff --git a/hwdef-Emisar_D1.h b/hwdef-Emisar_D1.h
index 6df8705..caf1d4e 100644
--- a/hwdef-Emisar_D1.h
+++ b/hwdef-Emisar_D1.h
@@ -1,4 +1,9 @@
+#ifndef HWDEF_EMISAR_D1_H
+#define HWDEF_EMISAR_D1_H
+
 /* Emisar D1 driver layout
  */
 // D1 driver is exactly the same as a D4
 #include "hwdef-Emisar_D4.h"
+
+#endif
diff --git a/hwdef-Emisar_D1S.h b/hwdef-Emisar_D1S.h
index 31792c7..2e9fffa 100644
--- a/hwdef-Emisar_D1S.h
+++ b/hwdef-Emisar_D1S.h
@@ -1,4 +1,9 @@
+#ifndef HWDEF_EMISAR_D1S_H
+#define HWDEF_EMISAR_D1S_H
+
 /* Emisar D1S driver layout
  */
 // D1S driver is exactly the same as a D4
 #include "hwdef-Emisar_D4.h"
+
+#endif
diff --git a/hwdef-Emisar_D4.h b/hwdef-Emisar_D4.h
index 0dfcab9..be499f1 100644
--- a/hwdef-Emisar_D4.h
+++ b/hwdef-Emisar_D4.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_EMISAR_D4_H
+#define HWDEF_EMISAR_D4_H
+
 /* Emisar D4 driver layout
  *           ----
  *   Reset -|1  8|- VCC
@@ -7,6 +10,8 @@
  *           ----
  */
 
+#define LAYOUT_DEFINED
+
 #define PWM_CHANNELS 2
 
 //#define AUXLED_PIN   PB4    // pin 3
@@ -42,3 +47,4 @@
 #define FAST 0xA3           // fast PWM both channels
 #define PHASE 0xA1          // phase-correct PWM both channels
 
+#endif
diff --git a/hwdef-Emisar_D4S.h b/hwdef-Emisar_D4S.h
index 47ef1eb..05a60f9 100644
--- a/hwdef-Emisar_D4S.h
+++ b/hwdef-Emisar_D4S.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_EMISAR_D4S_H
+#define HWDEF_EMISAR_D4S_H
+
 /* Emisar D4S driver layout
  */
 // same as a D4, basically
@@ -8,3 +11,4 @@
 #define AUXLED_PIN   PB4    // pin 3
 #endif
 
+#endif
diff --git a/hwdef-FET_7135.h b/hwdef-FET_7135.h
index 58df7b2..c89d3ce 100644
--- a/hwdef-FET_7135.h
+++ b/hwdef-FET_7135.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_FET_7135_H
+#define HWDEF_FET_7135_H
+
 /* FET + 7135 driver layout
  *           ----
  *   Reset -|1  8|- VCC
@@ -30,3 +33,6 @@
 #define FAST 0xA3           // fast PWM both channels
 #define PHASE 0xA1          // phase-correct PWM both channels
 
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/hwdef-FF_PL47.h b/hwdef-FF_PL47.h
index 217ce45..5cd9684 100644
--- a/hwdef-FF_PL47.h
+++ b/hwdef-FF_PL47.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_FF_PL47_H
+#define HWDEF_FF_PL47_H
+
 /* Fireflies PL47 driver layout
  * same as a D4S, basically, except ...
  */
@@ -21,3 +24,4 @@
 #undef FSM_EMISAR_D4S_DRIVER
 #undef FSM_EMISAR_D4_DRIVER
 
+#endif
diff --git a/hwdef-FF_ROT66.h b/hwdef-FF_ROT66.h
index 0913a76..7348ab2 100644
--- a/hwdef-FF_ROT66.h
+++ b/hwdef-FF_ROT66.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_FF_ROT66_H
+#define HWDEF_FF_ROT66_H
+
 /* Fireflies ROT66 driver layout
  * same as a FW3A, basically, except ...
  */
@@ -19,3 +22,4 @@
 #undef VISION_PIN
 #endif
 
+#endif
diff --git a/hwdef-FW3A.h b/hwdef-FW3A.h
index 8abab9a..0b94635 100644
--- a/hwdef-FW3A.h
+++ b/hwdef-FW3A.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_FW3A_H
+#define HWDEF_FW3A_H
+
 /* BLF/TLF FW3A driver layout
  *           ----
  *   Reset -|1  8|- VCC
@@ -45,3 +48,6 @@
 #define FAST 0xA3           // fast PWM both channels
 #define PHASE 0xA1          // phase-correct PWM both channels
 
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/hwdef-Ferrero_Rocher.h b/hwdef-Ferrero_Rocher.h
index a46f19d..48519ef 100644
--- a/hwdef-Ferrero_Rocher.h
+++ b/hwdef-Ferrero_Rocher.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_FERRERO_ROCHER_H
+#define HWDEF_FERRERO_ROCHER_H
+
 /* Ferrero Rocher driver layout
  *            ----
  *    Reset -|1  8|- VCC
@@ -9,3 +12,7 @@
 // TODO: fill in this section, update Ferrero_Rocher code to use it.
 #define FAST 0x23           // fast PWM channel 1 only
 #define PHASE 0x21          // phase-correct PWM channel 1 only
+
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/hwdef-TK_Saber.h b/hwdef-TK_Saber.h
index e90d5dd..3f49d30 100644
--- a/hwdef-TK_Saber.h
+++ b/hwdef-TK_Saber.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_TK_SABER_H
+#define HWDEF_TK_SABER_H
+
 /* TK 4-color lightsaber driver layout
  *             ----
  *     Reset -|1  8|- VCC
@@ -31,3 +34,6 @@
 #define FAST        0xA3    // fast PWM both channels
 #define PHASE       0xA1    // phase-correct PWM both channels
 
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/hwdef-Tripledown.h b/hwdef-Tripledown.h
index 4676e69..6bde976 100644
--- a/hwdef-Tripledown.h
+++ b/hwdef-Tripledown.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_TRIPLEDOWN_H
+#define HWDEF_TRIPLEDOWN_H
+
 /* Tripledown driver layout
  *             ----
  *     Reset -|1  8|- VCC
@@ -31,3 +34,6 @@
 #define FAST 0xA3           // fast PWM both channels
 #define PHASE 0xA1          // phase-correct PWM both channels
 
+#define LAYOUT_DEFINED
+
+#endif
diff --git a/hwdef-nanjg.h b/hwdef-nanjg.h
index add10d1..135edbc 100644
--- a/hwdef-nanjg.h
+++ b/hwdef-nanjg.h
@@ -1,3 +1,6 @@
+#ifndef HWDEF_NANJG_H
+#define HWDEF_NANJG_H
+
 /* NANJG driver layout
  */
 #define STAR2_PIN   PB0
@@ -14,3 +17,6 @@
 #define FAST 0x23           // fast PWM channel 1 only
 #define PHASE 0x21          // phase-correct PWM channel 1 only
 
+#define LAYOUT_DEFINED
+
+#endif