Merge branch '2.9'

Author: c-morley

configs/sim/gmoccapy/6_axis.ini

@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

configs/sim/gmoccapy/7_axis.ini

@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

configs/sim/gmoccapy/7_axis_tool.ini

@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

configs/sim/gmoccapy/8_axis.ini

@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

configs/sim/gmoccapy/9_axis.ini

@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

configs/sim/gmoccapy/gmoccapy_XYZAC.ini

@@ -28,7 +28,6 @@ CYCLE_TIME =            100
 MAX_FEED_OVERRIDE =     1.5
 MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE = .5
-MAX_RAPID_OVERRIDE = 1.5
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166

configs/sim/gmoccapy/gmoccapy_pyngcgui.ini

@@ -12,7 +12,7 @@ DEBUG = 0
 [DISPLAY]
 DISPLAY = gmoccapy
 
-EMBED_TAB_NAME = Pyngcgui
+EMBED_TAB_NAME = NGC-GUI
 EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui.ui
 EMBED_TAB_LOCATION = ntb_user_tabs
 

configs/sim/gmoccapy/gmoccapy_tool_sensor.ini

@@ -30,7 +30,6 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_RAPID_OVERRIDE =    1.2
 MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE = .5
 

configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini

@@ -15,7 +15,6 @@ INTRO_GRAPHIC = linuxcnc.gif
 INTRO_TIME = 5
 MIN_SPINDLE_OVERRIDE = 0.25
 MAX_SPINDLE_OVERRIDE = 1.5
-MAX_RAPID_OVERRIDE = 1.2
 
 EMBED_TAB_NAME = Joints Meter DRO
 EMBED_TAB_LOCATION = ntb_preview

configs/sim/gmoccapy/pyngcgui.ui

@@ -9,8 +9,6 @@
       <object class="PyNgcGui" id="pyngcgui1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
         <property name="use_keyboard">False</property>
         <property name="debug">False</property>
         <property name="verbose">False</property>