浏览代码

Return to status when SD card is removed

Scott Lahteine 6 年前
父节点
当前提交
e6484d9dab
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 1
    1
      Marlin/src/lcd/menu/menu_sdcard.cpp
  2. 4
    1
      Marlin/src/lcd/ultralcd.cpp

+ 1
- 1
Marlin/src/lcd/menu/menu_sdcard.cpp 查看文件

114
   else if (card.flag.cardOK)
114
   else if (card.flag.cardOK)
115
     MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
115
     MENU_ITEM(function, LCD_STR_FOLDER "..", lcd_sd_updir);
116
 
116
 
117
-  for (uint16_t i = 0; i < fileCnt; i++) {
117
+  if (ui.should_draw()) for (uint16_t i = 0; i < fileCnt; i++) {
118
     if (_menuLineNr == _thisItemNr) {
118
     if (_menuLineNr == _thisItemNr) {
119
       const uint16_t nr =
119
       const uint16_t nr =
120
         #if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA)
120
         #if ENABLED(SDCARD_RATHERRECENTFIRST) && DISABLED(SDCARD_SORT_ALPHA)

+ 4
- 1
Marlin/src/lcd/ultralcd.cpp 查看文件

709
       }
709
       }
710
       else {
710
       else {
711
         card.release();
711
         card.release();
712
-        if (old_sd_status != 2) set_status_P(PSTR(MSG_SD_REMOVED));
712
+        if (old_sd_status != 2) {
713
+          set_status_P(PSTR(MSG_SD_REMOVED));
714
+          if (!on_status_screen()) return_to_status();
715
+        }
713
       }
716
       }
714
 
717
 
715
       refresh();
718
       refresh();

正在加载...
取消
保存