aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/adc_temperature.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2020-03-05 11:46:01 -0500
committerKevin O'Connor <kevin@koconnor.net>2020-03-05 11:46:01 -0500
commita074af7c871633f2fad5dd207f9945a020a0cde5 (patch)
tree66a17cda6c778b16fc3c3e4bef17e1544d8ba20a /klippy/extras/adc_temperature.py
parent8d10379ad8d9a7d6a65f976dc120d67140860a95 (diff)
downloadkutter-a074af7c871633f2fad5dd207f9945a020a0cde5.tar.gz
kutter-a074af7c871633f2fad5dd207f9945a020a0cde5.tar.xz
kutter-a074af7c871633f2fad5dd207f9945a020a0cde5.zip
adc_temperature: Add builtin definition for PT1000 sensors
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/adc_temperature.py')
-rw-r--r--klippy/extras/adc_temperature.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/klippy/extras/adc_temperature.py b/klippy/extras/adc_temperature.py
index 7a4cc8d2..0ec13776 100644
--- a/klippy/extras/adc_temperature.py
+++ b/klippy/extras/adc_temperature.py
@@ -132,7 +132,7 @@ class LinearResistance:
def __init__(self, config, samples):
self.pullup = config.getfloat('pullup_resistor', 4700., above=0.)
try:
- self.li = LinearInterpolate(samples)
+ self.li = LinearInterpolate([(r, t) for t, r in samples])
except ValueError as e:
raise config.error("adc_temperature %s in heater %s" % (
str(e), config.get_name()))
@@ -156,7 +156,7 @@ class CustomLinearResistance:
if t is None:
break
r = config.getfloat("resistance%d" % (i,))
- self.samples.append((r, t))
+ self.samples.append((t, r))
def create(self, config):
lr = LinearResistance(config, self.samples)
return PrinterADCtoTemperature(config, lr)
@@ -266,6 +266,11 @@ PT100 = [
(1000, 4.48), (1100, 4.73)
]
+PT1000 = [
+ (0., 1000.), (100., 1385.1), (200., 1758.6), (300., 2120.5),
+ (400., 2470.9), (500., 2809.8),
+]
+
def load_config(config):
# Register default sensors
pheater = config.get_printer().lookup_object("heater")
@@ -278,6 +283,11 @@ def load_config(config):
func = (lambda config, params=params:
PrinterADCtoTemperature(config, LinearVoltage(config, params)))
pheater.add_sensor_factory(sensor_type, func)
+ for sensor_type, params in [("PT1000", PT1000)]:
+ func = (lambda config, params=params:
+ PrinterADCtoTemperature(config,
+ LinearResistance(config, params)))
+ pheater.add_sensor_factory(sensor_type, func)
def load_config_prefix(config):
if config.get("resistance1", None) is None: