Commit d95a66f0 authored by Guillaume Seguin's avatar Guillaume Seguin

Fix #519

parent 88f24178
...@@ -418,8 +418,8 @@ class Status: ...@@ -418,8 +418,8 @@ class Status:
if "T0" in temps: hotend_temp = float(temps["T0"][0]) if "T0" in temps: hotend_temp = float(temps["T0"][0])
elif "T" in temps: hotend_temp = float(temps["T"][0]) elif "T" in temps: hotend_temp = float(temps["T"][0])
else: hotend_temp = None else: hotend_temp = None
if temps["T"][1]: hotend_setpoint = float(temps["T"][1]) if "T0" in temps and temps["T0"][1] is not None: hotend_setpoint = float(temps["T0"][1])
elif temps["T0"][1]: hotend_setpoint = float(temps["T0"][1]) elif "T" in temps and temps["T"][1] is not None: hotend_setpoint = float(temps["T"][1])
else: hotend_setpoint = None else: hotend_setpoint = None
if hotend_temp is not None: if hotend_temp is not None:
self.extruder_temp = hotend_temp self.extruder_temp = hotend_temp
......
...@@ -1593,8 +1593,8 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1593,8 +1593,8 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
if self.display_graph: wx.CallAfter(self.graph.SetExtruder0Temperature, hotend_temp) if self.display_graph: wx.CallAfter(self.graph.SetExtruder0Temperature, hotend_temp)
if self.display_gauges: wx.CallAfter(self.hottgauge.SetValue, hotend_temp) if self.display_gauges: wx.CallAfter(self.hottgauge.SetValue, hotend_temp)
setpoint = None setpoint = None
if "T0" in temps and temps["T0"][1]: setpoint = float(temps["T0"][1]) if "T0" in temps and temps["T0"][1] is not None: setpoint = float(temps["T0"][1])
elif temps["T"][1]: setpoint = float(temps["T"][1]) elif temps["T"][1] is not None: setpoint = float(temps["T"][1])
if setpoint is not None: if setpoint is not None:
if self.display_graph: wx.CallAfter(self.graph.SetExtruder0TargetTemperature, setpoint) if self.display_graph: wx.CallAfter(self.graph.SetExtruder0TargetTemperature, setpoint)
if self.display_gauges: wx.CallAfter(self.hottgauge.SetTarget, setpoint) if self.display_gauges: wx.CallAfter(self.hottgauge.SetTarget, setpoint)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment