machinekit · zultron · Oct 23, 2020 · Oct 6, 2020 · Oct 6, 2020 · Oct 6, 2020
diff --git a/configs/by_machine/plasmac/axis/imperial_plasmac.ini b/configs/by_machine/plasmac/axis/imperial_plasmac.ini
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # the font for the Axis GUI, if not specified 'sans 10' will be used

diff --git a/configs/by_machine/plasmac/axis/metric_plasmac.ini b/configs/by_machine/plasmac/axis/metric_plasmac.ini
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # the font for the Axis GUI, if not specified 'sans 10' will be used

diff --git a/configs/by_machine/plasmac/default_axis_imperial.init b/configs/by_machine/plasmac/default_axis_imperial.init
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # the font for the Axis GUI, if not specified 'sans 10' will be used

diff --git a/configs/by_machine/plasmac/default_axis_metric.init b/configs/by_machine/plasmac/default_axis_metric.init
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # the font for the Axis GUI, if not specified 'sans 10' will be used

diff --git a/configs/by_machine/plasmac/default_gmoccapy_imperial.init b/configs/by_machine/plasmac/default_gmoccapy_imperial.init
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # percentage of cut-feed-rate used for paused motion speed

diff --git a/configs/by_machine/plasmac/default_gmoccapy_metric.init b/configs/by_machine/plasmac/default_gmoccapy_metric.init
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # percentage of cut-feed-rate used for paused motion speed

diff --git a/configs/by_machine/plasmac/gmoccapy/imperial_plasmac.ini b/configs/by_machine/plasmac/gmoccapy/imperial_plasmac.ini
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # percentage of cut-feed-rate used for paused motion speed

diff --git a/configs/by_machine/plasmac/gmoccapy/metric_plasmac.ini b/configs/by_machine/plasmac/gmoccapy/metric_plasmac.ini
@@ -1,4 +1,4 @@
-# this section only reqired if using the sim testing panel
+# this section is only required if using the sim testing panel
 [APPLICATIONS]
 DELAY                   = 3
 APP                     = test/plasmac_test.py
@@ -16,7 +16,7 @@ DBOUNCE                 = 1
 # 2 = use arc-ok-in for arcOK and move-down-in + move-up-in for THC (no need to connect arc-voltage-in)
 MODE                    = 0
 
-# enable(0) or disable(1) the plasmac config page, if not specified the default is enabled
+# enable(0) or disable(1) the PlasmaC config page, if not specified the default is enabled
 CONFIG_DISABLE          = 0
 
 # percentage of cut-feed-rate used for paused motion speed

diff --git a/configs/by_machine/plasmac/plasmac_axis.py b/configs/by_machine/plasmac/plasmac_axis.py
@@ -56,15 +56,15 @@
 mheight = int(fullsize[1])
 if wsize and 'x' in wsize.lower():
     width, height = wsize.lower().replace(' ','').split('x')
-    wxpos = (mwidth-int(width))/2
-    wypos = (mheight-int(height))/2
+    wxpos = int((mwidth-int(width))/2)
+    wypos = int((mheight-int(height))/2)
 elif wsize == '1':
     pad_width = 0
     pad_height = 0
     width = mwidth-pad_width
     height = mwidth-pad_height
-    wxpos = pad_width/2
-    wypos = pad_height/2
+    wxpos = int(pad_width/2)
+    wypos = int(pad_height/2)
 else:
     fsizes = ['9','10','11','12','13','14','15']
     if orientation == 'portrait':
@@ -85,8 +85,8 @@
             heights = [636, 664, 702, 768, 792, 828, 878]
     width = widths[fsizes.index(fsize)]
     height = heights[fsizes.index(fsize)]
-    wxpos = (mwidth-width)/2
-    wypos = (mheight-height)/2
+    wxpos = int((mwidth-width)/2)
+    wypos = int((mheight-height)/2)
 if width: # fixme - remove when portrait sizes fixed
     w('wm','geometry','.','{0}x{1}-{2}-{3}'.format(str(width),str(height),str(wxpos),str(wypos)))
     print('\nAxis window is {0} x {1}\n'.format(width,height))
@@ -402,10 +402,10 @@
 w('pack',fmonitor + '.updown.led-down','-side','left','-fill','none','-expand','0')
 w('canvas',fmonitor + '.led-corner-locked','-width',cwidth,'-height',cheight)
 w(fmonitor + '.led-corner-locked','create','oval',ledx,ledy,ledwidth,ledheight,'-fill','red','-disabledfill','grey')
