Disable SDSUPPORT by default

MarlinKimbra/conditionals.h

@@ -7,7 +7,6 @@
 
 #if ENABLED(MAKRPANEL)
   #define DOGLCD
-  #define SDSUPPORT
   #define DEFAULT_LCD_CONTRAST 17
   #define ULTIPANEL
   #define NEWPANEL
@@ -38,7 +37,6 @@
 #endif
 
 #if ENABLED(PANEL_ONE)
-  #define SDSUPPORT
   #define ULTIMAKERCONTROLLER
 #endif
 
@@ -84,7 +82,6 @@
 
 #if ENABLED(MINIPANEL)
  #define DOGLCD
- #define SDSUPPORT
  #define ULTIPANEL
  #define NEWPANEL
  #define DEFAULT_LCD_CONTRAST 17
@@ -151,7 +148,6 @@
 
 #if ENABLED(ULTIPANEL)
   #define NEWPANEL  //enable this if you have a click-encoder panel
-  #define SDSUPPORT
   #define ULTRA_LCD
   #if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
     #define LCD_WIDTH 22

MarlinKimbra/ultralcd.cpp

@@ -326,7 +326,7 @@ static void lcd_status_screen() {
 
   #if ENABLED(LCD_PROGRESS_BAR)
     millis_t ms = millis();
-    #if DISABLED(ROGRESS_MSG_ONCE)
+    #if DISABLED(PROGRESS_MSG_ONCE)
       if (ms > progress_bar_ms + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME) {
         progress_bar_ms = ms;
       }
@@ -334,10 +334,10 @@ static void lcd_status_screen() {
     #if PROGRESS_MSG_EXPIRE > 0
       // Handle message expire
       if (expire_status_ms > 0) {
+        #if ENABLED(SDSUPPORT)
           if (card.isFileOpen()) {
             // Expire the message when printing is active
             if (IS_SD_PRINTING) {
-            // Expire the message when printing is active
               if (ms >= expire_status_ms) {
                 lcd_status_message[0] = '\0';
                 expire_status_ms = 0;
@@ -350,6 +350,9 @@ static void lcd_status_screen() {
           else {
             expire_status_ms = 0;
           }
+        #else
+          expire_status_ms = 0;
+        #endif // SDSUPPORT
       }
     #endif
   #endif //LCD_PROGRESS_BAR
@@ -426,7 +429,7 @@ static void lcd_status_screen() {
 
     feedrate_multiplier = constrain(feedrate_multiplier, 10, 999);
 
-  #endif //ULTIPANEL
+  #endif // ULTIPANEL
 }
 
 #if ENABLED(ULTIPANEL)
@@ -434,6 +437,7 @@ static void lcd_status_screen() {
 static void lcd_return_to_status() { lcd_goto_menu(lcd_status_screen); }
 
 #if ENABLED(SDSUPPORT)
+
   static void lcd_sdcard_pause() { card.pauseSDPrint(); }
 
   static void lcd_sdcard_resume() { card.startFileprint(); }
@@ -446,7 +450,8 @@ static void lcd_return_to_status() { lcd_goto_menu(lcd_status_screen); }
     cancel_heatup = true;
     lcd_setstatus(MSG_PRINT_ABORTED, true);
   }
-#endif
+
+#endif // SDSUPPORT
 
 /**
  *
@@ -492,7 +497,7 @@ static void lcd_main_menu() {
         MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
       #endif
     }
-  #endif //SDSUPPORT
+  #endif // SDSUPPORT
 
   END_MENU();
 }
@@ -1416,24 +1421,26 @@ static void lcd_control_volumetric_menu() {
   }
 #endif // FWRETRACT
 
-#if !PIN_EXISTS(SD_DETECT)
+#if ENABLED(SDSUPPORT)
+
+  #if !PIN_EXISTS(SD_DETECT)
     static void lcd_sd_refresh() {
       card.initsd();
       currentMenuViewOffset = 0;
     }
-#endif
+  #endif
 
-static void lcd_sd_updir() {
+  static void lcd_sd_updir() {
     card.updir();
     currentMenuViewOffset = 0;
-}
+  }
 
-/**
+  /**
    *
    * "Print from SD" submenu
    *
    */
-void lcd_sdcard_menu() {
+  void lcd_sdcard_menu() {
     if (lcdDrawUpdate == 0 && LCD_CLICKED == 0) return;	// nothing to do (so don't thrash the SD card)
     uint16_t fileCnt = card.getnrfilenames();
     START_MENU(lcd_main_menu);
@@ -1466,7 +1473,9 @@ void lcd_sdcard_menu() {
       }
     }
     END_MENU();
-}
+  }
+
+#endif // SDSUPPORT
 
 /**
  *
@@ -1620,10 +1629,16 @@ static void menu_action_sdfile(const char* filename, char* longFilename) {
   enqueuecommands_P(PSTR("M24"));
   lcd_return_to_status();
 }
-static void menu_action_sddirectory(const char* filename, char* longFilename) {
+
+#if ENABLED(SDSUPPORT)
+
+  static void menu_action_sddirectory(const char* filename, char* longFilename) {
     card.chdir(filename);
     encoderPosition = 0;
-}
+  }
+
+#endif
+
 static void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { *ptr = !(*ptr); }
 static void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, menuFunc_t callback) {
   menu_action_setting_edit_bool(pstr, ptr);
@@ -1727,7 +1742,8 @@ void lcd_update() {
 
   lcd_buttons_update();
 
-  #if PIN_EXISTS(SD_DETECT)
+  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
+
     if (IS_SD_INSERTED != lcd_oldcardstatus && lcd_detected()) {
       lcdDrawUpdate = 2;
       lcd_oldcardstatus = IS_SD_INSERTED;
@@ -1746,7 +1762,8 @@ void lcd_update() {
         LCD_MESSAGEPGM(MSG_SD_REMOVED);
       }
     }
-  #endif//CARDINSERTED
+
+  #endif // SDSUPPORT && SD_DETECT_PIN
 
   millis_t ms = millis();
   if (ms > next_lcd_update_ms) {