bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use "mount" as card verb

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-15 03:10:59 -05:00
parent 2386c147ad
commit d5f5203880
18 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -911,7 +911,7 @@ namespace ExtUI {
}
bool isMediaInserted() {
return IFSD(IS_SD_INSERTED() && card.isDetected(), false);
return IFSD(IS_SD_INSERTED() && card.isMounted(), false);
}
void pausePrint() {
@ -1008,14 +1008,14 @@ void MarlinUI::update() {
if (sd_status != last_sd_status) {
last_sd_status = sd_status;
if (sd_status) {
card.initsd();
if (card.isDetected())
card.mount();
if (card.isMounted())
ExtUI::onMediaInserted();
else
ExtUI::onMediaError();
}
else {
const bool ok = card.isDetected();
const bool ok = card.isMounted();
card.release();
if (ok) ExtUI::onMediaRemoved();
}

2
Marlin/src/lcd/extui_malyan_lcd.cpp
View File

@ -298,7 +298,7 @@ void process_lcd_s_command(const char* command) {
case 'L': {
#if ENABLED(SDSUPPORT)
if (!card.isDetected()) card.initsd();
if (!card.isMounted()) card.mount();
// A more efficient way to do this would be to
// implement a callback in the ls_SerialPrint code, but

2
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -101,7 +101,7 @@ void menu_main() {
const bool busy = IS_SD_PRINTING() || print_job_timer.isRunning()
#if ENABLED(SDSUPPORT)
, card_detected = card.isDetected()
, card_detected = card.isMounted()
, card_open = card_detected && card.isFileOpen()
#endif
;

4
Marlin/src/lcd/menu/menu_media.cpp
View File

@ -34,7 +34,7 @@
#if !PIN_EXISTS(SD_DETECT)
void lcd_sd_refresh() {
encoderTopLine = 0;
card.initsd();
card.mount();
}
#endif
@ -146,7 +146,7 @@ void menu_media() {
MENU_ITEM(function, LCD_STR_REFRESH MSG_REFRESH, lcd_sd_refresh);
#endif
}
else if (card.isDetected())
else if (card.isMounted())
MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
if (ui.should_draw()) for (uint16_t i = 0; i < fileCnt; i++) {

2
Marlin/src/lcd/ultralcd.cpp
View File

@ -842,7 +842,7 @@ void MarlinUI::update() {
if (sd_status) {
safe_delay(500); // Some boards need a delay to get settled
card.initsd();
card.mount();
if (old_sd_status == 2)
card.beginautostart(); // Initial boot
else