q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly parse Marlin's "opened file x" message

master
Gina Häußge 2013-05-22 18:25:26 +02:00
parent 33bcf284a9
commit 75f53b8ab9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octoprint/util/comm.py
View File

@ -565,8 +565,8 @@ class MachineCom(object):
self._sdFileSize = int(match.group(2))
self._callback.mcProgress()
elif 'File opened' in line:
# answer to M23, at least on Marlin, Repetier and Sprinter: "File opened: %s Size: %d"
match = re.search("File opened: (.*?) Size: ([0-9]*)", line)
# answer to M23, at least on Marlin, Repetier and Sprinter: "File opened:%s Size:%d"
match = re.search("File opened:\s*(.*?)\s+Size:\s*([0-9]*)", line)
self._sdFile = match.group(1)
self._sdFileSize = int(match.group(2))
elif 'File selected' in line: