Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #21813 #21828

Merged
merged 5 commits into from
May 8, 2021
+1 −1
Merged

fixes #21813 #21828

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2057f4d
fixes #21813
digant73 May 6, 2021
db774c7
minor cleanup
digant73 May 6, 2021
90c4f13
rephrase
thinkyhead May 8, 2021
e3a75c8
P only pertains to LCD alone
thinkyhead May 8, 2021
95b05c8
Don't negate 'M125 P'
thinkyhead May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/pause/M125.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void GcodeSuite::M125() {
TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));

if (pause_print(retract, park_point, show_lcd, 0)) {
if (ENABLED(EXTENSIBLE_UI) || !sd_printing || show_lcd) {
if (ENABLED(EXTENSIBLE_UI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) || !sd_printing || show_lcd) {
wait_for_confirmation(false, 0);
resume_print(0, 0, -retract, 0);
}
Expand Down