Skip to content

Commit e68174d

Browse files
committed
gscreen silverdragon: remove MAX_RAPID_OVERRIDE from INI file settings (#2392)
This makes no sense as rapids are done with the maximum machine velocity so an override > 1 would have no effect.
1 parent 1a7e06e commit e68174d

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

configs/sim/gscreen/silverdragon/silverdragon.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CYCLE_TIME = 100
1717
#PREFERENCE_FILE_PATH = /home/jim/linuxcnc/configs/sim.gscreen.gscreen_custom/silverdragon.pref
1818
# Values that will be allowed for override, 1.0 = 100%
1919
MAX_FEED_OVERRIDE = 1.5
20-
MAX_RAPID_OVERRIDE = 1.0
2120
MAX_SPINDLE_OVERRIDE = 1.2
2221
MIN_SPINDLE_OVERRIDE = 0.5
2322
DEFAULT_SPINDLE_SPEED = 24000

share/gscreen/skins/silverdragon/silverdragon_handler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,14 @@ def initialize_preferences(self):
207207
self.data.spindle_override_max = self.gscreen.inifile.find("DISPLAY", "MAX_SPINDLE_OVERRIDE")
208208
self.data.spindle_override_min = self.gscreen.inifile.find("DISPLAY", "MIN_SPINDLE_OVERRIDE")
209209
self.data.feed_override_max = self.gscreen.inifile.find("DISPLAY", "MAX_FEED_OVERRIDE")
210-
self.data.rapid_override_max = self.gscreen.inifile.find("DISPLAY", "MAX_RAPID_OVERRIDE")
211210
self.data.dro_actual = self.gscreen.inifile.find("DISPLAY", "POSITION_FEEDBACK")
212211
# set the slider limits
213212
self.widgets.jog_speed.set_range(100, float(self.jog_rate_max) * 60)
214213
self.widgets.jog_speed.set_value(default_jog_vel * 60)
215214
self.widgets.jog_speed.set_digits(0)
216215
self.widgets.spc_spindle.set_range(float(self.data.spindle_override_min) * 100, float(self.data.spindle_override_max) * 100)
217216
self.widgets.spc_spindle.set_value(100)
218-
self.widgets.spc_rapid.set_range(1, float(self.data.rapid_override_max) * 100)
217+
self.widgets.spc_rapid.set_range(1, 100)
219218
self.widgets.spc_rapid.set_value(100)
220219
self.widgets.spc_feed.set_range(1, float(self.data.feed_override_max) * 100)
221220
self.widgets.spc_feed.set_value(100)

0 commit comments

Comments
 (0)