From 94ba77de5c2c4bf8df3f23ac9ab397a360a75e69 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 3 Nov 2018 18:55:31 -0600
Subject: Made it easier to override hwdef-*.h values in cfg-*.h files.

---
 hwdef-FF_PL47.h | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'hwdef-FF_PL47.h')

diff --git a/hwdef-FF_PL47.h b/hwdef-FF_PL47.h
index 4189220..217ce45 100644
--- a/hwdef-FF_PL47.h
+++ b/hwdef-FF_PL47.h
@@ -1,24 +1,23 @@
 /* Fireflies PL47 driver layout
+ * same as a D4S, basically, except ...
  */
-// same as a D4S, basically
-#include "hwdef-Emisar_D4S.h"
-#undef FSM_EMISAR_D4S_DRIVER
-#undef FSM_EMISAR_D4_DRIVER
 
-// ... except the PL47 has aux LEDs on pin 7
-#ifdef AUXLED_PIN
-#undef AUXLED_PIN
-#endif
+// ... the PL47 has aux LEDs on pin 7
+#ifndef AUXLED_PIN
 #define AUXLED_PIN   PB2    // pin 7
+#endif
 
 // ... and switch LEDs on pin 3
-#ifdef AUXLED2_PIN
-#undef AUXLED2_PIN
-#endif
+#ifndef AUXLED2_PIN
 #define AUXLED2_PIN   PB4    // pin 3
-
-// average drop across diode on this hardware
-#ifdef VOLTAGE_FUDGE_FACTOR
-#undef VOLTAGE_FUDGE_FACTOR
 #endif
+
+// ... and slightly different calibration
+#ifndef VOLTAGE_FUDGE_FACTOR
 #define VOLTAGE_FUDGE_FACTOR 7  // add 0.35V
+#endif
+
+#include "hwdef-Emisar_D4S.h"
+#undef FSM_EMISAR_D4S_DRIVER
+#undef FSM_EMISAR_D4_DRIVER
+
-- 
cgit v1.2.3