From c54c81dc2af44fbc797283670ba18d91d565711d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 25 Feb 2019 20:30:37 -0500 Subject: heater: Return heaters with a gcode_id from new get_gcode_sensors() The gcode.py code should not peek into the heater classes to obtain the gcode_id. Instead, introduce a new get_gcode_sensors() so that the gcode.py code does not need to. Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'klippy/gcode.py') diff --git a/klippy/gcode.py b/klippy/gcode.py index d6662152..184f3a81 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -373,9 +373,9 @@ class GCodeParser: # Tn:XXX /YYY B:XXX /YYY out = [] if self.heaters is not None: - for heater in self.heaters.get_all_heaters(): - cur, target = heater.get_temp(eventtime) - out.append("%s:%.1f /%.1f" % (heater.gcode_id, cur, target)) + for gcode_id, sensor in sorted(self.heaters.get_gcode_sensors()): + cur, target = sensor.get_temp(eventtime) + out.append("%s:%.1f /%.1f" % (gcode_id, cur, target)) if not out: return "T:0" return " ".join(out) -- cgit v1.2.3-70-g09d2