Provide PinName overloads for Wire and SPI constructors

Author: facchinm

libraries/SPI/SPI.cpp

@@ -33,7 +33,13 @@ struct _mbed_spi {
 };
 
 
-arduino::MbedSPI::MbedSPI(int miso, int mosi, int sck) : _miso(miso), _mosi(mosi), _sck(sck) {
+arduino::MbedSPI::MbedSPI(int miso, int mosi, int sck) :
+  _miso(digitalPinToPinName(miso)), _mosi(digitalPinToPinName(mosi)), _sck(digitalPinToPinName(sck)) {
+
+}
+
+arduino::MbedSPI::MbedSPI(PinName miso, PinName mosi, PinName sck) : _miso(miso), _mosi(mosi), _sck(sck) {
+
 }
 
 uint8_t arduino::MbedSPI::transfer(uint8_t data) {
@@ -95,7 +101,7 @@ void arduino::MbedSPI::begin() {
       dev->obj = NULL;
     }
     if (dev->obj == NULL) {
-      dev->obj = new mbed::SPI((PinName)_mosi, (PinName)_miso, (PinName)_sck);
+      dev->obj = new mbed::SPI(_mosi, _miso, _sck);
     }
 }
 

libraries/SPI/SPI.h

@@ -29,6 +29,7 @@ class MbedSPI : public SPIClass
 {
 public:
     MbedSPI(int miso, int mosi, int sck);
+    MbedSPI(PinName miso, PinName mosi, PinName sck);
     virtual uint8_t transfer(uint8_t data);
     virtual uint16_t transfer16(uint16_t data);
     virtual void transfer(void *buf, size_t count);
@@ -49,9 +50,9 @@ class MbedSPI : public SPIClass
 private:
     SPISettings settings = SPISettings(0, MSBFIRST, SPI_MODE0);
     _mbed_spi* dev = NULL;
-    int _miso;
-    int _mosi;
-    int _sck;
+    PinName _miso;
+    PinName _mosi;
+    PinName _sck;
 };
 
 }

libraries/Wire/Wire.cpp

@@ -23,10 +23,12 @@
 #include "Wire.h"
 #include "pinDefinitions.h"
 
-arduino::MbedI2C::MbedI2C(int sda, int scl) : _sda(sda), _scl(scl), usedTxBuffer(0) {}
+arduino::MbedI2C::MbedI2C(int sda, int scl) : _sda(digitalPinToPinName(sda)), _scl(digitalPinToPinName(scl)), usedTxBuffer(0) {}
+
+arduino::MbedI2C::MbedI2C(PinName sda, PinName scl) : _sda(sda), _scl(scl), usedTxBuffer(0) {}
 
 void arduino::MbedI2C::begin() {
-	master = new mbed::I2C((PinName)_sda, (PinName)_scl);
+	master = new mbed::I2C(_sda, _scl);
 }
 
 void arduino::MbedI2C::begin(uint8_t slaveAddr) {

libraries/Wire/Wire.h

@@ -35,6 +35,7 @@ class MbedI2C : public HardwareI2C
 {
   public:
     MbedI2C(int sda, int scl);
+    MbedI2C(PinName sda, PinName scl);
     virtual void begin();
     #ifndef DEVICE_I2CSLAVE
     virtual void __attribute__ ((error("I2C Slave mode is not supported"))) begin(uint8_t address);
@@ -72,8 +73,8 @@ class MbedI2C : public HardwareI2C
     mbed::I2CSlave* slave = NULL;
 #endif
     mbed::I2C*      master = NULL;
-    int _sda;
-    int _scl;
+    PinName _sda;
+    PinName _scl;
     int _address;
     RingBufferN<256> rxBuffer;
     uint8_t txBuffer[256];