diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ac0c74eb52..fa69853fdf 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -15,9 +15,9 @@ //#define MachineCR20Pro //#define MachineCR10 //#define MachineCR10S -//#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66 +#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66 //#define MachineCRX -#define MachineCR10Max +//#define MachineCR10Max //#define MachineS4 //#define MachineS5 diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index aca275b39d..35dfb75db8 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -188,7 +188,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l host_action_prompt_show(); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("Load Filament")); + ExtUI::onUserConfirmRequired(PSTR("Load Filament")); #endif while (wait_for_user) { #if HAS_BUZZER @@ -243,7 +243,7 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Continuous Purge Running..."), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("Continuous Purge Running...")); + ExtUI::onUserConfirmRequired(PSTR("Continuous Purge Running...")); #endif for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count) do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE); @@ -524,7 +524,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("Nozzle Parked")); + ExtUI::onUserConfirmRequired(PSTR("Nozzle Parked")); #endif while (wait_for_user) { #if HAS_BUZZER @@ -558,7 +558,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Reheating")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("Reheating...")); + ExtUI::onUserConfirmRequired(PSTR("Reheating...")); #endif // Re-enable the heaters if they timed out diff --git a/Marlin/src/feature/prusa_MMU2/mmu2.cpp b/Marlin/src/feature/prusa_MMU2/mmu2.cpp index 12f84af3e8..57d0418c4f 100644 --- a/Marlin/src/feature/prusa_MMU2/mmu2.cpp +++ b/Marlin/src/feature/prusa_MMU2/mmu2.cpp @@ -716,7 +716,7 @@ void MMU2::filament_runout() { host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("MMU2 Eject Recover")); + ExtUI::onUserConfirmRequired(PSTR("MMU2 Eject Recover")); #endif while (wait_for_user) idle(); BUZZ(200, 404); diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp index 3f3c48150a..7b048f2190 100644 --- a/Marlin/src/gcode/config/M43.cpp +++ b/Marlin/src/gcode/config/M43.cpp @@ -334,7 +334,7 @@ void GcodeSuite::M43() { host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M43 Wait Called"), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("M43 Wait Called")); + ExtUI::onUserConfirmRequired(PSTR("M43 Wait Called")); #endif #endif diff --git a/Marlin/src/gcode/lcd/M0_M1.cpp b/Marlin/src/gcode/lcd/M0_M1.cpp index 67f634ce83..e7f44fe1ee 100644 --- a/Marlin/src/gcode/lcd/M0_M1.cpp +++ b/Marlin/src/gcode/lcd/M0_M1.cpp @@ -98,7 +98,7 @@ void GcodeSuite::M0_M1() { host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("M0/1 Break Called")); + ExtUI::onUserConfirmRequired(PSTR("M0/1 Break Called")); #endif if (ms > 0) { diff --git a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp index 3925bfbbb6..b8232ba388 100644 --- a/Marlin/src/lcd/menu/menu_delta_calibrate.cpp +++ b/Marlin/src/lcd/menu/menu_delta_calibrate.cpp @@ -60,7 +60,7 @@ void _man_probe_pt(const float &rx, const float &ry) { host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("Delta Calibration in progress")); + ExtUI::onUserConfirmRequired(PSTR("Delta Calibration in progress")); #endif while (wait_for_user) idle(); ui.goto_previous_screen_no_defer(); diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 4f63cdd453..2fb676a1aa 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -128,6 +128,9 @@ float zprobe_zoffset; // Initialized by settings.load() #if ENABLED(HOST_PROMPT_SUPPORT) host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Deploy TouchMI probe."), PSTR("Continue")); #endif + #if ENABLED(EXTENSIBLE_UI) + ExtUI::onUserConfirmRequired(PSTR("Deploy TouchMI probe.")); + #endif while (wait_for_user) idle(); ui.reset_status(); ui.goto_screen(prev_screen); @@ -378,7 +381,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), PSTR("Continue")); #endif #if ENABLED(EXTENSIBLE_UI) - ExtUI::onStatusChanged(PSTR("Stow Probe")); + ExtUI::onUserConfirmRequired(PSTR("Stow Probe")); #endif while (wait_for_user) idle(); ui.reset_status();