Merge pull request #3062 from FoamyGuy/sd_excepts

update sd examples for 10.x behavior

Author: FoamyGuy

Metro_RP2350_Examples/CircuitPython_SDCard_ListFiles/code-cp10x.py

@@ -3,7 +3,6 @@
 
 """
 CircuitPython Essentials SD Card Read Demo
-* Not compatible with CircuitPython 10.x
 """
 
 import os
@@ -16,14 +15,28 @@
 # The SD_CS pin is the chip select line.
 SD_CS = board.SD_CS
 
-# Connect to the card and mount the filesystem.
-cs = digitalio.DigitalInOut(SD_CS)
-sdcard = adafruit_sdcard.SDCard(busio.SPI(board.SD_SCK, board.SD_MOSI, board.SD_MISO), cs)
-vfs = storage.VfsFat(sdcard)
-storage.mount(vfs, "/sd")
+# For CircuitPython 9.x we must initialize and mount the SD card manually.
+# On CircuitPython 10.x the core will automatically initialize and mount the SD.
+# This try/except block can be removed with 10.x has a stable release.
+try:
+    # Initialize the Chip Select pin for the SD card
+    cs = digitalio.DigitalInOut(SD_CS)
+    # Initialize the SD card
+    sdcard = adafruit_sdcard.SDCard(
+        busio.SPI(board.SD_SCK, board.SD_MOSI, board.SD_MISO), cs
+    )
+    # Mount the SD card
+    vfs = storage.VfsFat(sdcard)
+    storage.mount(vfs, "/sd")
+except ValueError:
+    # "ValueError SD_CS in use" error happen on CircuitPython 10.x
+    # because the core initialized the SD automatically. The error
+    # can be ignored on 10.x.
+    pass
 
 # Use the filesystem as normal! Our files are under /sd
 
+
 # This helper function will print the contents of the SD
 def print_directory(path, tabs=0):
     for file in os.listdir(path):

Metro_RP2350_Examples/CircuitPython_SDCard_ListFiles/code.py

@@ -4,12 +4,6 @@
 
 """
 CircuitPython Essentials SD Card Write Demo
-REMOVE THIS LINE AND ALL BELOW IT BEFORE SUBMITTING TO LEARN
-Update CHIP_SELECT_PIN to match the CS pin on your board.
-
-For example, for the Metro ESP32-S3, you would use: board.SD_CS.
-
-This code stops working with CircuitPython 10.x which automounts /sd
 """
 
 import time
@@ -23,11 +17,25 @@
 # The SD_CS pin is the chip select line.
 SD_CS = board.SD_CS
 
-# Connect to the card and mount the filesystem.
-cs = digitalio.DigitalInOut(SD_CS)
-sdcard = adafruit_sdcard.SDCard(busio.SPI(board.SD_SCK, board.SD_MOSI, board.SD_MISO), cs)
-vfs = storage.VfsFat(sdcard)
-storage.mount(vfs, "/sd")
+
+# For CircuitPython 9.x we must initialize and mount the SD card manually.
+# On CircuitPython 10.x the core will automatically initialize and mount the SD.
+# This try/except block can be removed with 10.x has a stable release.
+try:
+    # Initialize the Chip Select pin for the SD card
+    cs = digitalio.DigitalInOut(SD_CS)
+    # Initialize the SD card
+    sdcard = adafruit_sdcard.SDCard(
+        busio.SPI(board.SD_SCK, board.SD_MOSI, board.SD_MISO), cs
+    )
+    # Mount the SD card
+    vfs = storage.VfsFat(sdcard)
+    storage.mount(vfs, "/sd")
+except ValueError:
+    # "ValueError SD_CS in use" error happen on CircuitPython 10.x
+    # because the core initialized the SD automatically. The error
+    # can be ignored on 10.x.
+    pass
 
 # Use the filesystem as normal! Our files are under /sd