Conversation
…mergency reset
- Replace 3 boolean flags with _CalibPhase enum (IDLE,PROBE_ACTIVE,EDDY_PHASE1, EDDY_PHASE1_RESTART,EDDY_PHASE2, SAVE_RESTART)
- Add _cancel_calibration() helper used by abort/error/shutdown/disconnect
- Add _show_option_cards() re-enables cards (setEnabled + show) on reset
- Fix: Z_ENDSTOP_CALIBRATE already calls CLEAN_NOZZLE internally, skip pre-emit to prevent double cleaning
- Fix: EDDY_PHASE1_RESTART phase suppresses gcode_move messages after Klipper restart so paper-test message is not overwritten
- Fix: on_extruder_update and on_gcode_move_update gated on _calib_phase instead of helper_initialize (was prematurely cleared by 300ms query)
- Fix: show "Cleaning nozzle..." only on target temp → 0 transition (prev_temp > 0) to avoid spurious message after Klipper restart
- Fix: emergency stop now triggers evaluate_klippy_status() via notify_klippy_shutdown in moonrakerComm on_klippy_status("shutdown") calls _cancel_calibration()
- Add lock_ui signal chain (probeHelperPage → controlTab → mainWindow) locks printTab/filamentTab/utilitiesTab/header during calibration; re-asserted in _toggle_tool_buttons(True) when probe session starts
- Fix: -0.000 display in probeHelperPage and babystepPage using round(x, 3) or 0.0
- Fix: save z-offset button never shows -0.000 (round(value[2], 3) != 0)
- babystepPage: move buttons disabled by default, enabled only when print_stats.state == "printing"
- Inline _DISCONNECT_MSG/_READY_MSG dicts as match/case in on_klippy_status
…fset' into bugfix/calibrate_offset
HugoCLSC
approved these changes
Apr 14, 2026
HugoCLSC
added a commit
that referenced
this pull request
Apr 15, 2026
## Description The current PR, fixes some long standing issues with the GUI, specifically on babystepping, filament changes during ongoing print jobs, and probe calibration tools (Eddy, z endstop). ## Changes - **Feature:** Dynamically retrieve the maximum temperature allowed for each heater (#199 ) (#205 ). - **Refactor:** Eddy calibration tool, save babystep value, UI locking and unlocking on tool. Other fixes (#202 , #206 ). - **Refactor:** FilamentTab can now be accessed during prints to make filament changes easier, new progress messages during the load/unload operations (#207 ). --------- Signed-off-by: Hugo Costa <hugo.santos.costa@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Summary of changes to the probe calibration flow (
probeHelperPage.py,babystepPage.py,printTab.py,controlTab.py,mainWindow.py,moonrakerComm.py)._CalibPhaseenum with 6 states_cancel_calibration(),_reset_calibration_state(),_restore_ui(),_show_option_cards()helpersCLEAN_NOZZLEexecution:Z_ENDSTOP_CALIBRATEalready calls it internallyEDDY_PHASE1_RESTARTphase: prevents post-restart subscription updates from overwriting the paper-test loading messageon_extruder_update/on_gcode_move_updateguards: use_calib_phaseinstead ofhelper_initialize(was cleared prematurely by 300ms manual_probe query)notify_klippy_shutdownnow triggersevaluate_klippy_status()inmoonrakerComm.py;on_klippy_status("shutdown")calls_cancel_calibration()lock_uisignal: disables all tabs exceptcontrolTaband header during calibration; re-asserted when probe session becomes active-0.000display inprobeHelperPageandbabystepPageusinground(x, 3) or 0.0-0.000inprintTabbabystepPage: move buttons start disabled, enabled only whenprint_stats.state == "printing"_DISCONNECT_MSG/_READY_MSGmodule-level dicts intomatch/caseinon_klippy_statusMotivation
The calibration flow had accumulated several interacting boolean flags that made state transitions brittle and hard to reason about. The
_CalibPhaseenum makes the state machine explicit and eliminates entire categories of bugs (premature flag clears, wrong phase handling on reconnect, no reset on emergency stop). The UI lock prevents navigating away mid-calibration. The-0.000fixes prevent confusing display values at the zero crossing.Future work
_CalibPhasestate machine transitions