Browse Source

Remove LcdCommands::FarmModeConfirm

Alex Voinea 2 years ago
parent
commit
29882b625b
3 changed files with 4 additions and 48 deletions
  1. 1 4
      Firmware/cmdqueue.cpp
  2. 3 43
      Firmware/ultralcd.cpp
  3. 0 1
      Firmware/ultralcd.h

+ 1 - 4
Firmware/cmdqueue.cpp

@@ -620,10 +620,7 @@ void get_command()
           card.checkautostart(true);
 
           if (farm_mode)
-          {
-              prusa_statistics(6);
-              lcd_commands_type = LcdCommands::FarmModeConfirm;
-          }
+            prusa_statistics(6);
       }
   }
 

+ 3 - 43
Firmware/ultralcd.cpp

@@ -937,49 +937,9 @@ void lcd_commands()
                     lcd_wizard(WizState::RepeatLay1Cal);
                 }
                 break;
-		}
-			}
-		}
-
-#ifdef PRUSA_FARM
-	if (lcd_commands_type == LcdCommands::FarmModeConfirm)   /// farm mode confirm
-	{
-
-		if (lcd_commands_step == 0) { lcd_commands_step = 6; }
-
-		if (lcd_commands_step == 1 && !blocks_queued())
-		{
-			lcd_commands_step = 0;
-			lcd_commands_type = LcdCommands::Idle;
-		}
-		if (lcd_commands_step == 2 && !blocks_queued())
-		{
-			lcd_commands_step = 1;
-		}
-		if (lcd_commands_step == 3 && !blocks_queued())
-		{
-			lcd_commands_step = 2;
-		}
-		if (lcd_commands_step == 4 && !blocks_queued())
-		{
-			enquecommand_P(PSTR("G90"));
-			enquecommand_P(PSTR("G1 X"  STRINGIFY(X_CANCEL_POS) " Y" STRINGIFY(Y_CANCEL_POS) " E0 F7000"));
-			lcd_commands_step = 3;
-		}
-		if (lcd_commands_step == 5 && !blocks_queued())
-		{
-			lcd_commands_step = 4;
-		}
-		if (lcd_commands_step == 6 && !blocks_queued())
-		{
-			enquecommand_P(PSTR("G91"));
-			enquecommand_P(PSTR("G1 Z15 F1500"));
-			st_synchronize();
-			lcd_commands_step = 5;
-		}
-
-	}
-#endif //PRUSA_FARM
+            }
+        }
+    }
 
 	if (lcd_commands_type == LcdCommands::PidExtruder) {
 		char cmd1[30];

+ 0 - 1
Firmware/ultralcd.h

@@ -114,7 +114,6 @@ enum class LcdCommands : uint_least8_t
 	Idle,
 	LoadFilament,
 	StopPrint,
-	FarmModeConfirm,
 	LongPause,
 	PidExtruder,
 	Layer1Cal,