Browse Source

Move sheet menu up to be after Print from SD.

Marek Bel 5 years ago
parent
commit
9692f94683
1 changed files with 8 additions and 8 deletions
  1. 8 8
      Firmware/ultralcd.cpp

+ 8 - 8
Firmware/ultralcd.cpp

@@ -6719,6 +6719,14 @@ static void lcd_main_menu()
   }
   }
 #endif
 #endif
 
 
+  if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal))
+  {
+    if (!farm_mode)
+    {
+      MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu);
+    }
+  }
+
 
 
   if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal))
   if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal))
   {
   {
@@ -6763,14 +6771,6 @@ static void lcd_main_menu()
     if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu);
     if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu);
 
 
   }
   }
-
-  if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal))
-  {
-    if (!farm_mode)
-    {
-	  MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu);
-    }
-  }
   
   
   if (!is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal))
   if (!is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal))
   {
   {