MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fail SD mount without SPI re-init (#19226)

Browse Source
This commit is contained in:
Victor Oliveira 2020-09-01 19:09:28 -03:00 committed by GitHub
parent 62268aae65
commit e3d855673e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/sd/cardreader.cpp
View File

@ -140,7 +140,7 @@ CardReader::CardReader() {
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT) #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
SET_INPUT_PULLUP(SD_DETECT_PIN); SET_INPUT_PULLUP(SD_DETECT_PIN);
#endif #endif
#if PIN_EXISTS(SDPOWER) #if PIN_EXISTS(SDPOWER)
OUT_WRITE(SDPOWER_PIN, HIGH); // Power the SD reader OUT_WRITE(SDPOWER_PIN, HIGH); // Power the SD reader
#endif #endif
@ -383,10 +383,9 @@ void CardReader::mount() {
if (flag.mounted) if (flag.mounted)
cdroot(); cdroot();
else { else if (marlin_state != MF_INITIALIZING)
spiInit(SPI_SPEED); // Return to base SPI speed
ui.set_status_P(GET_TEXT(MSG_SD_INIT_FAIL), -1); ui.set_status_P(GET_TEXT(MSG_SD_INIT_FAIL), -1);
}
ui.refresh(); ui.refresh();
} }