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

spi_temperature: Remove non-spi flags from SensorBase 

The SensorBase class is used exclusively for SPI transfers, so no need
to track non-spi settings.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-07-24 14:05:35 -04:00
parent c0bf4327fd
commit 270080cd4c
1 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
klippy/extras/spi_temperature.py
View File

@ -10,9 +10,7 @@ import math
# SensorBase # SensorBase
###################################################################### ######################################################################
SAMPLE_TIME_DEFAULT = 0.001 REPORT_TIME = 0.300
SAMPLE_COUNT_DEFAULT = 8
REPORT_TIME_DEFAULT = 0.300
VALID_SPI_SENSORS = { VALID_SPI_SENSORS = {
'MAX31855' : 1, 'MAX31855' : 1,
@ -24,18 +22,9 @@ VALID_SPI_SENSORS = {
class error(Exception): class error(Exception):
pass pass
class SensorBase(object): class SensorBase:
error = error error = error
def __init__(self, def __init__(self, config):
config,
is_spi = False,
sample_time = SAMPLE_TIME_DEFAULT,
sample_count = SAMPLE_COUNT_DEFAULT,
report_time = REPORT_TIME_DEFAULT):
self.is_spi = is_spi
self.sample_time = sample_time
self.sample_count = sample_count
self.report_time = report_time
self.min_temp = config.getfloat('min_temp', minval=0., default=0.) self.min_temp = config.getfloat('min_temp', minval=0., default=0.)
self.max_temp = config.getfloat('max_temp', above=self.min_temp) self.max_temp = config.getfloat('max_temp', above=self.min_temp)
self._callback = None self._callback = None
@ -46,7 +35,6 @@ class SensorBase(object):
self.max_sample_value = max(adc_range) self.max_sample_value = max(adc_range)
self._report_clock = 0 self._report_clock = 0
ppins = config.get_printer().lookup_object('pins') ppins = config.get_printer().lookup_object('pins')
if is_spi:
pin_params = ppins.lookup_pin('digital_out', sensor_pin) pin_params = ppins.lookup_pin('digital_out', sensor_pin)
self.mcu = mcu = pin_params['chip'] self.mcu = mcu = pin_params['chip']
pin = pin_params['pin'] pin = pin_params['pin']
@ -69,23 +57,15 @@ class SensorBase(object):
mcu.register_msg(self._handle_spi_response, mcu.register_msg(self._handle_spi_response,
"thermocouple_result", oid) "thermocouple_result", oid)
mcu.add_config_object(self) mcu.add_config_object(self)
else:
self.mcu = ppins.setup_pin('adc', sensor_pin)
self.mcu.setup_minmax(
sample_time, sample_count,
minval=min(adc_range), maxval=max(adc_range))
def setup_minmax(self, min_temp, max_temp): def setup_minmax(self, min_temp, max_temp):
pass pass
def setup_callback(self, cb): def setup_callback(self, cb):
if self.is_spi:
self._callback = cb self._callback = cb
else:
self.mcu.setup_callback(self.report_time, cb)
def get_report_time_delta(self): def get_report_time_delta(self):
return self.report_time return REPORT_TIME
def build_config(self): def build_config(self):
clock = self.mcu.get_query_slot(self.oid) clock = self.mcu.get_query_slot(self.oid)
self._report_clock = self.mcu.seconds_to_clock(self.report_time) self._report_clock = self.mcu.seconds_to_clock(REPORT_TIME)
self.mcu.add_config_cmd( self.mcu.add_config_cmd(
"query_thermocouple oid=%u clock=%u rest_ticks=%u" "query_thermocouple oid=%u clock=%u rest_ticks=%u"
" min_value=%u max_value=%u" % ( " min_value=%u max_value=%u" % (
@ -187,7 +167,7 @@ class Thermocouple(SensorBase):
else: else:
self.val_a = 0.25 self.val_a = 0.25
self.scale = 18 self.scale = 18
SensorBase.__init__(self, config, is_spi = True, sample_count = 1) SensorBase.__init__(self, config)
def _check_faults_simple(self, val): def _check_faults_simple(self, val):
if self.chip_type == "MAX6675": if self.chip_type == "MAX6675":
if val & 0x02: if val & 0x02:
@ -295,7 +275,7 @@ class RTD(SensorBase):
self.reference_r = config.getfloat('rtd_reference_r', 430., above=0.) self.reference_r = config.getfloat('rtd_reference_r', 430., above=0.)
self.num_wires = config.getint('rtd_num_of_wires', 2) self.num_wires = config.getint('rtd_num_of_wires', 2)
self.use_50Hz_filter = config.getboolean('rtd_use_50Hz_filter', False) self.use_50Hz_filter = config.getboolean('rtd_use_50Hz_filter', False)
SensorBase.__init__(self, config, is_spi = True, sample_count = 1) SensorBase.__init__(self, config)
def check_faults(self, fault): def check_faults(self, fault):
if fault & 0x80: if fault & 0x80:
raise self.error("Max31865 RTD input is disconnected") raise self.error("Max31865 RTD input is disconnected")