From 9da6b580d92cecac7e506480ff5b67cda5dd48f5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 23 Nov 2025 13:32:56 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Immediate=20Buttons=20and=20Menu?= =?UTF-8?q?=20Items=20(2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to #28180 --- .../ftdi_eve_touch_ui/generic/custom_user_menus.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp index d86946ca4f..167dda1b0a 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp @@ -122,20 +122,18 @@ void CustomUserMenus::onRedraw(draw_mode_t what) { } } -#include "../../../../gcode/queue.h" - template void _lcd_custom_menu_gcode(FSTR_P const fstr); FORCE_INLINE void _lcd_custom_menu_gcode_done() { - TERN_(CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK, ui.completion_feedback()); - TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, ui.return_to_status()); + sound.play(chimes, PLAY_ASYNCHRONOUS); + GOTO_SCREEN(StatusScreen); } template<> void _lcd_custom_menu_gcode(FSTR_P const fstr) { - gcode.process_subcommands_now(fstr); + ExtUI::executeCommands(fstr); _lcd_custom_menu_gcode_done(); } template<> void _lcd_custom_menu_gcode(FSTR_P const fstr) { - queue.inject(fstr); + ExtUI::injectCommands(fstr); _lcd_custom_menu_gcode_done(); }