diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-02-25 20:30:37 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-02-25 20:34:26 -0500 |
| commit | c54c81dc2af44fbc797283670ba18d91d565711d (patch) | |
| tree | 4f72a06807f6f023d79b16da52faf5ba21287851 /klippy/gcode.py | |
| parent | bb4fab5570b2176dabfda8b916d2231ce995d31d (diff) | |
| download | kutter-c54c81dc2af44fbc797283670ba18d91d565711d.tar.gz kutter-c54c81dc2af44fbc797283670ba18d91d565711d.tar.xz kutter-c54c81dc2af44fbc797283670ba18d91d565711d.zip | |
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 <kevin@koconnor.net>
Diffstat (limited to 'klippy/gcode.py')
| -rw-r--r-- | klippy/gcode.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |