Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
a4166d9
qtvcp -screenoptions: have dialogs follow stylesheets
c-morley Oct 6, 2020
5f8ffa5
qtvcp -qtdefault: add calculator dialog for macro entries
c-morley Oct 6, 2020
440999c
qtvcp -entry_widget: change soft keyboard so it can be styled
c-morley Oct 6, 2020
08a7b42
qtvcp -screenoptions: have dialogs follow stylesheets
c-morley Oct 6, 2020
faad4fa
qtvcp -qtdefault: add calculator dialog for macro entries
c-morley Oct 6, 2020
4947c22
Merge branch '2.8'
c-morley Oct 6, 2020
ce69cc4
qtvcp -add a HAL label widget
c-morley Oct 7, 2020
1afe970
qtvcp -allow toolbuttons to be styled with stylesheets
c-morley Oct 7, 2020
369afbe
qtvcp -use HALLabels for float displays
c-morley Oct 7, 2020
cb9d8b2
qtvcp -qtdragon: restyle dialogs
c-morley Oct 7, 2020
913b5de
qtvcp -fix HAL float input pins only getting s32
c-morley Oct 7, 2020
29d5066
docs -qtvcp widgets: add HALLabel and DoubleScale
c-morley Oct 7, 2020
6611f1d
Merge branch '2.8'
c-morley Oct 7, 2020
3a70732
5axisgui.py aids for testing
dngarrett Oct 7, 2020
2550413
pncconf -fix opposite setting of stepgens step/dir invert pins
c-morley Oct 8, 2020
03b1a40
Merge branch '2.8'
c-morley Oct 8, 2020
bd474d0
qtvcp -add optional speech to LED state change
c-morley Oct 8, 2020
5c07c7a
docs -add test panel image to docs
c-morley Oct 8, 2020
82c93a7
Merge branch '2.8'
c-morley Oct 9, 2020
81819b0
5axiskins & sim (bridgemill) updates
dngarrett Oct 8, 2020
bfa6ea0
5axiskins.c fix note for theta,phi
dngarrett Oct 9, 2020
b7c2182
Fix rolfmill example could be tested now without additional moves
podarok Oct 9, 2020
1784d2e
Merge pull request #956 from podarok/patch-1
rene-dev Oct 9, 2020
a89d46d
hal: Remove component type magic numbers
ChrisNisbet01 Oct 10, 2020
461c1a2
Merge pull request #957 from ChrisNisbet01/Remove_component_type_magi…
rene-dev Oct 10, 2020
a6854ca
ini-config.txt WRAPPED_ROTARY for axis not joint
dngarrett Oct 10, 2020
bb94dd5
docs: Update copyright to 2020
Oct 10, 2020
3e87f85
Fix gpio and pin relationship on rpi2 and later Closes #955
Oct 10, 2020
7e564eb
Update internal names after file renaming in 2004 Closes #922
Oct 10, 2020
76e0f3f
man-page es: Change section 9 -> 1
Oct 10, 2020
d9bbc69
gs2_vfd: Fixes how many registers that is written to Closes #506
Oct 10, 2020
bf7b3d6
5axisgui.py support tool diameter
dngarrett Oct 11, 2020
9781b03
Merge pull request #960 from havardAasen/minor-issues
rene-dev Oct 11, 2020
57d5f17
5axiskins.c W usage notes
dngarrett Oct 11, 2020
99be22e
5axis.ini (bridgemill) demo sim config update
dngarrett Oct 11, 2020
2fa756e
stepgen: Fix user step type initialization
ChrisNisbet01 Oct 11, 2020
2bcaf96
qtvcp -fix tool offst entry of negative numbers
c-morley Oct 12, 2020
1eaa663
Merge branch '2.8'
c-morley Oct 12, 2020
3dbe2d7
Merge pull request #961 from ChrisNisbet01/fix_stepgen_MAX_CYCLES_bug
rene-dev Oct 12, 2020
81f0db3
qtvcp -fix tool_offset loading/saving for mills
c-morley Oct 13, 2020
e0ace6b
Merge branch '2.8'
c-morley Oct 13, 2020
69741dc
ini-config.txt additional updates for JA
dngarrett Oct 13, 2020
e6cfcfa
userkins.comp (new) userkins using halcompile
dngarrett Oct 13, 2020
f2ec290
Merge remote-tracking branch 'origin/2.8'
dngarrett Oct 14, 2020
b9150c8
userkins.comp -- note max no of joints,extrajoints
dngarrett Oct 14, 2020
8024dfb
qtvcp -add in missing code for hal file loading
c-morley Oct 14, 2020
29d9d33
hal_glib -add convience function for is_joint_homed
c-morley Oct 14, 2020
dd06d37
qtvcp -action_buttons: fix homing/unhoming individual joints
c-morley Oct 14, 2020
f03ac59
Merge branch '2.8'
c-morley Oct 14, 2020
6b8e030
qtvcp -fix specifying a direct path to qtvcp panels
c-morley Oct 14, 2020
4a68774
control.c joint jogs inhibition if feedhold
dngarrett Oct 15, 2020
171583e
qtvcp -fix hal component name with direct path loading
c-morley Oct 15, 2020
cef8225
command.c for consistency, allow jogs if feedhold
dngarrett Oct 15, 2020
8632190
motion.9 motion.feed-inhibit gcode only (not jogs)
dngarrett Oct 16, 2020
edbc7b1
Merge remote-tracking branch 'origin/2.8'
dngarrett Oct 16, 2020
99ed8ac
hal_glib -do basic check for float variable befoe setting jog increments
c-morley Oct 17, 2020
8a3567a
qtvcp -except but ignore unrecognised jog increments.
c-morley Oct 17, 2020
ac7995e
plasmac: update user-docs and update/add images, update supporting Pl…
snowgoer540 Oct 19, 2020
0ccf077
Merge pull request #963 from snowgoer540/gregc/docs-update
phillc54 Oct 20, 2020
253c110
plasmac: update user-docs and update/add images, update supporting Pl…
snowgoer540 Oct 19, 2020
dc36ba1
plasmac: fix void and vad naming inconsistencies
phillc54 Oct 20, 2020
477faa9
plasmac: inhibit probe test button while probing
phillc54 Oct 20, 2020
6fc2eba
plasmac: fix test panel
phillc54 Oct 20, 2020
c8e209f
plasmac: fix axis geometry error
phillc54 Oct 20, 2020
06d6dda
plasmac: rename spotting delay to spotting time
phillc54 Oct 20, 2020
9b1c633
plasmac: feedback for active conversational shape
phillc54 Oct 20, 2020
f290268
plasmac: fix axis portrait mode sliders
phillc54 Oct 20, 2020
84293e6
plasmac: disable ohmic and float fault sensing until arc ok
phillc54 Oct 20, 2020
3c41f3d
Merge branch '2.8'
phillc54 Oct 20, 2020
7a99a43
hy_vfd:Allow setting of arbitrary registers
andypugh Oct 20, 2020
b522139
changed pocket_number to mod_pocket in direction logic
inoxix Oct 20, 2020
2d192bb
Update PMX picture
snowgoer540 Oct 20, 2020
68d1346
Merge pull request #965 from snowgoer540/gregc/pmx_update
phillc54 Oct 20, 2020
a498ab5
Merge pull request #964 from inoxix/carousel_modulo_fix
andypugh Oct 20, 2020
6e68ca4
plasmac: arc timing issues
phillc54 Oct 21, 2020
ca06fc2
Merge branch '2.8'
phillc54 Oct 21, 2020
ce17805
Merge branch 'linuxcnc/master' into merge-21-october-2020 (LinuxCNC@m…
cerna Oct 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/axis/imperial_plasmac.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/axis/metric_plasmac.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/default_axis_imperial.init
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/default_axis_metric.init
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/default_gmoccapy_imperial.init
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/default_gmoccapy_metric.init
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/gmoccapy/imperial_plasmac.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/gmoccapy/metric_plasmac.ini
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
21 changes: 10 additions & 11 deletions configs/by_machine/plasmac/plasmac_axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand All @@ -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))
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion configs/by_machine/plasmac/plasmac_buttons.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
15 changes: 7 additions & 8 deletions configs/by_machine/plasmac/plasmac_config.glade
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion configs/by_machine/plasmac/plasmac_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/by_machine/plasmac/plasmac_connections.hal
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/plasmac_monitor.glade
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion configs/by_machine/plasmac/plasmac_run_panel.glade
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion configs/by_machine/plasmac/plasmac_run_tab.glade
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion configs/by_machine/plasmac/plasmac_wizards.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions configs/by_machine/plasmac/test/plasmac_test.glade
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading