Skip to content

Commit 501f425

Browse files
committed
qtplasmac: fix RFL string comparisons
1 parent b1ad885 commit 501f425

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

lib/python/plasmac/run_from_line.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def run_from_line_get(file, startLine, lastLine=0):
4444
elif 'G20' in line:
4545
newData.append('G20')
4646
# find the type of first move
47-
if not codes['move']['isSet'] and 'G53G0' not in line.replace(' ', '') and 'G20' not in line and 'G21' not in line:
47+
if not codes['move']['isSet'] and 'G53G00' not in line.replace(' ', '') and 'G20' not in line and 'G21' not in line:
4848
if 'G00' in line:
4949
codes['move']['isSet'] = True
5050
codes['move']['isG00'] = True
@@ -101,8 +101,8 @@ def run_from_line_get(file, startLine, lastLine=0):
101101
codes['g9arc'] = 'G90.1'
102102
elif 'G91.1' in line:
103103
codes['g9arc'] = 'G91.1'
104-
if 'G00' in line and 'G53g00' not in line:
105-
codes['last']['code'] = 'G0'
104+
if 'G00' in line and 'G53G00' not in line:
105+
codes['last']['code'] = 'G00'
106106
if 'G01' in line:
107107
tmp = line.split('G01')[1]
108108
if tmp[0] not in '0123456789':
@@ -265,9 +265,9 @@ def run_from_line_set(rflFile, data, leadin, unitsPerMm):
265265
continue
266266
# if G00 is the first motion command after the selected line
267267
if data['codes']['move']['isG00']:
268-
# if G0 is the current motion command
268+
# if G00 is the current motion command
269269
if 'G00' in line:
270-
# no need to process a G53G0 command]
270+
# no need to process a G53G00 command]
271271
if 'G53G00' in line or 'G20' in line or 'G21' in line:
272272
data['newData'].append(line.strip())
273273
continue

0 commit comments

Comments
 (0)