Fix bug: Sd card not detected on boards usign SPI based SD cards

gloomyandy · Sep 5, 2023 · 2f11b13 · 2f11b13
1 parent f09226a
commit 2f11b13
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/WHATS_NEW_UNIFIED.md b/WHATS_NEW_UNIFIED.md
@@ -1,3 +1,7 @@
+Version 3.5.0-rc.1+101
+======================
+* Fix bug: SD card not detected on boards using SPI based SD cards
+
 Version 3.5.0-rc.1+101
 ======================
 * Duet3d 3.5.0-rc.1
@@ -16,7 +20,7 @@ Version 3.5.0-beta.4+104
 * Added support for TMC2240 drivers in SPI mode
 * Return actual driver temperature if available (experimental)
 * Allow access to individual driver temperatures (experimental)
-* Add DriverType to board.txt to allow arbitary driver order
+* Add DriverType to board.txt to allow arbitrary driver order
 
 Version 3.5.0-beta.4_101
 ========================

diff --git a/src/Hardware/STM32/BoardConfig.cpp b/src/Hardware/STM32/BoardConfig.cpp
@@ -272,6 +272,8 @@ static void ClearConfig() noexcept
     ATX_INITIAL_POWER_ON = true;
     SdSpiCSPins[0] = PA_4;
     SdCardDetectPins[0] = NoPin;
+    SdSpiCSPins[1] = NoPin;
+    SdCardDetectPins[1] = NoPin;
     ExternalSDCardFrequency = 4000000;
     ExternalSDCardSSPChannel = SSPNONE;
     InternalSDCardFrequency = 25000000;

diff --git a/src/Hardware/STM32/Pins_STM32.cpp b/src/Hardware/STM32/Pins_STM32.cpp
@@ -18,7 +18,7 @@ bool ATX_INITIAL_POWER_ON;                  // Should external power be on/off a
 bool ATX_POWER_STATE = true;                // We may not have an actual pin so use this to track state
 
 //SDCard pins and settings
-Pin SdCardDetectPins[NumSdCards];
+Pin SdCardDetectPins[NumSdCards] = {NoPin, NoPin};
 Pin SdSpiCSPins[NumSdCards];                // Internal, external. Note:: ("slot" 0 in CORE is configured to be LCP SSP1 to match default RRF behaviour)
 uint32_t ExternalSDCardFrequency;           //default to 4MHz
 SSPChannel ExternalSDCardSSPChannel;        // Off by default

diff --git a/src/Version.h b/src/Version.h
@@ -10,7 +10,7 @@
 
 #ifndef VERSION
 // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
-# define MAIN_VERSION	"3.5.0-rc.1+101"
+# define MAIN_VERSION	"3.5.0-rc.1+102"
 # ifdef USE_CAN0
 #  define VERSION_SUFFIX	"(CAN0)"
 # else