aboutsummaryrefslogtreecommitdiff
path: root/hwdef-FF_PL47.h
diff options
context:
space:
mode:
authorSelene ToyKeeper2018-11-16 00:30:01 -0700
committerSelene ToyKeeper2018-11-16 00:30:01 -0700
commit07eaddd4eee9756ac2ec3054e768d160037832f7 (patch)
tree7f15d8741411a8486d394482fbf87583b5587be9 /hwdef-FF_PL47.h
parentmerged flash-safer branch (clean up flash/build scripts and make flashing les... (diff)
parentMade event definitions a little cleaner. (diff)
downloadanduril-07eaddd4eee9756ac2ec3054e768d160037832f7.tar.gz
anduril-07eaddd4eee9756ac2ec3054e768d160037832f7.tar.bz2
anduril-07eaddd4eee9756ac2ec3054e768d160037832f7.zip
merged recent fsm branch updates
Diffstat (limited to 'hwdef-FF_PL47.h')
-rw-r--r--hwdef-FF_PL47.h29
1 files changed, 14 insertions, 15 deletions
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
+