gmoccapy: use now ..._SPINDLE_0_... instead of ..._SPINDLE_... using qt_istat

Author: hansu

configs/sim/gmoccapy/gmoccapy.ini

@@ -23,21 +23,18 @@ CYCLE_TIME = 100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    = 1.5
-MAX_SPINDLE_OVERRIDE = 1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MIN_SPINDLE_0_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE = 1.2
 
 # Initial value for spindle speed
-DEFAULT_SPINDLE_SPEED = 450
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # The following are not used, added here to suppress warnings (from qt_istat/logger).
 DEFAULT_LINEAR_VELOCITY = 35
 MIN_LINEAR_VELOCITY     = 0
 MAX_LINEAR_VELOCITY     = 234
-DEFAULT_SPINDLE_0_SPEED = 500
 MIN_SPINDLE_0_SPEED     = 0
 MAX_SPINDLE_0_SPEED     = 3000
-MAX_SPINDLE_0_OVERRIDE  = 1.2
-MIN_SPINDLE_0_OVERRIDE  = 0.5
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/

src/emc/usr_intf/gmoccapy/getiniinfo.py

@@ -268,29 +268,6 @@ def get_min_ang_jog_vel(self):
             LOG.warning("No MIN_ANGULAR_VELOCITY entry found in [DISPLAY] of INI file. Using default value of 0.1 degree / min.")
         return temp
 
-    def get_default_spindle_speed(self):
-        # check for default spindle speed settings
-        temp = self.inifile.getreal("DISPLAY", "DEFAULT_SPINDLE_SPEED")
-        if not temp:
-            temp = 300.0
-            LOG.warning("No DEFAULT_SPINDLE_SPEED entry found in [DISPLAY] of INI file")
-        return temp
-
-    def get_max_spindle_override(self):
-        # check for override settings
-        temp = self.inifile.getreal("DISPLAY", "MAX_SPINDLE_OVERRIDE")
-        if not temp:
-            temp = 1.0
-            LOG.warning("No MAX_SPINDLE_OVERRIDE entry found in [DISPLAY] of INI file")
-        return temp
-
-    def get_min_spindle_override(self):
-        temp = self.inifile.getreal("DISPLAY", "MIN_SPINDLE_OVERRIDE")
-        if not temp:
-            temp = 0.1
-            LOG.warning("No MIN_SPINDLE_OVERRIDE entry found in [DISPLAY] of INI file")
-        return temp
-
     def get_max_feed_override(self):
         temp = self.inifile.getreal("DISPLAY", "MAX_FEED_OVERRIDE")
         if not temp:

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -185,7 +185,7 @@ def __init__(self, argv):
         self.error_channel.poll()
 
         # set INI path for INI info class before widgets are loaded
-        INFO = Info(ini=argv[2])
+        self.INI = Info(ini=argv[2])
 
         self.builder = Gtk.Builder()
         # translation of the glade file will be done with
@@ -593,8 +593,8 @@ def _get_ini_data(self):
         self.rabbit_jog = self.get_ini_info.get_jog_vel()
         self.jog_rate_max = self.get_ini_info.get_max_jog_vel()
 
-        self.spindle_override_max = self.get_ini_info.get_max_spindle_override()
-        self.spindle_override_min = self.get_ini_info.get_min_spindle_override()
+        self.spindle_override_max = self.INI.MAX_SPINDLE_OVERRIDE/100
+        self.spindle_override_min = self.INI.MIN_SPINDLE_OVERRIDE/100
         self.feed_override_max = self.get_ini_info.get_max_feed_override()
         self.dro_actual = self.get_ini_info.get_position_feedback_actual()
 
@@ -638,7 +638,7 @@ def _get_pref_data(self):
 
         # if there is a INI Entry for default spindle speed, we will use that one as default
         # but if there is a setting in our preference file, that one will beet the INI entry
-        default_spindle_speed = self.get_ini_info.get_default_spindle_speed()
+        default_spindle_speed = self.INI.DEFAULT_SPINDLE_0_SPEED
         self.spindle_start_rpm = self.prefs.getpref( 'spindle_start_rpm', default_spindle_speed, float )
 
         self.kbd_height = self.prefs.getpref("kbd_height", 250, int)