-w('label',fmonitor + '.lCLlab','-text','THC Velocity Lock','-anchor','w','-width','15')
+w('label',fmonitor + '.lCLlab','-text','VAD Lock','-anchor','w','-width','15')
 w('canvas',fmonitor + '.led-kerf-locked','-width',cwidth,'-height',cheight)
 w(fmonitor + '.led-kerf-locked','create','oval',ledx,ledy,ledwidth,ledheight,'-fill','red','-disabledfill','grey')
-w('label',fmonitor + '.lKLlab','-text','THC Void Lock','-anchor','w','-width','15')
+w('label',fmonitor + '.lKLlab','-text','Void Sense Lock','-anchor','w','-width','15')
 if inifile.find('PLASMAC', 'MODE') != '2':
     w('grid',fmonitor + '.arc-voltage',    '-row','0','-column', '0','-columnspan','4','-rowspan','2','-sticky','se')
     w('grid',fmonitor + '.aVlab',          '-row','1','-column', '4','-columnspan','4','-sticky','w')
@@ -592,8 +592,7 @@
         root_window.tk.eval(ftop + ".jogspeed.l1 configure -text in/min")
         root_window.tk.eval(ftop + ".maxvel.l1 configure -text in/min")
     root_window.tk.eval(ftop + ".ajogspeed.l1 configure -text deg/min")
-    w('update_jog_slider_vel','999999')
-    w('update_maxvel_slider_vel','999999')
+    w('update_maxvel_slider_vel', max_linear_speed)
     max_feed_override = float(inifile.find("DISPLAY", "MAX_FEED_OVERRIDE") or 1.0)
     max_feed_override = int(max_feed_override * 100 + 0.5)
     widgets.feedoverride.configure(to=max_feed_override)
@@ -743,7 +742,7 @@ def user_button_pressed(button,commands):
     elif 'probe-test' in commands.lower():
         global probePressed, probeTimer, probeButton
         global probeStart, probeText, probeColor
-        if not probeTimer:
+        if not probeTimer and not hal.get_value('plasmac.z-offset-counts'):
             probePressed = True
             probeButton = button
             if commands.lower().replace('probe-test','').strip():

diff --git a/configs/by_machine/plasmac/plasmac_buttons.py b/configs/by_machine/plasmac/plasmac_buttons.py
@@ -87,7 +87,7 @@ def user_button_pressed(self, button, commands):
         elif commands.lower() == 'ohmic-test':
             hal.set_p('plasmac.ohmic-test','1')
         elif 'probe-test' in commands.lower():
-            if not self.probeTimer:
+            if not self.probeTimer and not hal.get_value('plasmac.z-offset-counts'):
                 self.probePressed = True
                 self.probeButton = button
                 if commands.lower().replace('probe-test','').strip():

diff --git a/configs/by_machine/plasmac/plasmac_config.glade b/configs/by_machine/plasmac/plasmac_config.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.18"/>
   <!-- interface-requires gladevcp 0.0 -->
+  <requires lib="gtk+" version="2.18"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAdjustment" id="arc-fail-delay-adj"/>
   <object class="GtkAdjustment" id="arc-max-starts-adj"/>
@@ -678,7 +678,7 @@ for mode 2 this is the percentage of max velocity used for THC</property>
                                     <property name="tooltip_text" translatable="yes">percentage of calculated kerfcross threshold to apply</property>
                                     <property name="xalign">0</property>
                                     <property name="xpad">2</property>
-                                    <property name="label" translatable="yes">Void Override (%)</property>
+                                    <property name="label" translatable="yes">Void Sense Override (%)</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -1447,7 +1447,7 @@ this also sets the maximum probe feed rate</property>
                             <property name="row_spacing">2</property>
                             <child>
                               <object class="HAL_SpinButton" id="scribe-arm-delay">
-                                <property name="width_request">66</property>
+                                <property name="width_request">50</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
@@ -1467,7 +1467,7 @@ this also sets the maximum probe feed rate</property>
                             </child>
                             <child>
                               <object class="HAL_SpinButton" id="scribe-on-delay">
-                                <property name="width_request">66</property>
+                                <property name="width_request">50</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
@@ -1551,11 +1551,10 @@ this also sets the maximum probe feed rate</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="n_columns">4</property>
-                            <property name="column_spacing">2</property>
                             <property name="row_spacing">2</property>
                             <child>
                               <object class="HAL_SpinButton" id="spotting-time">
