Merge pull request #419 from C-o-r-E/devel

Fix error where API state is requested and printer is offline
This commit is contained in:
Gina Häußge 2014-03-22 20:35:03 +01:00
commit b266dc24d7

View file

@ -607,12 +607,13 @@ class Printer():
bedTempOffset = None bedTempOffset = None
result = {} result = {}
for tool in self._temp.keys(): if self._temp is not None:
result["tool%d" % tool] = { for tool in self._temp.keys():
"actual": self._temp[tool][0], result["tool%d" % tool] = {
"target": self._temp[tool][1], "actual": self._temp[tool][0],
"offset": tempOffset[tool] if tool in tempOffset.keys() and tempOffset[tool] is not None else 0 "target": self._temp[tool][1],
} "offset": tempOffset[tool] if tool in tempOffset.keys() and tempOffset[tool] is not None else 0
}
if self._bedTemp is not None: if self._bedTemp is not None:
result["bed"] = { result["bed"] = {
"actual": self._bedTemp[0], "actual": self._bedTemp[0],