Skip to content

Commit 945d539

Browse files
authored
Merge pull request #83 from cjsieh/scard_vs_sdcardio
change from using adafruit_sdcard to sdcardio
2 parents 29f08ca + b8b9831 commit 945d539

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

adafruit_pyportal.py

+12-3
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,15 @@
6363
import rtc
6464
import supervisor
6565
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
66-
import adafruit_sdcard
6766

67+
try:
68+
import sdcardio
69+
70+
NATIVE_SD = True
71+
except ImportError:
72+
import adafruit_sdcard as sdcardio
73+
74+
NATIVE_SD = False
6875

6976
if hasattr(board, "TOUCH_XL"):
7077
import adafruit_touchscreen
@@ -328,10 +335,12 @@ def __init__(
328335

329336
if self._debug:
330337
print("Init SD Card")
331-
sd_cs = DigitalInOut(board.SD_CS)
338+
sd_cs = board.SD_CS
339+
if not NATIVE_SD:
340+
sd_cs = DigitalInOut(sd_cs)
332341
self._sdcard = None
333342
try:
334-
self._sdcard = adafruit_sdcard.SDCard(spi, sd_cs)
343+
self._sdcard = sdcardio.SDCard(spi, sd_cs)
335344
vfs = storage.VfsFat(self._sdcard)
336345
storage.mount(vfs, "/sd")
337346
except OSError as error:

docs/conf.py

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"secrets",
3838
"adafruit_sdcard",
3939
"storage",
40+
"sdcardio",
4041
"adafruit_io",
4142
"adafruit_cursorcontrol",
4243
"adafruit_requests",

0 commit comments

Comments
 (0)