use SPIM3 & SPIM2 for SPI, I2C will use SPIM0/SPIM1

Author: hathach

cores/nRF5/nordic/nrfx_config.h

@@ -11,7 +11,7 @@
 #define NRFX_SPIM_EXTENDED_ENABLED   0
 
 #define NRFX_SPIM0_ENABLED           0 // used as I2C
-#define NRFX_SPIM1_ENABLED           1
+#define NRFX_SPIM1_ENABLED           0 // used as I2C
 #define NRFX_SPIM2_ENABLED           1
 
 #ifdef NRF52840_XXAA

libraries/SPI/SPI.cpp

@@ -31,24 +31,36 @@ SPIClass::SPIClass(NRF_SPIM_Type *p_spi, uint8_t uc_pinMISO, uint8_t uc_pinSCK,
 
   _spim.p_reg = p_spi;
 
-  // NRF_SPIM0 is used for I2C
+  // SPIM0 & SPIM1 are used for I2C
+#if NRFX_SPIM0_ENABLED
+  if ( NRF_SPIM0 == p_spi ) {
+    _spim.drv_inst_idx = NRFX_SPIM0_INST_IDX;
+  }
+#endif
+
+#if NRFX_SPIM1_ENABLED
   if ( NRF_SPIM1 == p_spi ) {
     _spim.drv_inst_idx = NRFX_SPIM1_INST_IDX;
-  } else if ( NRF_SPIM2 == p_spi ) {
+  }
+#endif
+
+  if ( NRF_SPIM2 == p_spi ) {
     _spim.drv_inst_idx = NRFX_SPIM2_INST_IDX;
-  } else {
-#ifdef NRF52840_XXAA
+  }
+
+#if NRFX_SPIM3_ENABLED
+  if ( NRF_SPIM3 == p_spi ) {
     _spim.drv_inst_idx = NRFX_SPIM3_INST_IDX;
-#endif
   }
+#endif
 
   // pins
   _uc_pinMiso = g_ADigitalPinMap[uc_pinMISO];
   _uc_pinSCK = g_ADigitalPinMap[uc_pinSCK];
   _uc_pinMosi = g_ADigitalPinMap[uc_pinMOSI];
 
   _dataMode = SPI_MODE0;
-  _bitOrder = SPI_CONFIG_ORDER_MsbFirst;
+  _bitOrder = NRF_SPIM_BIT_ORDER_MSB_FIRST;
 }
 
 void SPIClass::begin()
@@ -119,7 +131,7 @@ void SPIClass::setDataMode(uint8_t mode)
   nrf_spim_configure(_spim.p_reg, (nrf_spim_mode_t) _dataMode, (nrf_spim_bit_order_t) _bitOrder);
 }
 
-void SPIClass::setClockDivider(uint8_t div)
+void SPIClass::setClockDivider(uint32_t div)
 {
   nrf_spim_frequency_t clockFreq;
 
@@ -214,17 +226,19 @@ void SPIClass::detachInterrupt() {
   // Should be disableInterrupt()
 }
 
-// SPIM0 is used as I2C
-
-#if SPI_INTERFACES_COUNT > 0
-  #ifdef NRF52840_XXAA
+// SPIM0, SPIM1 are configured as I2C
+#ifdef NRF52840_XXAA
+  #if SPI_INTERFACES_COUNT > 0
     // use SPIM3 for nrf52840 for highspeed 32Mhz
     SPIClass SPI(NRF_SPIM3,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI);
-  #else
-    SPIClass SPI(NRF_SPIM1,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI);
   #endif
-#endif
 
-#if SPI_INTERFACES_COUNT > 1
-SPIClass SPI1(NRF_SPIM2, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
+  #if SPI_INTERFACES_COUNT > 1
+    SPIClass SPI1(NRF_SPIM2, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI);
+  #endif
+
+#else
+    SPIClass SPI(NRF_SPIM2,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI);
+
 #endif
+

libraries/SPI/SPI.h

@@ -40,33 +40,25 @@
 
 class SPISettings {
   public:
-  SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) {
-    if (__builtin_constant_p(clock)) {
-      init_AlwaysInline(clock, bitOrder, dataMode);
-    } else {
-      init_MightInline(clock, bitOrder, dataMode);
+    SPISettings(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) {
+      this->clockFreq = clock;
+      this->bitOrder = bitOrder;
+      this->dataMode = dataMode;
     }
-  }
 
-  // Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first.
-  SPISettings() { init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0); }
+    // Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first.
+    SPISettings() {
+      this->clockFreq = 4000000;
+      this->bitOrder = MSBFIRST;
+      this->dataMode = SPI_MODE0;
+    }
 
   private:
-  void init_MightInline(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) {
-    init_AlwaysInline(clock, bitOrder, dataMode);
-  }
-
-  void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, uint8_t dataMode) __attribute__((__always_inline__)) {
-    this->clockFreq = clock;
-    this->bitOrder = bitOrder;
-    this->dataMode = dataMode;
-  }
-
-  uint32_t clockFreq;
-  uint8_t dataMode;
-  uint32_t bitOrder;
+    uint32_t clockFreq;
+    uint8_t  dataMode;
+    uint8_t  bitOrder;
 
-  friend class SPIClass;
+    friend class SPIClass;
 };
 
 class SPIClass {
@@ -92,7 +84,7 @@ class SPIClass {
 
     void setBitOrder(BitOrder order);
     void setDataMode(uint8_t uc_mode);
-    void setClockDivider(uint8_t uc_div);
+    void setClockDivider(uint32_t uc_div);
 
   private:
     nrfx_spim_t _spim;

variants/feather_nrf52832/variant.cpp

@@ -67,7 +67,6 @@ const uint32_t g_ADigitalPinMap[] = {
   29, // A5
   30, // A6
   31, // A7
-
 };
 
 void initVariant()