From 289ef47bb612eb440f4692f02d96682653720daf Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 10 Aug 2021 15:02:57 +0100 Subject: [PATCH 1/3] - changed gitignore - make tempSensor Max31865 more robust against reading failures - removed temp offset --- .gitignore | 2 ++ components/sensor/tempSensor_max31865.py | 10 ++++++---- components/sensor/tempsensor_factory.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8cb61ae..38ed003 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ __pycache__ .idea/ config.json +*.mat + diff --git a/components/sensor/tempSensor_max31865.py b/components/sensor/tempSensor_max31865.py index 20a368a..69257ca 100755 --- a/components/sensor/tempSensor_max31865.py +++ b/components/sensor/tempSensor_max31865.py @@ -45,13 +45,15 @@ class TempSensor_max31865(ATemperatureSensor): return self.__tempRaw() + self.temp_offset def __tempRaw(self): + T = 0 try: digits = self.read_digits() + R = TempSensor_max31865.calc_R(430, digits) + T = TempSensor_max31865.vanDusen_temp(R) + # print("Digits={}, R={:.3f} Ohm, T={:.2f} degC".format(digits,$ except: - return None - R = TempSensor_max31865.calc_R(430, digits) - T = TempSensor_max31865.vanDusen_temp(R) - # print("Digits={}, R={:.3f} Ohm, T={:.2f} degC".format(digits, R, T)) + pass + return T @staticmethod diff --git a/components/sensor/tempsensor_factory.py b/components/sensor/tempsensor_factory.py index 4bd8157..050393b 100644 --- a/components/sensor/tempsensor_factory.py +++ b/components/sensor/tempsensor_factory.py @@ -8,4 +8,4 @@ class TempSensorFactory: return TempSensorSim() elif "31865" in name: from components.sensor.tempSensor_max31865 import TempSensor_max31865 - return TempSensor_max31865(temp_offset=-1.2) + return TempSensor_max31865(temp_offset=0) From 5e49189ff9bfee366a35c0ccc9dd10c204c50ea5 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 10 Aug 2021 15:04:17 +0100 Subject: [PATCH 2/3] - refactored --- .gitignore => .gitignore.tpl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitignore => .gitignore.tpl (100%) diff --git a/.gitignore b/.gitignore.tpl similarity index 100% rename from .gitignore rename to .gitignore.tpl From 75d6aae8d64d5d3347d0b9735126dfc917762fec Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 10 Aug 2021 15:05:57 +0100 Subject: [PATCH 3/3] - fixed gitignore --- .gitignore.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore.tpl b/.gitignore.tpl index 38ed003..24172b8 100644 --- a/.gitignore.tpl +++ b/.gitignore.tpl @@ -1,4 +1,5 @@ __pycache__ +.gitignore .idea/ config.json *.mat