Skip to content

casscading down PR #621 where it should be in develop #622

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

Merged
SergeBakharev merged 3 commits into from
Jun 5, 2026
Merged

casscading down PR #621 where it should be in develop #622

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3135105
Merge pull request #553 from SergeBakharev/2.1.0
SergeBakharev Apr 8, 2026
ed91419
Fix unhandled ValueError causing WHB04 pendant feedrate crash
rbeard-ewa Jun 5, 2026
7fabf35
Merge pull request #621 from rbeard-ewa/fix-pendant-crash
SergeBakharev Jun 5, 2026
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
10 changes: 9 additions & 1 deletion carveracontroller/addons/pendant/pendant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,15 @@ def _handle_display_update(self, daemon: whb04.Daemon) -> None:
daemon.set_display_position(whb04.Axis.Y, self._cnc.vars["wy"])
daemon.set_display_position(whb04.Axis.Z, self._cnc.vars["wz"])
daemon.set_display_position(whb04.Axis.A, self._cnc.vars["wa"])
daemon.set_display_feedrate(self._cnc.vars["curfeed"])
# daemon.set_display_feedrate(self._cnc.vars["curfeed"])
# rbeard-ewa fix unhandled exception for bad feedrate
try:
raw_feed = float(self._cnc.vars.get("curfeed", 0))
safe_feed = max(0.0, min(raw_feed, 9999.0))
daemon.set_display_feedrate(safe_feed)
except ValueError:
pass
# end of feedrate fix
daemon.set_display_spindle_speed(self._cnc.vars["curspindle"])

# Update the step indicator to reflect current jog mode
Expand Down