DEFAULT_LINEAR_VELOCITY [TRAJ] -> [DISPLAY] + MAX_LINEAR_VELOCITY from qt_istat TODO: update sample configs

Author: hansu

configs/sim/gmoccapy/gmoccapy.ini

@@ -5,6 +5,19 @@
 # General section -------------------------------------------------------------
 [EMC]
 VERSION = 1.1
+
+# TODO update-ini 1.1 --> 1.2:
+#
+# [DISPLAY]
+# MIN_SPINDLE_OVERRIDE  -> MIN_SPINDLE_0_OVERRIDE
+# MAX_SPINDLE_OVERRIDE  -> MAX_SPINDLE_0_OVERRIDE
+# DEFAULT_SPINDLE_SPEED -> DEFAULT_SPINDLE_0_SPEED
+# MIN_SPINDLE_SPEED     -> MIN_SPINDLE_0_SPEED
+# MAX_SPINDLE_SPEED     -> MAX_SPINDLE_0_SPEED
+#
+# move [TRAJ]DEFAULT_LINEAR_VELOCITY -> [DISPLAY]DEFAULT_LINEAR_VELOCITY
+# copy [TRAJ]MAX_LINEAR_VELOCITY -> [DISPLAY]MAX_LINEAR_VELOCITY
+
 MACHINE = gmoccapy
 DEBUG = 0
 

docs/src/config/ini-config.adoc

@@ -853,8 +853,6 @@ Finally, no amount of tweaking will speed up a tool path with lots of small, tig
 * `ANGULAR_UNITS =` _<units>_ - (((ANGULAR UNITS))) Specifies the 'machine units' for rotational axes.
   Possible choices are 'deg', 'degree' (360 per circle), 'rad', 'radian' (2*π per circle), 'grad', or 'gon' (400 per circle).
   This does not affect the angular units of NC code. In RS274NGC, A-, B- and C- words are always expressed in degrees.
-* `DEFAULT_LINEAR_VELOCITY = 0.0167` - The initial rate for jogs of linear axes, in machine units per second.
-  The value shown in 'AXIS' equals machine units per minute.
 * `DEFAULT_LINEAR_ACCELERATION = 2.0` - In machines with nontrivial kinematics, the acceleration used for "teleop" (Cartesian space) jogs, in 'machine units' per second per second.
 * `MAX_LINEAR_VELOCITY = 5.0` - (((MAX VELOCITY))) The maximum velocity for any axis or coordinated move, in 'machine units' per second.
   The value shown equals 300 units per minute.

share/gscreen/skins/silverdragon/silverdragon_handler.py

@@ -201,7 +201,7 @@ def initialize_preferences(self):
         default_spindle_speed = self.gscreen.inifile.find("DISPLAY", "DEFAULT_SPINDLE_SPEED")
         self.spindle_start_rpm = self.gscreen.prefs.getpref( 'spindle_start_rpm', default_spindle_speed, float )
         # get the values for the sliders
-        default_jog_vel = float(self.gscreen.inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY"))
+        default_jog_vel = float(self.gscreen.inifile.find("DISPLAY", "DEFAULT_LINEAR_VELOCITY"))
         self.fast_jog = default_jog_vel
         self.slow_jog = default_jog_vel / self.slow_jog_factor
         self.jog_rate_max = self.gscreen.inifile.find("TRAJ", "MAX_LINEAR_VELOCITY")

src/emc/usr_intf/axis/scripts/axis.py

@@ -3414,7 +3414,7 @@ def units(s, d=1.0):
     or None)
 default_jog_linear_speed = (
     inifile.find("DISPLAY", "DEFAULT_LINEAR_VELOCITY")
-    or inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY")
+    or inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY") # legacy
     or None)
 
 max_angular_speed = (

src/emc/usr_intf/gmoccapy/getiniinfo.py

@@ -231,29 +231,6 @@ def get_lathe_wear_offsets(self):
             return False
         return True
 
-    def get_jog_vel(self):
-        # get default jog velocity
-        # must convert from INI's units per second to gmoccapy's units per minute
-        temp = self.inifile.find("TRAJ", "DEFAULT_LINEAR_VELOCITY")
-        if not temp:
-            temp = self.inifile.find("TRAJ", "MAX_LINEAR_VELOCITY" )
-            if temp:
-                temp = float(temp) / 2
-                LOG.warning("No DEFAULT_LINEAR_VELOCITY entry found in [TRAJ] of INI file. Using half on MAX_LINEAR_VELOCITY.")
-            else:
-                temp = 3.0
-                LOG.warning("No DEFAULT_LINEAR_VELOCITY entry found in [TRAJ] of INI file. Using default value of 180 units / min.")
-        return float(temp) * 60
-
-    def get_max_jog_vel(self):
-        # get max jog velocity
-        # must convert from INI's units per second to gmoccapy's units per minute
-        temp = self.inifile.find("TRAJ", "MAX_LINEAR_VELOCITY")
-        if not temp:
-            temp = 10.0
-            LOG.warning("No MAX_LINEAR_VELOCITY entry found in [TRAJ] of INI file. Using default value of 600 units / min.")
-        return float(temp) * 60
-
     def get_embedded_tabs(self):
         # Check INI file for embed commands
         # NAME is used as the tab label if a notebook is used

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -587,8 +587,8 @@ def _get_ini_data(self):
         self.no_force_homing = self.get_ini_info.get_no_force_homing()
 
         # get the values for the sliders
-        self.rabbit_jog = self.get_ini_info.get_jog_vel()
-        self.jog_rate_max = self.get_ini_info.get_max_jog_vel()
+        self.rabbit_jog = self.INI.DEFAULT_LINEAR_JOG_VEL
+        self.jog_rate_max = self.INI.MAX_LINEAR_JOG_VEL
 
         self.spindle_override_max = self.INI.MAX_SPINDLE_OVERRIDE/100
         self.spindle_override_min = self.INI.MIN_SPINDLE_OVERRIDE/100

src/emc/usr_intf/pncconf/build_INI.py

@@ -370,8 +370,6 @@ def write_inifile(self, base):
         else:
             maxvel = max(self.d.xmaxvel, self.d.ymaxvel, self.d.zmaxvel)
         hypotvel = (self.d.xmaxvel**2 + self.d.ymaxvel**2 + self.d.zmaxvel**2) **.5
-        defvel = min(maxvel, max(.1, maxvel/10.))
-        print("DEFAULT_LINEAR_VELOCITY = %.2f" % defvel, file=file)
         print("MAX_LINEAR_VELOCITY = %.2f" % maxvel, file=file)
         if self.d.restore_joint_position:
             print("POSITION_FILE = position.txt", file=file)