Decouple Wire/SPI singletons from mbed definitions

Author: facchinm

libraries/SPI/SPI.cpp

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

libraries/SPI/SPI.h

@@ -60,10 +60,10 @@ class MbedSPI : public SPIClass
 
 #if !defined(ARDUINO_AS_MBED_LIBRARY)
 
-#if DEVICE_SPI > 0
+#if SPI_HOWMANY > 0
 extern arduino::MbedSPI SPI;
 #endif
-#if DEVICE_SPI > 1
+#if SPI_HOWMANY > 1
 extern arduino::MbedSPI SPI1;
 #endif
 

libraries/Wire/Wire.cpp

@@ -123,9 +123,9 @@ void arduino::MbedI2C::onReceive(void(*)(int)) {}
 void arduino::MbedI2C::onRequest(void(*)(void)) {}
 
 
-#if DEVICE_I2C > 0
+#if WIRE_HOWMANY > 0
 arduino::MbedI2C Wire(I2C_SDA, I2C_SCL);
 #endif
-#if DEVICE_I2C > 1
+#if WIRE_HOWMANY > 1
 arduino::MbedI2C Wire1(I2C_SDA1, I2C_SCL1);;
 #endif

libraries/Wire/Wire.h

@@ -67,10 +67,10 @@ class MbedI2C : public HardwareI2C
 
 }
 
-#if DEVICE_I2C > 0
+#if WIRE_HOWMANY > 0
 extern arduino::MbedI2C Wire;
 #endif
-#if DEVICE_I2C > 1
+#if WIRE_HOWMANY > 1
 extern arduino::MbedI2C Wire1;
 #endif
 

variants/ARDUINO_NANO33BLE/pins_arduino.h

@@ -123,11 +123,15 @@ static const uint8_t SCK  = PIN_SPI_SCK;
 
 #define DFU_MAGIC_SERIAL_ONLY_RESET   0xb0
 
+#define WIRE_HOWMANY		2
+
 #define I2C_SDA				(digitalPinToPinName(PIN_WIRE_SDA))
 #define I2C_SCL				(digitalPinToPinName(PIN_WIRE_SCL))
 #define I2C_SDA1			(digitalPinToPinName(PIN_WIRE_SDA1))
 #define I2C_SCL1			(digitalPinToPinName(PIN_WIRE_SCL1))
 
+#define SPI_HOWMANY			1
+
 #define SPI_MISO			(digitalPinToPinName(PIN_SPI_MISO))
 #define SPI_MOSI			(digitalPinToPinName(PIN_SPI_MOSI))
 #define SPI_SCK				(digitalPinToPinName(PIN_SPI_SCK))