From 9ed46df97fcfda5489442bfb52e6abf8b2869da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 23 Nov 2022 19:53:36 +0000 Subject: [PATCH 1/2] Don't show full screen message meant for single color setup load_filament_to_nozzle will show a more precise full screen message when an MMU is used. --- Firmware/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 90dfff7bf33e..a9792cbf69e7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3879,11 +3879,11 @@ static void lcd_wizard_load() { } else { lcd_show_fullscreen_message_and_wait_P( _i("Please insert filament into the extruder, then press the knob to load it.")); ////MSG_WIZARD_LOAD_FILAMENT c=20 r=6 + lcd_update_enable(false); + lcd_clear(); + lcd_puts_at_P(0, 2, _T(MSG_LOADING_FILAMENT)); + loading_flag = true; } - lcd_update_enable(false); - lcd_clear(); - lcd_puts_at_P(0, 2, _T(MSG_LOADING_FILAMENT)); - loading_flag = true; gcode_M701(FILAMENTCHANGE_FIRSTFEED, 0); //enquecommand_P(PSTR("M701")); } From 613ea290f5c4d2a9b57c195d6aacee64a0069e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 10 Dec 2022 10:04:17 +0000 Subject: [PATCH 2/2] Add a comment --- Firmware/ultralcd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a9792cbf69e7..8d510f80a570 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3876,6 +3876,9 @@ static void lcd_wizard_load() { if (MMU2::mmu2.Enabled()) { lcd_show_fullscreen_message_and_wait_P( _i("Please insert filament into the first tube of the MMU, then press the knob to load it.")); ////MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 + // NOTE: a full screen message showing which filament is being inserted + // is performed by M701. For this reason MSG_LOADING_FILAMENT is not + // used here when a MMU is used. } else { lcd_show_fullscreen_message_and_wait_P( _i("Please insert filament into the extruder, then press the knob to load it.")); ////MSG_WIZARD_LOAD_FILAMENT c=20 r=6