Skip to content

Commit 9347290

Browse files
committed
gmoccapy: Fix jogging with max velocity (SHIFT + jog key)
Before, jogging with Shift-down was reduced by the halui.max-velocity setting
1 parent c714a40 commit 9347290

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -546,10 +546,6 @@ def _get_pref_data(self):
546546
self.scale_feed_override = self.prefs.getpref("scale_feed_override", 1, float)
547547
self.scale_rapid_override = self.prefs.getpref("scale_rapid_override", 1, float)
548548

549-
# holds the max velocity value and is needed to be able to jog at
550-
# at max velocity if <SHIFT> is hold during jogging
551-
self.max_velocity = self.stat.max_velocity
552-
553549
# the velocity settings
554550
self.min_spindle_rev = self.prefs.getpref("spindle_bar_min", 0.0, float)
555551
self.max_spindle_rev = self.prefs.getpref("spindle_bar_max", 6000.0, float)
@@ -1069,7 +1065,7 @@ def _on_btn_jog_pressed(self, widget, button_name, shift=False):
10691065
if button_name[0] in "abc":
10701066
value = self.widgets.spc_ang_jog_vel.get_property("max") / 60
10711067
else:
1072-
value = self.stat.max_velocity
1068+
value = self.jog_rate_max
10731069
else:
10741070
if button_name[0] in "abc":
10751071
value = self.widgets.spc_ang_jog_vel.get_value() / 60

src/emc/usr_intf/gmoccapy/release_notes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- jogging with max speed (with shift-key pressed) was reduced by halui setting
2+
13
- fixed bug in tooltip text for non-trivial or gantry configuration
24

35
Thanks to chili023/TRothfelder for reporting/fixing

0 commit comments

Comments
 (0)