diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6317852df..d9bb2ed7e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1364,7 +1364,7 @@ void setup() // Force SD card update. Otherwise the SD card update is done from loop() on card.checkautostart(false), // but this times out if a blocking dialog is shown in setup(). - card.initsd(); + card.mount(); #ifdef DEBUG_SD_SPEED_TEST if (card.cardOK) { @@ -5240,7 +5240,7 @@ void process_commands() ### M21 - Init SD card M21: Initialize SD card */ case 21: - card.initsd(); + card.mount(); break; /*! diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 7afc5420d..4bfa15fa0 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -198,7 +198,7 @@ void CardReader::ls(ls_param params) } -void CardReader::initsd(bool doPresort/* = true*/) +void CardReader::mount(bool doPresort/* = true*/) { cardOK = false; if(root.isOpen()) @@ -616,7 +616,7 @@ void CardReader::checkautostart(bool force) autostart_stilltocheck = false; if(!cardOK) { - initsd(); + mount(); if(!cardOK) //fail return; } diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index 472a3a05c..39f492d11 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -27,7 +27,7 @@ public: inline ls_param(bool LFN, bool timestamp):LFN(LFN), timestamp(timestamp) { } } __attribute__((packed)); - void initsd(bool doPresort = true); + void mount(bool doPresort = true); void write_command(char *buf); void write_command_no_newline(char *buf); //files auto[0-9].g on the sd card are performed in a row diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f042dca01..d2e22f515 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5586,7 +5586,7 @@ static void lcd_control_temperature_menu() static void lcd_sd_refresh() { #if SDCARDDETECT == -1 - card.initsd(); + card.mount(); #else card.presort(); #endif @@ -7309,7 +7309,7 @@ void menu_lcd_lcdupdate_func(void) { if (!card.cardOK) { - card.initsd(false); //delay the sorting to the sd menu. Otherwise, removing the SD card while sorting will not menu_back() + card.mount(false); //delay the sorting to the sd menu. Otherwise, removing the SD card while sorting will not menu_back() card.presort_flag = true; //force sorting of the SD menu } LCD_MESSAGERPGM(MSG_WELCOME);