From 04f5b2ad762883047fc633155f960c954095befa Mon Sep 17 00:00:00 2001 From: mcorino Date: Sat, 30 Oct 2021 14:05:52 +0200 Subject: [PATCH 1/2] Add nvme cpu temp detection --- .../Sensors/CpuTemperaturesSensor/CpuTemperaturesSensor.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Entities/Sensors/CpuTemperaturesSensor/CpuTemperaturesSensor.py b/Entities/Sensors/CpuTemperaturesSensor/CpuTemperaturesSensor.py index a443698..18bc266 100644 --- a/Entities/Sensors/CpuTemperaturesSensor/CpuTemperaturesSensor.py +++ b/Entities/Sensors/CpuTemperaturesSensor/CpuTemperaturesSensor.py @@ -45,6 +45,10 @@ def GetCpuTemperature_Unix(self): elif 'cpu_thermal' in temps: for temp in temps['cpu_thermal']: return temp.current + elif 'nvme' in temps: + for temp in temps['nvme']: + if 'Composite' in temp.label: + return temp.current else: self.Log(Logger.LOG_ERROR, "Can't get temperature for your system.") self.Log(Logger.LOG_ERROR, From e094957942ec13f23f6082240de457928bde2749 Mon Sep 17 00:00:00 2001 From: mcorino Date: Sat, 30 Oct 2021 14:15:22 +0200 Subject: [PATCH 2/2] fix exception --- Entities/Sensors/BatterySensor/BatterySensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Entities/Sensors/BatterySensor/BatterySensor.py b/Entities/Sensors/BatterySensor/BatterySensor.py index 90f366d..3a6947a 100644 --- a/Entities/Sensors/BatterySensor/BatterySensor.py +++ b/Entities/Sensors/BatterySensor/BatterySensor.py @@ -14,7 +14,7 @@ def Initialize(self): def PostInitialize(self): # Check if battery infomration are present if not psutil.sensors_battery(): - raise("No battery sensor for this host") + raise Exception("No battery sensor for this host") def Update(self): batteryInfo = self.GetBatteryInformation()