From e0eb8b8a24499f01ee53374eb97f09d215436f53 Mon Sep 17 00:00:00 2001 From: gudnimg Date: Sun, 1 Oct 2023 14:39:50 +0000 Subject: [PATCH] optimisation: if SD card fails to mount, do not set root directory I noticed this on Marlin 2.1 side, it should apply here as well. --- Firmware/cardreader.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index fb7bbc1a2..5c501a219 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -230,29 +230,17 @@ void CardReader::initsd(bool doPresort/* = true*/) SERIAL_ECHO_START; SERIAL_ECHOLNRPGM(_n("SD card ok"));////MSG_SD_CARD_OK } - workDir=root; - curDir=&root; - workDirDepth = 0; - #ifdef SDCARD_SORT_ALPHA - if (doPresort) - presort(); - #endif - - /* - if(!workDir.openRoot(&volume)) + if (cardOK) { - SERIAL_ECHOLNPGM(MSG_SD_WORKDIR_FAIL); + setroot(doPresort); } - */ - } -void CardReader::setroot(bool doPresort) +void __attribute__((noinline)) CardReader::setroot(bool doPresort) { workDir=root; workDirDepth = 0; - curDir=&workDir; #ifdef SDCARD_SORT_ALPHA if (doPresort)