Browse Source

Merge pull request #2071 from kuhnmarek/MK3_PFW-966_sheets_farm_mode

Mk3 pfw 966 sheets farm mode
DRracer 5 years ago
parent
commit
16b1a6d218
1 changed files with 17 additions and 12 deletions
  1. 17 12
      Firmware/ultralcd.cpp

+ 17 - 12
Firmware/ultralcd.cpp

@@ -5511,10 +5511,6 @@ void lcd_hw_setup_menu(void)                      // can not be "static"
 MENU_BEGIN();
 MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch
 
-MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu);
-MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu);
-MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu);
-
 //strncpy(buffer,_i("Sheet"),sizeof(buffer));
 //strncpy(buffer,_i(" "),sizeof(buffer));
 //strncpy(buffer,EEPROM_Sheets_base->s[0].name,sizeof(buffer));
@@ -5533,10 +5529,13 @@ MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu);
 
 //delete(b);
 
-if(!farm_mode){
-     SETTINGS_NOZZLE;
-     MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu);
-}
+MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu);
+MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu);
+MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu);   
+
+SETTINGS_NOZZLE;
+MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu);
+
 MENU_END();
 }
 
@@ -5565,9 +5564,12 @@ static void lcd_settings_menu()
 
 	SETTINGS_SILENT_MODE;
 
-     bSettings=true;                              // flag ('fake parameter') for 'lcd_hw_setup_menu()' function
-	MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP
-
+    if(!farm_mode)
+    {
+        bSettings=true;                              // flag ('fake parameter') for 'lcd_hw_setup_menu()' function
+        MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP
+    }
+    
 	SETTINGS_MMU_MODE;
 
 	MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_MBL_SETTINGS c=18 r=1
@@ -6746,7 +6748,10 @@ static void lcd_main_menu()
 
   if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal))
   {
-	MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu);
+    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))