Skip to content

Commit 5ccd22d

Browse files
committed
qtplasmac: do not copy m190 if rip sim
1 parent c94973b commit 5ccd22d

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.227.217'
1+
VERSION = '1.227.218'
22

33
'''
44
qtplasmac_handler.py
@@ -120,15 +120,15 @@ def __init__(self, halcomp, widgets, paths):
120120
self.PATHS = paths
121121
self.iniFile = INFO.INI
122122
self.foreColor = '#ffee06'
123-
124-
# ensure M190 is up to date
125-
if not 'M190' in self.PATHS.CONFIGPATH:
123+
# ensure M190 exists in config directory
124+
if not os.path.isfile(os.path.join(self.PATHS.CONFIGPATH, 'M190')):
126125
if '/usr' in self.PATHS.BASEDIR:
127126
m190Path = os.path.join(self.PATHS.BASEDIR, 'share/doc/linuxcnc/examples/sample-configs/by_machine/qtplasmac')
128127
else:
129128
m190Path = os.path.join(self.PATHS.BASEDIR, 'configs/by_machine/qtplasmac')
130-
COPY(os.path.join(m190Path, 'M190'), os.path.join(self.PATHS.CONFIGPATH, 'M190'))
131-
129+
# M190 already exists for RIP sims
130+
if os.path.realpath(m190Path) != os.path.realpath(self.PATHS.CONFIGPATH):
131+
COPY(os.path.join(m190Path, 'M190'), os.path.join(self.PATHS.CONFIGPATH, 'M190'))
132132
self.machineName = self.iniFile.find('EMC', 'MACHINE')
133133
self.unitsPerMm = 1
134134
self.units = self.iniFile.find('TRAJ', 'LINEAR_UNITS')

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.227.218 2022 July 13</u></b>
34+
<ul style="margin:0;">
35+
<li>do not copy m190 if rip sim</li>
36+
</ul>
37+
3338
<br><b><u>v1.227.217 2022 July 12</u></b>
3439
<ul style="margin:0;">
3540
<li>make gcode filter more generic</li>

0 commit comments

Comments
 (0)