-                                <property name="width_request">66</property>
+                                <property name="width_request">50</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>
@@ -1583,7 +1582,7 @@ this also sets the maximum probe feed rate</property>
                                 <property name="tooltip_text" translatable="yes">delay time after threshold voltage reached to turn torch off (mS)</property>
                                 <property name="xalign">1</property>
                                 <property name="xpad">2</property>
-                                <property name="label" translatable="yes">Delay(mS)</property>
+                                <property name="label" translatable="yes">Time On(mS)</property>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
@@ -1608,7 +1607,7 @@ this also sets the maximum probe feed rate</property>
                             </child>
                             <child>
                               <object class="HAL_SpinButton" id="spotting-threshold">
-                                <property name="width_request">66</property>
+                                <property name="width_request">50</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="has_tooltip">True</property>

diff --git a/configs/by_machine/plasmac/plasmac_config.py b/configs/by_machine/plasmac/plasmac_config.py
@@ -350,7 +350,7 @@ def idle_changed(self, halpin):
 
     def __init__(self, halcomp,builder,useropts):
 
-        self.plasmacVersion = 'PlasmaC v0.177'
+        self.plasmacVersion = 'PlasmaC v0.180'
 
         self.W = gtk.Window()
         self.halcomp = halcomp

diff --git a/configs/by_machine/plasmac/plasmac_connections.hal b/configs/by_machine/plasmac/plasmac_connections.hal
@@ -1,4 +1,4 @@
-# Keep your plasmac i/o connections here to prevent them from
+# Keep your PlasmaC I/O connections here to prevent them from
 # being overwritten by updates or pncconf/stepconf changes
 
 # Other customisations may be placed here as well

diff --git a/configs/by_machine/plasmac/plasmac_monitor.glade b/configs/by_machine/plasmac/plasmac_monitor.glade
@@ -383,7 +383,7 @@
                             <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">THC is locked due to velocity constraints</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">THC Velocity Lock</property>
+                            <property name="label" translatable="yes">VAD Lock</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -399,7 +399,7 @@
                             <property name="can_focus">False</property>
                             <property name="tooltip_text" translatable="yes">THC is locked due to void sensing constraints</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">THC Void Lock</property>
+                            <property name="label" translatable="yes">Void Sense Lock</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>

diff --git a/configs/by_machine/plasmac/plasmac_run_panel.glade b/configs/by_machine/plasmac/plasmac_run_panel.glade
@@ -812,7 +812,7 @@ turn off to use cut volts from parameters</property>
                                     <property name="tooltip_text" translatable="yes">enable/disable corner lock mode</property>
                                     <property name="xalign">0</property>
                                     <property name="xpad">2</property>
-                                    <property name="label" translatable="yes">Velocity Anti Dive Enable</property>
+                                    <property name="label" translatable="yes">Velocity Anti Dive Enable (VAD)</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>

diff --git a/configs/by_machine/plasmac/plasmac_run_tab.glade b/configs/by_machine/plasmac/plasmac_run_tab.glade
@@ -934,7 +934,7 @@ turn off to use cut volts from parameters</property>
                                     <property name="tooltip_text" translatable="yes">enable/disable corner lock mode</property>
                                     <property name="xalign">0</property>
                                     <property name="xpad">2</property>
-                                    <property name="label" translatable="yes">Velocity Anti Dive Enable</property>
+                                    <property name="label" translatable="yes">Velocity Anti Dive Enable (VAD)</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>

diff --git a/configs/by_machine/plasmac/plasmac_wizards.py b/configs/by_machine/plasmac/plasmac_wizards.py
@@ -199,7 +199,7 @@ def on_button_pressed(self, button):
         elif commands.lower() == 'ohmic-test':
             hal.set_p('plasmac.ohmic-test','1')
         elif 'probe-test' in commands.lower():
-            if not self.probeTimer:
+            if not self.probeTimer and not hal.get_value('plasmac.z-offset-counts'):
                 self.probePressed = True
                 self.probeButton = button
                 if commands.lower().replace('probe-test','').strip():

diff --git a/configs/by_machine/plasmac/test/plasmac_test.glade b/configs/by_machine/plasmac/test/plasmac_test.glade
@@ -4,8 +4,7 @@
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAdjustment" id="arcVoltageAdj">
-    <property name="lower">50</property>
-    <property name="upper">300</property>
+    <property name="upper">110</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -271,6 +270,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <signal name="toggled" handler="on_arcOk_toggled" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>