pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into slicerSupport

Browse source
This commit is contained in:
Gina Häußge 2013-09-10 23:18:30 +02:00
commit a87541c354
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
octoprint/util/comm.py
View file

@ -1137,26 +1137,28 @@ class PrintingGcodeFileInformation(PrintingFileInformation):
line = line[0:line.find(";")]
line = line.strip()
if len(line) > 0:
(tempOffset, bedTempOffset) = self._offsetCallback()
if tempOffset != 0 or bedTempOffset != 0:
tempMatch = self._tempCommandPattern.match(line)
if tempMatch is not None:
if tempMatch.group(1) == "104" or tempMatch.group(1) == "109":
offset = tempOffset
elif tempMatch.group(1) == "140" or tempMatch.group(1) == "190":
offset = bedTempOffset
else:
offset = 0
if self._offsetCallback is not None:
(tempOffset, bedTempOffset) = self._offsetCallback()
if tempOffset != 0 or bedTempOffset != 0:
tempMatch = self._tempCommandPattern.match(line)
if tempMatch is not None:
if tempMatch.group(1) == "104" or tempMatch.group(1) == "109":
offset = tempOffset
elif tempMatch.group(1) == "140" or tempMatch.group(1) == "190":
offset = bedTempOffset
else:
offset = 0
try:
temp = float(tempMatch.group(2))
newTemp = temp + offset
line = line.replace("S" + tempMatch.group(2), "S%f" % newTemp)
except ValueError:
pass
try:
temp = float(tempMatch.group(2))
newTemp = temp + offset
line = line.replace("S" + tempMatch.group(2), "S%f" % newTemp)
except ValueError:
pass
return line
else:
return None
class StreamingGcodeFileInformation(PrintingGcodeFileInformation):
pass
def __init__(self, filename):
PrintingGcodeFileInformation.__init__(self, filename, None)