Fix pins.

Former-commit-id: 6b69e30

Author: h2zero

cores/nRF5/wiring_digital.c

@@ -31,6 +31,8 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
     return;
   }
 
+  ulPin = g_ADigitalPinMap[ulPin];
+
   // Set pin mode according to chapter '22.6.3 I/O Pin Configuration'
   switch ( ulMode )
   {
@@ -66,6 +68,8 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
     return;
   }
 
+  ulPin = g_ADigitalPinMap[ulPin];
+
   if (ulVal == LOW) {
       nrf_gpio_pin_clear(ulPin);
   } else {
@@ -81,16 +85,23 @@ int digitalRead( uint32_t ulPin )
     return 0;
   }
 
+  ulPin = g_ADigitalPinMap[ulPin];
+
   if (nrf_gpio_pin_dir_get(ulPin) == NRF_GPIO_PIN_DIR_INPUT) {
     return nrf_gpio_pin_read(ulPin);
   } else {
     return nrf_gpio_pin_out_read(ulPin);
   }
 }
 
-void digitalToggle( uint32_t pin )
+void digitalToggle( uint32_t ulPin )
 {
-  nrf_gpio_pin_toggle(pin);
+  if (ulPin >= PINS_COUNT) {
+    return;
+  }
+
+  ulPin = g_ADigitalPinMap[ulPin];
+  nrf_gpio_pin_toggle(ulPin);
 }
 
 #ifdef LED_STATE_ON

libraries/SPI/SPI.cpp

@@ -46,14 +46,12 @@ SPIClass::SPIClass(NRF_SPI_Type *p_spi, uint8_t uc_pinMISO, uint8_t uc_pinSCK, u
   _bitOrder = SPI_CONFIG_ORDER_MsbFirst;
 }
 
-#ifdef ARDUINO_GENERIC
 void SPIClass::setPins(uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI)
 {
   _uc_pinMiso = g_ADigitalPinMap[uc_pinMISO];
   _uc_pinSCK = g_ADigitalPinMap[uc_pinSCK];
   _uc_pinMosi = g_ADigitalPinMap[uc_pinMOSI];
 }
-#endif // ARDUINO_GENERIC
 
 void SPIClass::begin()
 {

libraries/SPI/SPI.h

@@ -100,9 +100,8 @@ class SPIClass {
   void attachInterrupt();
   void detachInterrupt();
 
-#ifdef ARDUINO_GENERIC
   void setPins(uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI);
-#endif // ARDUINO_GENERIC
+
   void begin();
   void end();
 

libraries/Wire/Wire.h

@@ -39,9 +39,7 @@ class TwoWire : public Stream
 #else
     TwoWire(NRF_TWI_Type * p_twi, uint8_t pinSDA, uint8_t pinSCL);
 #endif
-#ifdef ARDUINO_GENERIC
     void setPins(uint8_t pinSDA, uint8_t pinSCL);
-#endif // ARDUINO_GENERIC
     void begin();
 #if defined(NRF52_SERIES)
     void begin(uint8_t);

libraries/Wire/Wire_nRF51.cpp

@@ -41,13 +41,11 @@ TwoWire::TwoWire(NRF_TWI_Type * p_twi, uint8_t pinSDA, uint8_t pinSCL)
   this->suspended = false;
 }
 
-#ifdef ARDUINO_GENERIC
 void TwoWire::setPins(uint8_t pinSDA, uint8_t pinSCL)
 {
   this->_uc_pinSDA = pinSDA;
   this->_uc_pinSCL = pinSCL;
 }
-#endif // ARDUINO_GENERIC
 
 void TwoWire::begin(void) {
   //Master Mode

libraries/Wire/Wire_nRF52.cpp

@@ -41,13 +41,11 @@ TwoWire::TwoWire(NRF_TWIM_Type * p_twim, NRF_TWIS_Type * p_twis, IRQn_Type IRQn,
   transmissionBegun = false;
 }
 
-#ifdef ARDUINO_GENERIC
 void TwoWire::setPins(uint8_t pinSDA, uint8_t pinSCL)
 {
   this->_uc_pinSDA = pinSDA;
   this->_uc_pinSCL = pinSCL;
 }
-#endif // ARDUINO_GENERIC
 
 void TwoWire::begin(void) {
   //Master Mode