andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1637 from AnHardt/warning3 

lcd_autostart_sd() has two conditions.
pull/1/head
Scott Lahteine 10 years ago
parent
8664c6d465 5099b86ad4
commit
8d396584bf
1 changed files with 3 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Marlin/ultralcd.cpp

8
Marlin/ultralcd.cpp
View File

@ -402,7 +402,7 @@ static void lcd_main_menu() {
END_MENU(); END_MENU();
} }
#ifdef SDSUPPORT #if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
static void lcd_autostart_sd() { static void lcd_autostart_sd() {
card.autostart_index = 0; card.autostart_index = 0;
card.setroot(); card.setroot();
@ -587,10 +587,8 @@ void lcd_cooldown() {
static void lcd_prepare_menu() { static void lcd_prepare_menu() {
START_MENU(); START_MENU();
MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
#ifdef SDSUPPORT #if defined( SDSUPPORT ) && defined( MENU_ADDAUTOSTART )
#ifdef MENU_ADDAUTOSTART MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
MENU_ITEM(function, MSG_AUTOSTART, lcd_autostart_sd);
#endif
#endif #endif
MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84")); MENU_ITEM(gcode, MSG_DISABLE_STEPPERS, PSTR("M84"));
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));

Write Preview
Loading…
Cancel
Save