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>

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)

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