Skip to content

Commit 1cc45e2

Browse files
committed
plasmac: fix reconfigure mode for breakaway switch
1 parent aba660a commit 1cc45e2

4 files changed

Lines changed: 13 additions & 6 deletions

File tree

configs/by_machine/plasmac/configurator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,7 @@ def reconfigure(self):
18651865
outFile.write(line)
18661866
else:
18671867
outFile.write('# {}'.format(line))
1868-
elif 'breakaway' in line:
1868+
elif ':breakaway' in line:
18691869
if self.breakPin.get_text():
18701870
if self.oldBreakPin != self.breakPin.get_text():
18711871
a, b = line.strip('#').strip().split(self.oldBreakPin)
@@ -2016,7 +2016,7 @@ def populate_reconfigure(self):
20162016
self.oldFloatPin = (line.split('-switch', 1)[1].strip().split(' ', 1)[0].strip())
20172017
if not line.strip().startswith('#'):
20182018
self.floatPin.set_text(self.oldFloatPin)
2019-
elif 'breakaway' in line:
2019+
elif ':breakaway' in line:
20202020
self.oldBreakPin = (line.split('breakaway', 1)[1].strip().split(' ', 1)[0].strip())
20212021
if not line.strip().startswith('#'):
20222022
self.breakPin.set_text(self.oldBreakPin)

configs/by_machine/plasmac/plasmac_config.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,10 @@ def idle_changed(self, halpin):
349349
self.builder.get_object(key).update()
350350

351351
def __init__(self, halcomp,builder,useropts):
352-
353-
self.plasmacVersion = 'PlasmaC v0.189'
352+
# *** set VERSION in plasmac.comp ***
353+
# *** update versions.html ***
354+
# *** for major updates see check_version function in plasmac_config.py
355+
self.plasmacVersion = 'PlasmaC v0.190'
354356

355357
self.W = gtk.Window()
356358
self.halcomp = halcomp

configs/by_machine/plasmac/versions.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@ <h2>PlasmaC Updates</h2>
1919
</head>
2020
<body>
2121

22+
<br><b><u>v0.190 - 2021 Sep 24</u></b>
23+
<ul style="margin:0;">
24+
<li>fix reconfigure mode for breakaway switch</li>
25+
</ul>
26+
2227
<br><b><u>v0.189 - 2021 Sep 24</u></b>
2328
<ul style="margin:0;">
2429
<li>change default thc delay to 0.5</li>
2530
</ul>
2631

2732
<br><b><u>v0.188 - 2021 Feb 22</u></b>
2833
<ul style="margin:0;">
29-
<li>fix material verter for sheetcam update</li>
34+
<li>fix materialverter for sheetcam update</li>
3035
</ul>
3136

3237
<br><b><u>v0.187 - 2020 Dec 13</u></b>

src/hal/components/plasmac.comp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A plasma cutting table control component for use with the LinuxCNC V2.8 or later
77

88
.I VERSION:
99
.br
10-
0.187 - 2020 Dec 13
10+
0.190 - 2020 Dec 13
1111

1212
.I SUMMARY:
1313
.br

0 commit comments

Comments
 (0)