adc_temperature: Move PrinterADCtoTemperature to adc_temperature.py

Move the low-level PrinterADCtoTemperature() class from thermistor.py
to adc_temperature.py and use it from the Linear() class.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 2 insertions, 25 deletions

diff --git a/klippy/extras/thermistor.py b/klippy/extras/thermistor.py
index 27255d85..3dff1520 100644
--- a/klippy/extras/thermistor.py
+++ b/klippy/extras/thermistor.py
@@ -4,12 +4,9 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import math, logging
+import adc_temperature
 
 KELVIN_TO_CELCIUS = -273.15
-SAMPLE_TIME = 0.001
-SAMPLE_COUNT = 8
-REPORT_TIME = 0.300
-RANGE_CHECK_COUNT = 4
 
 # Analog voltage to temperature converter for thermistors
 class Thermistor:
@@ -69,26 +66,6 @@ class Thermistor:
         r = math.exp(ln_r)
         return r / (self.pullup + r)
 
-# Interface between ADC and heater temperature callbacks
-class PrinterADCtoTemperature:
-    def __init__(self, config, adc_convert):
-        self.adc_convert = adc_convert
-        ppins = config.get_printer().lookup_object('pins')
-        self.mcu_adc = ppins.setup_pin('adc', config.get('sensor_pin'))
-        self.mcu_adc.setup_adc_callback(REPORT_TIME, self.adc_callback)
-    def setup_callback(self, temperature_callback):
-        self.temperature_callback = temperature_callback
-    def get_report_time_delta(self):
-        return REPORT_TIME
-    def adc_callback(self, read_time, read_value):
-        temp = self.adc_convert.calc_temp(read_value)
-        self.temperature_callback(read_time + SAMPLE_COUNT * SAMPLE_TIME, temp)
-    def setup_minmax(self, min_temp, max_temp):
-        adc_range = [self.adc_convert.calc_adc(t) for t in [min_temp, max_temp]]
-        self.mcu_adc.setup_minmax(SAMPLE_TIME, SAMPLE_COUNT,
-                                  minval=min(adc_range), maxval=max(adc_range),
-                                  range_check_count=RANGE_CHECK_COUNT)
-
 # Create an ADC converter with a thermistor
 def PrinterThermistor(config, params):
     pullup = config.getfloat('pullup_resistor', 4700., above=0.)
@@ -100,7 +77,7 @@ def PrinterThermistor(config, params):
         thermistor.setup_coefficients(
             params['t1'], params['r1'], params['t2'], params['r2'],
             params['t3'], params['r3'], name=config.get_name())
-    return PrinterADCtoTemperature(config, thermistor)
+    return adc_temperature.PrinterADCtoTemperature(config, thermistor)
 
 # Custom defined thermistors from the config file
 class CustomThermistor: