Skip to content

Commit af5a7a2

Browse files
InsanityAutomationthinkyhead
authored andcommitted
Add missing ExtUI user confirmation (MarlinFirmware#14992)
1 parent 33d54c0 commit af5a7a2

File tree

6 files changed

+44
-0
lines changed

6 files changed

+44
-0
lines changed

Marlin/src/feature/pause.cpp

+13
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
187187
host_action_prompt_button(PSTR("Continue"));
188188
host_action_prompt_show();
189189
#endif
190+
#if ENABLED(EXTENSIBLE_UI)
191+
ExtUI::onStatusChanged(PSTR("Load Filament"));
192+
#endif
190193
while (wait_for_user) {
191194
#if HAS_BUZZER
192195
filament_change_beep(max_beep_count);
@@ -239,6 +242,9 @@ bool load_filament(const float &slow_load_length/*=0*/, const float &fast_load_l
239242
#if ENABLED(HOST_PROMPT_SUPPORT)
240243
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Continuous Purge Running..."), PSTR("Continue"));
241244
#endif
245+
#if ENABLED(EXTENSIBLE_UI)
246+
ExtUI::onStatusChanged(PSTR("Continuous Purge Running..."));
247+
#endif
242248
for (float purge_count = purge_length; purge_count > 0 && wait_for_user; --purge_count)
243249
do_pause_e_move(1, ADVANCED_PAUSE_PURGE_FEEDRATE);
244250
wait_for_user = false;
@@ -517,6 +523,9 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
517523
#if ENABLED(HOST_PROMPT_SUPPORT)
518524
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Nozzle Parked"), PSTR("Continue"));
519525
#endif
526+
#if ENABLED(EXTENSIBLE_UI)
527+
ExtUI::onStatusChanged(PSTR("Nozzle Parked"));
528+
#endif
520529
while (wait_for_user) {
521530
#if HAS_BUZZER
522531
filament_change_beep(max_beep_count);
@@ -538,6 +547,10 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
538547
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("HeaterTimeout"), PSTR("Reheat"));
539548
#endif
540549

550+
#if ENABLED(EXTENSIBLE_UI)
551+
ExtUI::onStatusChanged(PSTR("HeaterTimeout"));
552+
#endif
553+
541554
// Wait for LCD click or M108
542555
while (wait_for_user) idle(true);
543556

Marlin/src/feature/prusa_MMU2/mmu2.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ MMU2 mmu2;
4242
#include "../../feature/host_actions.h"
4343
#endif
4444

45+
#if ENABLED(EXTENSIBLE_UI)
46+
#include "../../lcd/extensible_ui/ui_api.h"
47+
#endif
48+
4549
#define DEBUG_OUT ENABLED(MMU2_DEBUG)
4650
#include "../../core/debug_out.h"
4751

@@ -711,6 +715,9 @@ void MMU2::filament_runout() {
711715
#if ENABLED(HOST_PROMPT_SUPPORT)
712716
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("MMU2 Eject Recover"), PSTR("Continue"));
713717
#endif
718+
#if ENABLED(EXTENSIBLE_UI)
719+
ExtUI::onStatusChanged(PSTR("MMU2 Eject Recover"));
720+
#endif
714721
while (wait_for_user) idle();
715722
BUZZ(200, 404);
716723
BUZZ(200, 404);

Marlin/src/gcode/config/M43.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
#include "../../feature/host_actions.h"
4343
#endif
4444

45+
#if ENABLED(EXTENSIBLE_UI)
46+
#include "../../lcd/extensible_ui/ui_api.h"
47+
#endif
48+
4549
#ifndef GET_PIN_MAP_PIN_M43
4650
#define GET_PIN_MAP_PIN_M43(Q) GET_PIN_MAP_PIN(Q)
4751
#endif
@@ -329,6 +333,9 @@ void GcodeSuite::M43() {
329333
#if ENABLED(HOST_PROMPT_SUPPORT)
330334
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M43 Wait Called"), PSTR("Continue"));
331335
#endif
336+
#if ENABLED(EXTENSIBLE_UI)
337+
ExtUI::onStatusChanged(PSTR("M43 Wait Called"));
338+
#endif
332339
#endif
333340

334341
for (;;) {

Marlin/src/gcode/lcd/M0_M1.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ void GcodeSuite::M0_M1() {
9797
#if ENABLED(HOST_PROMPT_SUPPORT)
9898
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("M0/1 Break Called"), PSTR("Continue"));
9999
#endif
100+
#if ENABLED(EXTENSIBLE_UI)
101+
ExtUI::onStatusChanged(PSTR("M0/1 Break Called"));
102+
#endif
100103

101104
if (ms > 0) {
102105
ms += millis(); // wait until this time for a click

Marlin/src/lcd/menu/menu_delta_calibrate.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
#include "../../feature/bedlevel/bedlevel.h"
3737
#endif
3838

39+
#if ENABLED(EXTENSIBLE_UI)
40+
#include "../../lcd/extensible_ui/ui_api.h"
41+
#endif
42+
3943
void _man_probe_pt(const float &rx, const float &ry) {
4044
do_blocking_move_to(rx, ry, Z_CLEARANCE_BETWEEN_PROBES);
4145
ui.synchronize();
@@ -55,6 +59,9 @@ void _man_probe_pt(const float &rx, const float &ry) {
5559
#if ENABLED(HOST_PROMPT_SUPPORT)
5660
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Delta Calibration in progress"), PSTR("Continue"));
5761
#endif
62+
#if ENABLED(EXTENSIBLE_UI)
63+
ExtUI::onStatusChanged(PSTR("Delta Calibration in progress"));
64+
#endif
5865
while (wait_for_user) idle();
5966
ui.goto_previous_screen_no_defer();
6067
return current_position[Z_AXIS];

Marlin/src/module/probe.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ float zprobe_zoffset; // Initialized by settings.load()
7979
#include "stepper_indirection.h"
8080
#endif
8181

82+
#if ENABLED(EXTENSIBLE_UI)
83+
#include "../lcd/extensible_ui/ui_api.h"
84+
#endif
85+
8286
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
8387
#include "../core/debug_out.h"
8488

@@ -371,6 +375,9 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
371375
#if ENABLED(HOST_PROMPT_SUPPORT)
372376
host_prompt_do(PROMPT_USER_CONTINUE, PSTR("Stow Probe"), PSTR("Continue"));
373377
#endif
378+
#if ENABLED(EXTENSIBLE_UI)
379+
ExtUI::onStatusChanged(PSTR("Stow Probe"));
380+
#endif
374381
while (wait_for_user) idle();
375382
ui.reset_status();
376383

0 commit comments

Comments
 (0)