3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

heater: Add PrinterHeater get_status() function 

Provide a list of available heater and sensor names to
gcode macro templates through the printer.heater.available_heaters
and printer.heater.available_sensors variables

Signed-off-by: Simon Kühling <mail@simonkuehling.de>
This commit is contained in:
Simon Kühling 2019-12-12 13:33:23 +01:00 committed by KevinOConnor
parent 4cbbe18afd
commit 2721211456
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/Command_Templates.md
View File

@ -160,6 +160,13 @@ The following are common printer attributes:
- `printer.toolhead.homed_axes`: The current cartesian axes considered - `printer.toolhead.homed_axes`: The current cartesian axes considered
to be in a "homed" state. This is a string containing one or more of to be in a "homed" state. This is a string containing one or more of
"x", "y", "z". "x", "y", "z".
- `printer.heater.available_heaters`: Returns a list of all currently
available heaters by their full config section names,
e.g. `["extruder", "heater_bed", "heater_generic my_custom_heater"]`.
- `printer.heater.available_sensors`: Returns a list of all currently
available temperature sensors by their full config section names,
e.g. `["extruder", "heater_bed", "heater_generic my_custom_heater",
"temperature_sensor electronics_temp"]`.
The above list is subject to change - if using an attribute be sure to The above list is subject to change - if using an attribute be sure to
review the [Config Changes document](Config_Changes.md) when upgrading review the [Config Changes document](Config_Changes.md) when upgrading

7
klippy/heater.py
View File

@ -233,6 +233,8 @@ class PrinterHeaters:
self.sensor_factories = {} self.sensor_factories = {}
self.heaters = {} self.heaters = {}
self.gcode_id_to_sensor = {} self.gcode_id_to_sensor = {}
self.available_heaters = []
self.available_sensors = []
self.printer.register_event_handler("gcode:request_restart", self.printer.register_event_handler("gcode:request_restart",
self.turn_off_all_heaters) self.turn_off_all_heaters)
# Register TURN_OFF_HEATERS command # Register TURN_OFF_HEATERS command
@ -250,6 +252,7 @@ class PrinterHeaters:
# Create heater # Create heater
self.heaters[heater_name] = heater = Heater(config, sensor) self.heaters[heater_name] = heater = Heater(config, sensor)
self.register_sensor(config, heater, gcode_id) self.register_sensor(config, heater, gcode_id)
self.available_heaters.append(config.get_name())
return heater return heater
def lookup_heater(self, heater_name): def lookup_heater(self, heater_name):
if heater_name not in self.heaters: if heater_name not in self.heaters:
@ -276,6 +279,7 @@ class PrinterHeaters:
raise self.printer.config_error( raise self.printer.config_error(
"G-Code sensor id %s already registered" % (gcode_id,)) "G-Code sensor id %s already registered" % (gcode_id,))
self.gcode_id_to_sensor[gcode_id] = psensor self.gcode_id_to_sensor[gcode_id] = psensor
self.available_sensors.append(config.get_name())
def turn_off_all_heaters(self, print_time): def turn_off_all_heaters(self, print_time):
for heater in self.heaters.values(): for heater in self.heaters.values():
heater.set_temp(print_time, 0.) heater.set_temp(print_time, 0.)
@ -283,6 +287,9 @@ class PrinterHeaters:
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()
self.turn_off_all_heaters(print_time) self.turn_off_all_heaters(print_time)
def get_status(self, eventtime):
return {'available_heaters': self.available_heaters,
'available_sensors': self.available_sensors}
def add_printer_objects(config): def add_printer_objects(config):
config.get_printer().add_object('heater', PrinterHeaters(config)) config.get_printer().add_object('heater', PrinterHeaters(config))