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

spi_temperature: Use bus.py helper code for spi 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-11-18 17:17:51 -05:00
parent 58890e32a2
commit 7cadd8d3f4
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
klippy/extras/spi_temperature.py
View File

@ -5,6 +5,7 @@
# #
# This file may be distributed under the terms of the GNU GPLv3 license. # This file may be distributed under the terms of the GNU GPLv3 license.
import math import math
import bus
# Sensor types defined in the micro-controller code (thermocouple.c) # Sensor types defined in the micro-controller code (thermocouple.c)
TS_CHIP_MAX31855 = 1 << 0 TS_CHIP_MAX31855 = 1 << 0
@ -25,27 +26,17 @@ class SensorBase:
self._callback = None self._callback = None
self.min_sample_value = self.max_sample_value = 0 self.min_sample_value = self.max_sample_value = 0
self._report_clock = 0 self._report_clock = 0
ppins = config.get_printer().lookup_object('pins') self.spi = bus.MCU_SPI_from_config(
pin_params = ppins.lookup_pin(config.get('sensor_pin')) config, 1, pin_option="sensor_pin", default_speed=4000000)
self.mcu = mcu = pin_params['chip']
pin = pin_params['pin']
# SPI bus configuration
spi_oid = mcu.create_oid()
spi_speed = config.getint('spi_speed', 4000000, minval=1)
mcu.add_config_cmd(
"config_spi oid=%u bus=0 pin=%s mode=1 rate=%u shutdown_msg=" % (
spi_oid, pin, spi_speed))
if config_cmd is not None: if config_cmd is not None:
config_cmd = "".join("%02x" % b for b in config_cmd) self.spi.spi_send(config_cmd)
mcu.add_config_cmd("spi_send oid=%u data=%s" % ( self.mcu = mcu = self.spi.get_mcu()
spi_oid, config_cmd), is_init=True)
# Reader chip configuration # Reader chip configuration
self.oid = oid = mcu.create_oid() self.oid = oid = mcu.create_oid()
mcu.add_config_cmd( mcu.add_config_cmd(
"config_thermocouple oid=%u spi_oid=%u chip_type=%u" % ( "config_thermocouple oid=%u spi_oid=%u chip_type=%u" % (
oid, spi_oid, chip_type)) oid, self.spi.get_oid(), chip_type))
mcu.register_msg(self._handle_spi_response, mcu.register_msg(self._handle_spi_response, "thermocouple_result", oid)
"thermocouple_result", oid)
mcu.register_config_callback(self._build_config) mcu.register_config_callback(self._build_config)
def setup_minmax(self, min_temp, max_temp): def setup_minmax(self, min_temp, max_temp):
adc_range = [self.calc_adc(min_temp), self.calc_adc(max_temp)] adc_range = [self.calc_adc(min_temp), self.calc_adc(max_temp)]