diff options
| author | Douglas Hammond <wizhippo@gmail.com> | 2019-02-25 22:30:13 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-02-26 12:07:00 -0500 |
| commit | 3887ad4fce4d13707b182051aedf4f5c04727815 (patch) | |
| tree | 23bebc1e2859512a523eda4e5392c612b1391037 /klippy/extras | |
| parent | 34209e6189efb8d41ff54e21c47c1a6ec0c36c0e (diff) | |
| download | kutter-3887ad4fce4d13707b182051aedf4f5c04727815.tar.gz kutter-3887ad4fce4d13707b182051aedf4f5c04727815.tar.xz kutter-3887ad4fce4d13707b182051aedf4f5c04727815.zip | |
heater: Support generic gcode_id registration for sensors
Support reading a "gcode_id" parameter from heater/sensor config
sections.
Signed-off-by: Douglas Hammond <wizhippo@gmail.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/heater_generic.py | 10 | ||||
| -rw-r--r-- | klippy/extras/temperature_fan.py | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/klippy/extras/heater_generic.py b/klippy/extras/heater_generic.py index b08b33f2..fbe13edc 100644 --- a/klippy/extras/heater_generic.py +++ b/klippy/extras/heater_generic.py @@ -4,13 +4,5 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. -import logging - -class PrinterHeaterGeneric: - def __init__(self, config): - self.printer = config.get_printer() - gcode_id = config.get("gcode_id") - self.heater = self.printer.lookup_object('heater').setup_heater(config, gcode_id) - def load_config_prefix(config): - return PrinterHeaterGeneric(config) + return config.get_printer().lookup_object('heater').setup_heater(config) diff --git a/klippy/extras/temperature_fan.py b/klippy/extras/temperature_fan.py index 2bf00303..11fb88c4 100644 --- a/klippy/extras/temperature_fan.py +++ b/klippy/extras/temperature_fan.py @@ -21,6 +21,7 @@ class TemperatureFan: self.sensor = self.printer.lookup_object('heater').setup_sensor(config) self.sensor.setup_minmax(self.min_temp, self.max_temp) self.sensor.setup_callback(self.temperature_callback) + self.printer.lookup_object('heater').register_sensor(config, self) self.speed_delay = self.sensor.get_report_time_delta() self.max_speed = config.getfloat('max_speed', 1., above=0., maxval=1.) self.min_speed = config.getfloat('min_speed', 0.3, above=0., maxval=1.) @@ -52,6 +53,8 @@ class TemperatureFan: def stats(self, eventtime): return False, '%s: temp=%.1f fan_speed=%.3f' % ( self.name, self.last_temp, self.last_speed_value) + def get_temp(self, eventtime): + return self.last_temp, self.target_temp ###################################################################### # Bang-bang control algo |