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

adc_temperature: Minor simplification of default sensor registration 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-08-23 08:55:31 -04:00
parent bc30414362
commit 37bbf161f8
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
klippy/extras/adc_temperature.py
View File

@ -261,34 +261,33 @@ AD8497 = [
(1360, 6.671), (1380, 6.754) (1360, 6.671), (1380, 6.754)
] ]
def calc_pt1000(): def calc_pt100(base=100.):
# Calc PT1000 temperature/resistance pairs using formula # Calc PT100/PT1000 temperature/resistance pairs using formula
A, B = (3.9083e-3, -5.775e-7) A, B = (3.9083e-3, -5.775e-7)
return [(float(t), 1000. * (1. + A*t + B*t*t)) for t in range(0, 500, 10)] return [(float(t), base * (1. + A*t + B*t*t)) for t in range(0, 500, 10)]
PT1000 = calc_pt1000()
def calc_ina826_pt100(): def calc_ina826_pt100():
PT100 = [(t, .1 * r) for t, r in PT1000]
# Standard circuit is 4400ohm pullup with 10x gain to 5V # Standard circuit is 4400ohm pullup with 10x gain to 5V
return [(t, 10. * 5. * r / (4400. + r)) for t, r in PT100] return [(t, 10. * 5. * r / (4400. + r)) for t, r in calc_pt100()]
PT100 = calc_ina826_pt100() DefaultVoltageSensors = [
("AD595", AD595), ("AD597", AD597), ("AD8494", AD8494), ("AD8495", AD8495),
("AD8496", AD8496), ("AD8497", AD8497),
("PT100 INA826", calc_ina826_pt100())
]
DefaultResistanceSensors = [
("PT1000", calc_pt100(1000.))
]
def load_config(config): def load_config(config):
# Register default sensors # Register default sensors
pheaters = config.get_printer().load_object(config, "heaters") pheaters = config.get_printer().load_object(config, "heaters")
for sensor_type, params in [("AD595", AD595), for sensor_type, params in DefaultVoltageSensors:
("AD597", AD597),
("AD8494", AD8494),
("AD8495", AD8495),
("AD8496", AD8496),
("AD8497", AD8497),
("PT100 INA826", PT100)]:
func = (lambda config, params=params: func = (lambda config, params=params:
PrinterADCtoTemperature(config, LinearVoltage(config, params))) PrinterADCtoTemperature(config, LinearVoltage(config, params)))
pheaters.add_sensor_factory(sensor_type, func) pheaters.add_sensor_factory(sensor_type, func)
for sensor_type, params in [("PT1000", PT1000)]: for sensor_type, params in DefaultResistanceSensors:
func = (lambda config, params=params: func = (lambda config, params=params:
PrinterADCtoTemperature(config, PrinterADCtoTemperature(config,
LinearResistance(config, params))) LinearResistance(config, params)))