From 3f5cfc4e610e17db600382160ddd019f30096a55 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:06:23 +0200 Subject: [PATCH 1/5] Move the change filament button to the main menu when farm printing PFW-945 --- Firmware/ultralcd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 62585c06..4ac78154 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6855,6 +6855,8 @@ static void lcd_main_menu() if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) { + if (farm_mode) + MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 } @@ -7141,7 +7143,8 @@ static void lcd_tune_menu() MENU_ITEM_EDIT_advance_K();//7 #endif #ifdef FILAMENTCHANGEENABLE - MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 + if (!farm_mode) + MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 #endif #ifdef FILAMENT_SENSOR From 9b847715ac547c5798070facff5a356d0ba6ac18 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:11:25 +0200 Subject: [PATCH 2/5] Rename F0 to FRM on the status screen --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4ac78154..85b031a3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -670,7 +670,7 @@ void lcdui_print_extruder(void) // Print farm number (5 chars total) void lcdui_print_farm(void) { - lcd_printf_P(_N(" F0 ")); + lcd_printf_P(_N(" FRM ")); } #ifdef CMD_DIAGNOSTICS From 542677c0804d46a65afadd491ee021ad50aae76e Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:11:48 +0200 Subject: [PATCH 3/5] Prevent switching to serial port 1 on miniRambo and such --- Firmware/Marlin_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5929273d..8b2b0478 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1060,7 +1060,9 @@ void setup() no_response = true; //we need confirmation by recieving PRUSA thx important_status = 8; prusa_statistics(8); +#ifdef HAS_SECOND_SERIAL_PORT selectedSerialPort = 1; +#endif //HAS_SECOND_SERIAL_PORT MYSERIAL.begin(BAUDRATE); #ifdef TMC2130 //increased extruder current (PFW363) From 48b4bdfe8e813e2271c900abee3af4fc65cbe6a0 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:36:08 +0200 Subject: [PATCH 4/5] Make the PRUSA RESET command functional on the miniRambo --- Firmware/Marlin_main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8b2b0478..07d3516b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3920,9 +3920,11 @@ void process_commands() else if (code_seen("RESET")) { // PRUSA RESET // careful! if (farm_mode) { -#if (defined(WATCHDOG) && (MOTHERBOARD == BOARD_EINSY_1_0a)) +#ifdef WATCHDOG +#if defined(W25X20CL) && defined(BOOTAPP) boot_app_magic = BOOT_APP_MAGIC; boot_app_flags = BOOT_APP_FLG_RUN; +#endif //defined(W25X20CL) && defined(BOOTAPP) softReset(); #else //WATCHDOG asm volatile("jmp 0x3E000"); From 70d254a1fc69d3ad08a82a94c3ec698e1b48a1f0 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:39:21 +0200 Subject: [PATCH 5/5] Allow resetting when not in farm mode --- Firmware/Marlin_main.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 07d3516b..c403ac61 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3918,21 +3918,19 @@ void process_commands() mmu_reset(); } else if (code_seen("RESET")) { // PRUSA RESET - // careful! - if (farm_mode) { #ifdef WATCHDOG #if defined(W25X20CL) && defined(BOOTAPP) - boot_app_magic = BOOT_APP_MAGIC; - boot_app_flags = BOOT_APP_FLG_RUN; + boot_app_magic = BOOT_APP_MAGIC; + boot_app_flags = BOOT_APP_FLG_RUN; #endif //defined(W25X20CL) && defined(BOOTAPP) - softReset(); + softReset(); #else //WATCHDOG + // careful! + if (farm_mode) asm volatile("jmp 0x3E000"); + else + puts_P(PSTR("Not in farm mode.")); #endif //WATCHDOG - } - else { - MYSERIAL.println("Not in farm mode."); - } }else if (code_seen("fv")) { // PRUSA fv // get file version #ifdef SDSUPPORT