Merge pull request #2191 from evaherrada/sdcardio

Moved to sdcardio

Author: dhalbert

Adafruit_Grand_Central_M4_Express/code.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 import time
-import adafruit_sdcard
+import sdcardio
 import microcontroller
 import board
 import busio
@@ -16,8 +16,7 @@
 
 # Connect to the card and mount the filesystem.
 spi = busio.SPI(board.SD_SCK, board.SD_MOSI, board.SD_MISO)
-cs = digitalio.DigitalInOut(board.SD_CS)
-sdcard = adafruit_sdcard.SDCard(spi, cs)
+sdcard = sdcardio.SDCard(spi, board.SD_CS)
 vfs = storage.VfsFat(sdcard)
 storage.mount(vfs, "/sd")
 

CircuitPython_JEplayer_mp3/code.py

@@ -39,7 +39,7 @@
 import adafruit_bitmap_font.bitmap_font
 import adafruit_display_text.label
 from adafruit_progressbar.progressbar import ProgressBar
-import adafruit_sdcard
+import sdcardio
 import analogjoy
 import audioio
 import audiomp3
@@ -317,8 +317,7 @@ def choose_folder(self, base='/sd'):
 def mount_sd():
     """Mount the SD card"""
     spi = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)
-    sd_cs = digitalio.DigitalInOut(board.SD_CS)
-    sdcard = adafruit_sdcard.SDCard(spi, sd_cs, baudrate=6000000)
+    sdcard = sdcardio.SDCard(spi, board.SD_CS)
     vfs = storage.VfsFat(sdcard)
     storage.mount(vfs, "/sd")
 

Data_Logging_with_Feather_and_CircuitPython/code.py

@@ -6,10 +6,8 @@
 
 import analogio
 import board
-import digitalio
 import storage
 import adafruit_am2320
-import adafruit_sdcard
 
 vbat_voltage = analogio.AnalogIn(board.D9)
 
@@ -18,8 +16,18 @@
 
 SD_CS = board.D10
 spi = board.SPI()
-cs = digitalio.DigitalInOut(SD_CS)
-sd_card = adafruit_sdcard.SDCard(spi, cs)
+
+try:
+    import sdcardio
+
+    sd_card = sdcardio.SDCard(spi, SD_CS)
+except ImportError:
+    import adafruit_sdcard
+    import digitalio
+
+    cs = digitalio.DigitalInOut(SD_CS)
+    sd_card = adafruit_sdcard.SDCard(spi, cs)
+
 vfs = storage.VfsFat(sd_card)
 storage.mount(vfs, "/sd_card")
 
@@ -45,10 +53,11 @@ def get_voltage(pin):
             print("Humidity:", humidity)
             print("VBat voltage: {:.2f}".format(battery_voltage))
             print()
-            sdc.write("{}, {}, {}, {:.2f}\n".format(
-                int(time_stamp), temperature,
-                humidity, battery_voltage)
-                     )
+            sdc.write(
+                "{}, {}, {}, {:.2f}\n".format(
+                    int(time_stamp), temperature, humidity, battery_voltage
+                )
+            )
         time.sleep(3)
     except OSError:
         pass

Disconnected_CO2_Data_Logger/code.py

@@ -4,9 +4,8 @@
 
 import time
 import board
-import digitalio
 import adafruit_scd4x
-import adafruit_sdcard
+import sdcardio
 import busio
 import storage
 import adafruit_pcf8523
@@ -27,8 +26,7 @@
 
 #  SPI setup for SD card
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-cs = digitalio.DigitalInOut(SD_CS)
-sdcard = adafruit_sdcard.SDCard(spi, cs)
+sdcard = sdcardio.SDCard(spi, SD_CS)
 vfs = storage.VfsFat(sdcard)
 try:
     storage.mount(vfs, "/sd")

EPROM_Emulator/code.py

@@ -33,7 +33,7 @@
 by Dave Astels
 """
 
-import adafruit_sdcard
+import sdcardio
 import adafruit_ssd1306
 import board
 import busio
@@ -78,8 +78,7 @@
 # SD_CS = board.D10
 # Connect to the card and mount the filesystem.
 spi = busio.SPI(board.D13, board.D11, board.D12)  # SCK, MOSI, MISO
-cs = digitalio.DigitalInOut(board.D10)
-sdcard = adafruit_sdcard.SDCard(spi, cs)
+sdcard = sdcardio.SDCard(spi, board.D10)
 vfs = storage.VfsFat(sdcard)
 storage.mount(vfs, "/sd")
 

Pulse_Oximeter_Logger/code.py

@@ -17,10 +17,9 @@
 # The sensor updates the readings at 100Hz.
 
 import time
-import adafruit_sdcard
+import sdcardio
 import board
 import busio
-import digitalio
 import storage
 import adafruit_pcf8523
 import _bleio
@@ -32,8 +31,7 @@
 # Logging setup
 SD_CS = board.D10
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-cs = digitalio.DigitalInOut(SD_CS)
-sd_card = adafruit_sdcard.SDCard(spi, cs)
+sd_card = sdcardio.SDCard(spi, SD_CS)
 vfs = storage.VfsFat(sd_card)
 storage.mount(vfs, "/sd_card")
 

PyPortal_ViewMaster/code.py

@@ -7,7 +7,7 @@
 import busio
 import digitalio
 import storage
-import adafruit_sdcard
+import sdcardio
 from adafruit_slideshow import PlayBackOrder, SlideShow, PlayBackDirection
 
 # Default location to look is in internal memory
@@ -18,9 +18,8 @@
 switch.pull = digitalio.Pull.UP
 
 spi = busio.SPI(board.SCK, MOSI=board.MOSI, MISO=board.MISO)
-cs = digitalio.DigitalInOut(board.SD_CS)
 try:
-    sdcard = adafruit_sdcard.SDCard(spi, cs)
+    sdcard = sdcardio.SDCard(spi, board.SD_CS)
     vfs = storage.VfsFat(sdcard)
     storage.mount(vfs, "/sd")
     IMAGE_DIRECTORY = "/sd/images"

PyPortal_Winamp_Player/code.py

@@ -9,9 +9,8 @@
 import storage
 import board
 import busio
-import digitalio
 import adafruit_touchscreen
-import adafruit_sdcard
+import sdcardio
 from winamp_helpers import WinampApplication
 
 # which playlist to play
@@ -80,8 +79,7 @@
 
 # Initializations for SDCard
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-cs = digitalio.DigitalInOut(board.SD_CS)
-sdcard = adafruit_sdcard.SDCard(spi, cs)
+sdcard = sdcardio.SDCard(spi, board.SD_CS)
 vfs = storage.VfsFat(sdcard)
 storage.mount(vfs, "/sd")
 sys.path.append("/sd")