Browse Source

Merge pull request #1637 from AnHardt/warning3

lcd_autostart_sd() has two conditions.
Scott Lahteine 10 years ago
parent
commit
8d396584bf
1 changed files with 3 additions and 5 deletions
  1. 3
    5
      Marlin/ultralcd.cpp

+ 3
- 5
Marlin/ultralcd.cpp View File

@@ -402,7 +402,7 @@ static void lcd_main_menu() {
402 402
   END_MENU();
403 403
 }
404 404
 
405
-#ifdef SDSUPPORT
405
+#if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
406 406
   static void lcd_autostart_sd() {
407 407
     card.autostart_index = 0;
408 408
     card.setroot();
@@ -587,10 +587,8 @@ void lcd_cooldown() {
587 587
 static void lcd_prepare_menu() {
588 588
   START_MENU();
589 589
   MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
590
-  #ifdef SDSUPPORT
591
-    #ifdef MENU_ADDAUTOSTART
592
-      MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
593
-    #endif
590
+  #if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
591
+    MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
594 592
   #endif
595 593
   MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
596 594
   MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));

Loading…
Cancel
Save