From 29882b625b2423f018e6e0ce31dc054fb3ef6cca Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 16 Nov 2022 22:46:24 +0100 Subject: [PATCH] Remove LcdCommands::FarmModeConfirm --- Firmware/cmdqueue.cpp | 5 +---- Firmware/ultralcd.cpp | 46 +++---------------------------------------- Firmware/ultralcd.h | 1 - 3 files changed, 4 insertions(+), 48 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index ab9aca7bc..f41d19671 100755 --- a/Firmware/cmdqueue.cpp +++ b/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); } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1cec7e6ac..f9b81a765 100644 --- a/Firmware/ultralcd.cpp +++ b/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]; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index bb68f1b8c..e9c7ec98a 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -114,7 +114,6 @@ enum class LcdCommands : uint_least8_t Idle, LoadFilament, StopPrint, - FarmModeConfirm, LongPause, PidExtruder, Layer1Cal,