Merge branch 'master' into ssl

This commit is contained in:
Andrew de Quincey 2021-04-28 23:16:15 +01:00
commit 86a38032da
2 changed files with 3 additions and 1 deletions

View File

@ -41,6 +41,7 @@ thermocouple_type = MAX31856.MAX31856_S_TYPE
gpio_sensor_cs = 27
gpio_sensor_clock = 22
gpio_sensor_data = 17
gpio_sensor_di = 10 # only used with max31856
### duty cycle of the entire system in seconds. Every N seconds a decision
### is made about switching the relay[s] on & off and for how long.

View File

@ -107,7 +107,8 @@ class TempSensorReal(TempSensor):
from max31856 import MAX31856
software_spi = { 'cs': config.gpio_sensor_cs,
'clk': config.gpio_sensor_clock,
'do': config.gpio_sensor_data }
'do': config.gpio_sensor_data,
'di': config.gpio_sensor_di }
self.thermocouple = MAX31856(tc_type=config.thermocouple_type,
software_spi = sofware_spi,
units = config.temp_scale