mirror
/
grbl
kopia lustrzana https://github.com/gnea/grbl
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixed streamer to remove comments starting with ';' too before feeding to Grbl. 

This fixes the problem with comments containing non-ASCII characters, which can
be interpreted as immediate control chars by Grbl (jogging etc).
pull/1132/head
Andrey Zabolotnyi 2022-04-16 09:53:55 +03:00
rodzic bfb67f0c79
commit e37e41d766
1 zmienionych plików z 2 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
doc/script/stream.py
Wyświetl plik

@ -132,7 +132,7 @@ if settings_mode:
print "SETTINGS MODE: Streaming", args.gcode_file.name, " to ", args.device_file print "SETTINGS MODE: Streaming", args.gcode_file.name, " to ", args.device_file
for line in f: for line in f:
l_count += 1 # Iterate line counter l_count += 1 # Iterate line counter
# l_block = re.sub('\s|\(.*?\)','',line).upper() # Strip comments/spaces/new line and capitalize # l_block = re.sub('\s|\(.*?\)|;.*','',line).upper() # Strip comments/spaces/new line and capitalize
l_block = line.strip() # Strip all EOL characters for consistency l_block = line.strip() # Strip all EOL characters for consistency
if verbose: print "SND>"+str(l_count)+": \"" + l_block + "\"" if verbose: print "SND>"+str(l_count)+": \"" + l_block + "\""
s.write(l_block + '\n') # Send g-code block to grbl s.write(l_block + '\n') # Send g-code block to grbl
@ -157,7 +157,7 @@ else:
c_line = [] c_line = []
for line in f: for line in f:
l_count += 1 # Iterate line counter l_count += 1 # Iterate line counter
l_block = re.sub('\s|\(.*?\)','',line).upper() # Strip comments/spaces/new line and capitalize l_block = re.sub('\s|\(.*?\)|;.*','',line).upper() # Strip comments/spaces/new line and capitalize
# l_block = line.strip() # l_block = line.strip()
c_line.append(len(l_block)+1) # Track number of characters in grbl serial read buffer c_line.append(len(l_block)+1) # Track number of characters in grbl serial read buffer
grbl_out = '' grbl_out = ''