Fix ARDUINO_AS_MBED_LIBRARY usage

Author: facchinm

.mbedignore

@@ -0,0 +1,9 @@
+cores/arduino/mbed/*
+cores/arduino/api/Stream.h
+cores/arduino/api/deprecated/Stream.h
+cores/arduino/main.cpp
+variants/*mbed_config.h
+variants/E*
+variants/M*
+libraries/micro*
+libraries/WiFi*

cores/arduino/Arduino.h

@@ -28,22 +28,19 @@
 #undef F
 #endif // F (mbed included after arduino.h)
 #define F Mbed_F
+#endif // !ARDUINO_AS_MBED_LIBRARY
 #include "mbed.h"
 #undef PinMode
 #undef F
-#endif // !ARDUINO_AS_MBED_LIBRARY
 #endif //__cplusplus
 
 #if defined(ARDUINO_AS_MBED_LIBRARY)
 #define PinMode ArduinoPinMode
+#define Arduino_F F
 #endif
 
 #include "api/ArduinoAPI.h"
 
-#if defined(ARDUINO_AS_MBED_LIBRARY)
-#undef PinMode
-#endif
-
 #if defined(__cplusplus)
 #if !defined(ARDUINO_AS_MBED_LIBRARY)
 using namespace arduino;

cores/arduino/wiring_analog.cpp

@@ -47,6 +47,9 @@ void analogWrite(PinName pin, int val)
     pwm = new mbed::PwmOut(pin);
     digitalPinToPwmObj(pin) = pwm;
   }
+#else
+  // attention: this leaks badly
+  mbed::PwmOut* pwm = new mbed::PwmOut(digitalPinToPinName(pin));
 #endif
   pwm->write(percent);
 }
@@ -60,8 +63,8 @@ void analogWrite(pin_size_t pin, int val)
     pwm = new mbed::PwmOut(digitalPinToPinName(pin));
     digitalPinToPwmObj(pin) = pwm;
   }
-#endif
   pwm->write(percent);
+#endif
 }
 
 void analogWriteResolution(int bits)

libraries/SPI/SPI.cpp

@@ -57,9 +57,13 @@ void arduino::MbedSPI::end() {
     }
 }
 
+#if !defined(ARDUINO_AS_MBED_LIBRARY)
+
 #if DEVICE_SPI > 0
 arduino::MbedSPI SPI(SPI_MISO, SPI_MOSI, SPI_SCK);
 #endif
 #if DEVICE_SPI > 1
 arduino::MbedSPI SPI1(SPI_MISO1, SPI_MOSI1, SPI_SCK1);
+#endif
+
 #endif

libraries/SPI/SPI.h

@@ -1,7 +1,11 @@
 #pragma once
 
 #include "Arduino.h"
+#if !defined(ARDUINO_AS_MBED_LIBRARY)
 #include "drivers/SPIMaster.h"
+#else
+#include "drivers/SPI.h"
+#endif
 
 namespace arduino {
 
@@ -36,9 +40,13 @@ class MbedSPI : public SPIClass
 
 }
 
+#if !defined(ARDUINO_AS_MBED_LIBRARY)
+
 #if DEVICE_SPI > 0
 extern arduino::MbedSPI SPI;
 #endif
 #if DEVICE_SPI > 1
 extern arduino::MbedSPI SPI1;
 #endif
+
+#endif

mbed_lib.json

@@ -0,0 +1,7 @@
+{
+	"name": "arduino",
+	"macros": [
+		"ARDUINO_AS_MBED_LIBRARY",
+		"USE_ARDUINO_PINOUT"
+	]
+}

variants/ARDUINO_NANO33BLE/variant.cpp

@@ -85,7 +85,7 @@ void initVariant() {
 
 #ifdef SERIAL_CDC
 #include "CDC.h"
-CDC SerialUSB;
+arduino::CDC SerialUSB;
 
 static void utox8(uint32_t val, uint8_t* s) {
   for (int i = 0; i < 16; i=i+2) {