Skip to content

Commit 142dd04

Browse files
committed
gmoccapy: use MAX_FEED_OVERRIDE using qt_istat
1 parent 9f30451 commit 142dd04

2 files changed

Lines changed: 1 addition & 8 deletions

File tree

src/emc/usr_intf/gmoccapy/getiniinfo.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,6 @@ def get_min_ang_jog_vel(self):
278278
LOG.warning("No MIN_ANGULAR_VELOCITY entry found in [DISPLAY] of INI file. Using default value of 0.1 degree / min.")
279279
return float(temp)
280280

281-
def get_max_feed_override(self):
282-
temp = self.inifile.find("DISPLAY", "MAX_FEED_OVERRIDE")
283-
if not temp:
284-
temp = 1.0
285-
LOG.warning("No MAX_FEED_OVERRIDE entry found in [DISPLAY] of INI file")
286-
return float(temp)
287-
288281
def get_embedded_tabs(self):
289282
# Check INI file for embed commands
290283
# NAME is used as the tab label if a notebook is used

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ def _get_ini_data(self):
595595

596596
self.spindle_override_max = self.INI.MAX_SPINDLE_OVERRIDE/100
597597
self.spindle_override_min = self.INI.MIN_SPINDLE_OVERRIDE/100
598-
self.feed_override_max = self.get_ini_info.get_max_feed_override()
598+
self.feed_override_max = self.INI.MAX_FEED_OVERRIDE/100
599599
self.dro_actual = self.get_ini_info.get_position_feedback_actual()
600600

601601
def _get_pref_data(self):

0 commit comments

Comments
 (0)