Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-10-31 02:15:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

heater: Return heaters with a gcode_id from new get_gcode_sensors()

Browse Source 
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>
This commit is contained in:
Kevin O'Connor
2019-02-25 20:30:37 -05:00
parent bb4fab5570
commit c54c81dc2a
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klippy/gcode.py
View File

@@ -373,9 +373,9 @@ class GCodeParser:
# Tn:XXX /YYY B:XXX /YYY # Tn:XXX /YYY B:XXX /YYY
out = [] out = []
if self.heaters is not None: if self.heaters is not None:
for heater in self.heaters.get_all_heaters(): for gcode_id, sensor in sorted(self.heaters.get_gcode_sensors()):
cur, target = heater.get_temp(eventtime) cur, target = sensor.get_temp(eventtime)
out.append("%s:%.1f /%.1f" % (heater.gcode_id, cur, target)) out.append("%s:%.1f /%.1f" % (gcode_id, cur, target))
if not out: if not out:
return "T:0" return "T:0"
return " ".join(out) return " ".join(out)

14
klippy/heater.py
View File

@@ -20,11 +20,10 @@ class error(Exception):
class Heater: class Heater:
error = error error = error
def __init__(self, config, sensor, gcode_id): def __init__(self, config, sensor):
self.printer = config.get_printer() self.printer = config.get_printer()
self.gcode = self.printer.lookup_object("gcode") self.gcode = self.printer.lookup_object("gcode")
self.name = config.get_name().split()[-1] self.name = config.get_name().split()[-1]
self.gcode_id = gcode_id
# Setup sensor # Setup sensor
self.sensor = sensor self.sensor = sensor
self.min_temp = config.getfloat('min_temp', minval=KELVIN_TO_CELCIUS) self.min_temp = config.getfloat('min_temp', minval=KELVIN_TO_CELCIUS)
@@ -230,14 +229,14 @@ class PrinterHeaters:
self.printer = config.get_printer() self.printer = config.get_printer()
self.sensor_factories = {} self.sensor_factories = {}
self.heaters = {} self.heaters = {}
self.heaters_gcode_id = {} self.gcode_id_to_sensor = {}
# Register TURN_OFF_HEATERS command # Register TURN_OFF_HEATERS command
gcode = self.printer.lookup_object('gcode') gcode = self.printer.lookup_object('gcode')
gcode.register_command("TURN_OFF_HEATERS", self.cmd_TURN_OFF_HEATERS, gcode.register_command("TURN_OFF_HEATERS", self.cmd_TURN_OFF_HEATERS,
desc=self.cmd_TURN_OFF_HEATERS_help) desc=self.cmd_TURN_OFF_HEATERS_help)
def add_sensor_factory(self, sensor_type, sensor_factory): def add_sensor_factory(self, sensor_type, sensor_factory):
self.sensor_factories[sensor_type] = sensor_factory self.sensor_factories[sensor_type] = sensor_factory
def setup_heater(self, config, gcode_id): def setup_heater(self, config, gcode_id=None):
heater_name = config.get_name().split()[-1] heater_name = config.get_name().split()[-1]
if heater_name == 'extruder': if heater_name == 'extruder':
heater_name = 'extruder0' heater_name = 'extruder0'
@@ -246,8 +245,9 @@ class PrinterHeaters:
# Setup sensor # Setup sensor
sensor = self.setup_sensor(config) sensor = self.setup_sensor(config)
# Create heater # Create heater
self.heaters[heater_name] = heater = Heater(config, sensor, gcode_id) self.heaters[heater_name] = heater = Heater(config, sensor)
self.heaters_gcode_id[heater.gcode_id] = heater_name if gcode_id is not None:
self.gcode_id_to_sensor[gcode_id] = heater
return heater return heater
def lookup_heater(self, heater_name): def lookup_heater(self, heater_name):
if heater_name == 'extruder': if heater_name == 'extruder':
@@ -267,6 +267,8 @@ class PrinterHeaters:
return self.sensor_factories[sensor_type](config) return self.sensor_factories[sensor_type](config)
def get_all_heaters(self): def get_all_heaters(self):
return self.heaters.values() return self.heaters.values()
def get_gcode_sensors(self):
return self.gcode_id_to_sensor.items()
cmd_TURN_OFF_HEATERS_help = "Turn off all heaters" cmd_TURN_OFF_HEATERS_help = "Turn off all heaters"
def cmd_TURN_OFF_HEATERS(self, params): def cmd_TURN_OFF_HEATERS(self, params):
print_time = self.printer.lookup_object('toolhead').get_last_move_time() print_time = self.printer.lookup_object('toolhead').get_last_move_time()