3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-02-18 15:21:25 +00:00
Code Issues Releases Wiki Activity

🚸 Fix UI behavior for G29 with retry (#27146)

Browse source
This commit is contained in:
Scott Lahteine 2024-07-15 13:59:19 -05:00 committed by GitHub
parent ee99eed3bf
commit 5334a8f0ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -70,14 +70,21 @@
#endif
#endif
/**
* @brief Do some things before returning from G29.
* @param retry : true if the G29 can and should be retried. false if the failure is too serious.
* @param did : true if the leveling procedure completed successfully.
*/
static void pre_g29_return(const bool retry, const bool did) {
if (!retry) {
TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE, false));
}
if (did) {
TERN_(DWIN_CREALITY_LCD, dwinLevelingDone());
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
}
#if DISABLED(G29_RETRY_AND_RECOVER)
if (!retry || did) {
TERN_(DWIN_CREALITY_LCD, dwinLevelingDone());
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
}
#endif
}
#define G29_RETURN(retry, did) do{ \

31
Marlin/src/gcode/gcode.cpp
View file

@ -289,22 +289,27 @@ void GcodeSuite::dwell(millis_t time) {
void GcodeSuite::G29_with_retry() {
uint8_t retries = G29_MAX_RETRIES;
while (G29()) { // G29 should return true for failed probes ONLY
if (retries) {
event_probe_recover();
--retries;
}
else {
event_probe_failure();
return;
}
bool fail = false;
for (;;) {
fail = G29(); // G29 should return true for failed probes ONLY
if (!fail || !retries) break;
event_probe_recover();
--retries;
}
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_end());
if (fail) {
event_probe_failure();
TERN_(G29_HALT_ON_FAILURE, return);
}
else {
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_end());
#ifdef G29_SUCCESS_COMMANDS
process_subcommands_now(F(G29_SUCCESS_COMMANDS));
#endif
}
#ifdef G29_SUCCESS_COMMANDS
process_subcommands_now(F(G29_SUCCESS_COMMANDS));
#endif
TERN_(HAS_DWIN_E3V2_BASIC, dwinLevelingDone());
TERN_(EXTENSIBLE_UI, ExtUI::onLevelingDone());
}
#endif // G29_RETRY_AND_RECOVER