Merge pull request #91 from w1ld3r/main

Add support for ARM CPU temperature
mathoudebine · Nov 27, 2022 · ab5d8e0 · ab5d8e0
2 parents 216ed70 + d634325
commit ab5d8e0
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/library/stats.py b/library/stats.py
@@ -148,7 +148,8 @@ def load():
     @staticmethod
     def is_temperature_available():
         try:
-            if 'coretemp' in psutil.sensors_temperatures() or 'k10temp' in psutil.sensors_temperatures():
+            sensors_temps = psutil.sensors_temperatures()
+            if 'coretemp' in sensors_temps or 'k10temp' in sensors_temps or 'cpu_thermal' in sensors_temps:
                 return True
             else:
                 return False
@@ -159,12 +160,16 @@ def is_temperature_available():
     @staticmethod
     def temperature():
         cpu_temp = 0
-        if 'coretemp' in psutil.sensors_temperatures():
+        sensors_temps = psutil.sensors_temperatures()
+        if 'coretemp' in sensors_temps:
             # Intel CPU
-            cpu_temp = psutil.sensors_temperatures()['coretemp'][0].current
-        elif 'k10temp' in psutil.sensors_temperatures():
+            cpu_temp = sensors_temps['coretemp'][0].current
+        elif 'k10temp' in sensors_temps:
             # AMD CPU
-            cpu_temp = psutil.sensors_temperatures()['k10temp'][0].current
+            cpu_temp = sensors_temps['k10temp'][0].current
+        elif 'cpu_thermal' in sensors_temps:
+            # ARM CPU
+            cpu_temp = sensors_temps['cpu_thermal'][0].current
 
         if THEME_DATA['STATS']['CPU']['TEMPERATURE']['TEXT'].get("SHOW", False):
             display.lcd.DisplayText(
@@ -756,4 +761,4 @@ def stats():
                 background_image=get_full_path(THEME_DATA['PATH'],
                                                THEME_DATA['STATS']['DATE']['HOUR']['TEXT'].get("BACKGROUND_IMAGE",
                                                                                                 None))
-            )
+            )