Bugfix/desmakers 4316 spi normal pins 11 12 13 not functioning on xmc4700 relax kit (#325)

* fix: do not swap the spi default and SD card, only change the default pin

* fix: refactor SD card functionality

Author: LinjingZhang

libraries/SPI/src/HW_SPI.cpp

@@ -29,24 +29,18 @@
 
     // swap SPI_default and SPI_for_xmc_SD if desired by user
     #if defined(USE_XMC_RELAX_KIT_SD) && defined(XMC_SPI_for_xmc_SD)
-SPIClass SPI(&XMC_SPI_for_xmc_SD);
-        #if (NUM_SPI > 1)
-SPIClass SPI1(&XMC_SPI_default);
-        #endif
-uint8_t SS = PIN_SPI_SS_SD;
-uint8_t MOSI = PIN_SPI_MOSI_SD;
-uint8_t MISO = PIN_SPI_MISO_SD;
-uint8_t SCK = PIN_SPI_SCK_SD;
+SPIClass SPI(&XMC_SPI_default);
+SPIClass SPI1(&XMC_SPI_for_xmc_SD);
     #else // normal behaviour
 SPIClass SPI(&XMC_SPI_default);
         #if (NUM_SPI > 1)
 SPIClass SPI1(&XMC_SPI_1);
         #endif
+    #endif
 uint8_t SS = PIN_SPI_SS;
 uint8_t MOSI = PIN_SPI_MOSI;
 uint8_t MISO = PIN_SPI_MISO;
 uint8_t SCK = PIN_SPI_SCK;
-    #endif
 
     #if (NUM_SPI > 2)
 SPIClass SPI2(&XMC_SPI_2);

variants/XMC4700/config/XMC4700_Relax_Kit/pins_arduino.h

@@ -63,6 +63,7 @@ extern const uint8_t NUM_ANALOG_OUTPUTS;
 
 // to use SPI_for_xmc_SD if desired by user
 #define XMC_SPI_for_xmc_SD XMC_SPI_1
+#define SDCARD_SPI SPI1
 
 // Indicate unit has RTC/Alarm
 #define HAS_RTC 1
@@ -86,15 +87,15 @@ extern uint8_t MOSI;
 extern uint8_t MISO;
 extern uint8_t SCK;
 
-#define PIN_SPI_SS_SD 26
-#define PIN_SPI_MOSI_SD 27
-#define PIN_SPI_MISO_SD 28
-#define PIN_SPI_SCK_SD 29
+#define SDCARD_SS_PIN 26
+#define SDCARD_MOSI_PIN 27
+#define SDCARD_MISO_PIN 28
+#define SDCARD_SCK_PIN 29
 
-static const uint8_t SS_SD = PIN_SPI_SS_SD;
-static const uint8_t MOSI_SD = PIN_SPI_MOSI_SD;
-static const uint8_t MISO_SD = PIN_SPI_MISO_SD;
-static const uint8_t SCK_SD = PIN_SPI_SCK_SD;
+static const uint8_t SS_SD = SDCARD_SS_PIN;
+static const uint8_t MOSI_SD = SDCARD_MOSI_PIN;
+static const uint8_t MISO_SD = SDCARD_MISO_PIN;
+static const uint8_t SCK_SD = SDCARD_SCK_PIN;
 
 // XMC_I2S defines
 /*U2C0*/