Merge pull request #25 from ponoor/develop

Patch for Arduino-core SAMD 1.8.13
ponoor · Sep 29, 2022 · 09aa994 · 09aa994
2 parents 15bb4be + d31003f
commit 09aa994
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/boardsDef.h b/src/boardsDef.h
@@ -33,7 +33,7 @@
 // #define MZERO_WITH_ZERO_BOOTLOADER
 
 // Common version number
-const uint8_t firmwareVersion[3] = {1,2,4};
+const uint8_t firmwareVersion[3] = {1,2,5};
 
 #ifdef STEP400_R1
     #define PRODUCT_NAME    "STEP400"

diff --git a/src/loadConfig.cpp b/src/loadConfig.cpp
@@ -11,7 +11,7 @@ void loadConfig() {
     configFileParseSucceeded = false;
     DynamicJsonDocument doc(8192);
 #else
-    #ifdef SD_DETECT_PIN
+    #ifdef PIN_SD_DETECT
     if (digitalRead(PIN_SD_DETECT) == LOW)
     #endif
     {

diff --git a/src/main.cpp b/src/main.cpp
@@ -23,7 +23,7 @@
 
 const String productName = PRODUCT_NAME;
 const char *firmwareName = FIRMWARE_NAME;
-SPIClass driverSPI(&DRIVER_SERCOM, PIN_DRIVER_MISO, PIN_DRIVER_SCK, PIN_DRIVER_MOSI, PAD_DRIVER_SPI, PAD_DRIVER_RX);
+SPIClassSAMD driverSPI(&DRIVER_SERCOM, PIN_DRIVER_MISO, PIN_DRIVER_SCK, PIN_DRIVER_MOSI, PAD_DRIVER_SPI, PAD_DRIVER_RX);
 
 // Servo mode
 constexpr auto position_tolerance = 0; // steps
@@ -47,7 +47,7 @@ void setup()
 
 #ifdef HAVE_SD
     pinMode(PIN_SD_CS, OUTPUT);
-#ifdef SD_DETECT_PIN
+#ifdef PIN_SD_DETECT
     pinMode(PIN_SD_DETECT, INPUT_PULLUP);
 #endif
 #endif

diff --git a/step-series-universal-firmware/boardsDef.h b/step-series-universal-firmware/boardsDef.h
@@ -33,7 +33,7 @@
 // #define MZERO_WITH_ZERO_BOOTLOADER
 
 // Common version number
-const uint8_t firmwareVersion[3] = {1,2,4};
+const uint8_t firmwareVersion[3] = {1,2,5};
 
 #ifdef STEP400_R1
     #define PRODUCT_NAME    "STEP400"

diff --git a/step-series-universal-firmware/loadConfig.cpp b/step-series-universal-firmware/loadConfig.cpp
@@ -11,7 +11,7 @@ void loadConfig() {
     configFileParseSucceeded = false;
     DynamicJsonDocument doc(8192);
 #else
-    #ifdef SD_DETECT_PIN
+    #ifdef PIN_SD_DETECT
     if (digitalRead(PIN_SD_DETECT) == LOW)
     #endif
     {

diff --git a/step-series-universal-firmware/step-series-universal-firmware.ino b/step-series-universal-firmware/step-series-universal-firmware.ino
@@ -23,7 +23,7 @@
 
 const String productName = PRODUCT_NAME;
 const char *firmwareName = FIRMWARE_NAME;
-SPIClass driverSPI(&DRIVER_SERCOM, PIN_DRIVER_MISO, PIN_DRIVER_SCK, PIN_DRIVER_MOSI, PAD_DRIVER_SPI, PAD_DRIVER_RX);
+SPIClassSAMD driverSPI(&DRIVER_SERCOM, PIN_DRIVER_MISO, PIN_DRIVER_SCK, PIN_DRIVER_MOSI, PAD_DRIVER_SPI, PAD_DRIVER_RX);
 
 // Servo mode
 constexpr auto position_tolerance = 0; // steps
@@ -47,7 +47,7 @@ void setup()
 
 #ifdef HAVE_SD
     pinMode(PIN_SD_CS, OUTPUT);
-#ifdef SD_DETECT_PIN
+#ifdef PIN_SD_DETECT
     pinMode(PIN_SD_DETECT, INPUT_PULLUP);
 #endif
 #endif