Skip to content

Commit a42959f

Browse files
committed
gmoccapy: fix "spindle speed override wasn't applied in reverse direction"
1 parent 92cfdf7 commit a42959f

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3737,7 +3737,7 @@ def _update_spindle(self):
37373737
else:
37383738
speed = self.stat.spindle[0]['speed']
37393739
self.widgets.active_speed_label.set_label("{0:.0f}".format(abs(speed)))
3740-
self.widgets.lbl_spindle_act.set_text("S {0}".format(int(speed * self.spindle_override)))
3740+
self.widgets.lbl_spindle_act.set_text("S {0}".format(int(round(speed * self.spindle_override))))
37413741

37423742
def _update_vc(self):
37433743
if self.stat.spindle[0]['direction'] != 0:
@@ -3864,11 +3864,11 @@ def on_spc_spindle_value_changed(self, widget, data=None):
38643864
speed = abs(self.stat.spindle[0]['speed'])
38653865
spindle_override = value / 100
38663866
real_spindle_speed = speed * spindle_override
3867-
if real_spindle_speed > self.max_spindle_rev:
3868-
value_to_set = value / (real_spindle_speed / self.max_spindle_rev)
3867+
if abs(real_spindle_speed) > self.max_spindle_rev:
3868+
value_to_set = value / (abs(real_spindle_speed) / self.max_spindle_rev)
38693869
real_spindle_speed = self.max_spindle_rev
3870-
elif real_spindle_speed < self.min_spindle_rev:
3871-
value_to_set = value / (real_spindle_speed / self.min_spindle_rev)
3870+
elif abs(real_spindle_speed) < self.min_spindle_rev:
3871+
value_to_set = value / (abs(real_spindle_speed) / self.min_spindle_rev)
38723872
real_spindle_speed = self.min_spindle_rev
38733873
else:
38743874
value_to_set = spindle_override * 100

src/emc/usr_intf/gmoccapy/release_notes.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2+
- bug in spindle speed override: The override value wasn't applied
3+
when spindle turning in reverse direction
4+
5+
Thanks Reinhard for reporting
6+
17
ver 3.1.3.8 (LinuxCNC 2.8.3 release)
28
- fixed translation of some tooltips and a dialog message
39
Thanks to zz912

0 commit comments

Comments
 (0)