Fix F() macro inclusion issues

arduino · Jun 21, 2019 · 1c4c559 · 1c4c559
1 parent 8124313
commit 1c4c559
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
@@ -23,10 +23,16 @@
 #if defined(__cplusplus)
 #if !defined(ARDUINO_AS_MBED_LIBRARY)
 #define PinMode MbedPinMode
-#endif
+#ifdef F
+#define Arduino_F F
+#undef F
+#endif // F (mbed included after arduino.h)
+#define F Mbed_F
 #include "mbed.h"
 #undef PinMode
-#endif
+#undef F
+#endif // !ARDUINO_AS_MBED_LIBRARY
+#endif //__cplusplus
 
 #if defined(ARDUINO_AS_MBED_LIBRARY)
 #define PinMode ArduinoPinMode