Skip to content

Commit f206df0

Browse files
committed
gmoccapy: remove S prefix for spindle display
because this does not reflect the spindle speed programmed with the S word. It shows the current resp. commanded speed.
1 parent f873fd8 commit f206df0

1 file changed

Lines changed: 5 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
@@ -4305,11 +4305,11 @@ def _update_spindle(self):
43054305
speed = hal.get_value("spindle.0.speed-out")
43064306
# catch very large values eg when using G96 w/o D value
43074307
if speed > self.max_spindle_disp:
4308-
self.widgets.lbl_spindle_act.set_text("S >"+str(self.max_spindle_disp))
4308+
self.widgets.lbl_spindle_act.set_text(">"+str(self.max_spindle_disp))
43094309
elif speed < -self.max_spindle_disp:
4310-
self.widgets.lbl_spindle_act.set_text("S <"+str(self.max_spindle_disp))
4310+
self.widgets.lbl_spindle_act.set_text("<"+str(self.max_spindle_disp))
43114311
else:
4312-
self.widgets.lbl_spindle_act.set_text("S {0}".format(int(round(speed))))
4312+
self.widgets.lbl_spindle_act.set_text("{0}".format(int(round(speed))))
43134313

43144314
def _update_vc(self):
43154315
#Note: self.stat.spindle[0]['speed'] does not reflect 'spindle.0.speed-out' pins when using G96 mode (issue #3449)
@@ -4443,13 +4443,13 @@ def _set_spindle(self, command):
44434443
rpm_out = rpm / self.stat.spindle[0]['override']
44444444
except:
44454445
rpm_out = 0
4446-
self.widgets.lbl_spindle_act.set_label("S {0}".format(int(rpm)))
4446+
self.widgets.lbl_spindle_act.set_label("{0}".format(int(rpm)))
44474447

44484448
if command == "stop":
44494449
# documentation of self.command.spindle()
44504450
# linuxcnc.spindle(direction, speed, spindle=0)
44514451
self.command.spindle(0)
4452-
self.widgets.lbl_spindle_act.set_label("S 0")
4452+
self.widgets.lbl_spindle_act.set_label("0")
44534453
elif command == "forward":
44544454
self.command.spindle(1, rpm_out)
44554455
elif command == "reverse":

0 commit comments

Comments
 (0)