From 6721116e66d1af9abb8d326a04ae421370171ef0 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 2 May 2023 17:17:06 +0200
Subject: [PATCH] Fixes cpu_temp
---
hardware_components/abstract_hardware_components.py | 5 +++--
hardware_components/raspberry_pi.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hardware_components/abstract_hardware_components.py b/hardware_components/abstract_hardware_components.py
index 668cffb7..e12aa6fb 100644
--- a/hardware_components/abstract_hardware_components.py
+++ b/hardware_components/abstract_hardware_components.py
@@ -24,13 +24,14 @@ class ControllerAbstract(ABC):
self.exec_logger.warning(f'CPU temperature reading is not available for {self.board_name}')
cpu_temp = np.nan
else:
- cpu_temp = self._get_cpu_temp()
+ cpu_temp = self._cpu_temp
if cpu_temp > self.max_cpu_temp:
self.soh_logger.warning(f'CPU temperature of {self.board_name} is over the limit!')
return cpu_temp
@abstractmethod
- def _get_cpu_temp(self):
+ @property
+ def _cpu_temp(self):
pass
class MuxAbstract(ABC):
diff --git a/hardware_components/raspberry_pi.py b/hardware_components/raspberry_pi.py
index 284be0e4..1169a2e9 100644
--- a/hardware_components/raspberry_pi.py
+++ b/hardware_components/raspberry_pi.py
@@ -17,5 +17,5 @@ class Controller(ControllerAbstract):
self.max_cpu_temp = 85. # °C
@property
- def _get_cpu_temp(self):
+ def _cpu_temp(self):
return CPUTemperature().temperature
\ No newline at end of file
--
GitLab