Update config.yaml with new HW_SENSORS settings

Author: mathoudebine

config.yaml

@@ -13,10 +13,18 @@ config:
   # THEME: bash-dark-green
   THEME: 3.5inchTheme2
 
-  # Network metrics
-  # Put the interface name or let it blank if the card does not exist
+  # Hardware sensors reading
+  # Choose the appropriate method for reading your hardware sensors:
+  # - PYTHON use Python libraries (psutils, GPUtil...) to read hardware sensors (supports all OS but not all HW)
+  # - LHM    use LibreHardwareMonitor library to read hardware sensors (Windows only)
+  # - STUB   use fake random data instead of real hardware sensors
+  # - AUTO   use the best method based on your OS: Windows OS will use LHM, other OS will use Python libraries
+  HW_SENSORS: AUTO
+
+  # Network interfaces
   # Linux/MacOS interfaces are named "eth0", "wlan0", "wlp1s0", "enp2s0"...
   # For Windows use the interfaces pretty name: "Ethernet 2", "Wi-Fi", ...
+  # Leave the fields empty if the card does not exist on your setup
   ETH: "eth0" # Ethernet Card
   WLO: "wlan0" # Wi-Fi Card
 

library/sensors/sensors.py

@@ -74,11 +74,6 @@ def disk_usage_percent() -> float:
     def disk_used() -> int:
         pass
 
-    @staticmethod
-    @abstractmethod
-    def disk_total() -> int:
-        pass
-
     @staticmethod
     @abstractmethod
     def disk_free() -> int:

library/sensors/sensors_python.py

@@ -241,10 +241,6 @@ def disk_usage_percent() -> float:
     def disk_used() -> int:
         return psutil.disk_usage("/").used
 
-    @staticmethod
-    def disk_total() -> int:
-        return psutil.disk_usage("/").total
-
     @staticmethod
     def disk_free() -> int:
         return psutil.disk_usage("/").free

library/sensors/sensors_simulated.py renamed to library/sensors/sensors_stub.py

@@ -47,11 +47,11 @@ def virtual_percent() -> float:
 
     @staticmethod
     def virtual_used() -> int:
-        return random.randint(300, 16000)
+        return random.randint(300000000, 16000000000)
 
     @staticmethod
     def virtual_free() -> int:
-        return random.randint(300, 16000)
+        return random.randint(300000000, 16000000000)
 
 
 class Disk(sensors.Disk):
@@ -63,10 +63,6 @@ def disk_usage_percent() -> float:
     def disk_used() -> int:
         return random.randint(1000000000, 2000000000000)
 
-    @staticmethod
-    def disk_total() -> int:
-        return random.randint(1000000000, 2000000000000)
-
     @staticmethod
     def disk_free() -> int:
         return random.randint(1000000000, 2000000000000)

library/stats.py

@@ -1,17 +1,38 @@
 import datetime
 import math
+import os
+import platform
+import sys
 
 from psutil._common import bytes2human
 
 import library.config as config
-import library.sensors.sensors_python as sensors
 from library.display import display
 from library.log import logger
 
 THEME_DATA = config.THEME_DATA
 CONFIG_DATA = config.CONFIG_DATA
 ETH_CARD = CONFIG_DATA["config"]["ETH"]
 WLO_CARD = CONFIG_DATA["config"]["WLO"]
+HW_SENSORS = CONFIG_DATA["config"]["HW_SENSORS"]
+
+if HW_SENSORS == "PYTHON":
+    import library.sensors.sensors_python as sensors
+elif HW_SENSORS == "LHM":
+    pass
+elif HW_SENSORS == "STUB":
+    import library.sensors.sensors_stub as sensors
+elif HW_SENSORS == "AUTO":
+    if platform.system() == 'Windows':
+        pass
+    else:
+        import library.sensors.sensors_python as sensors
+else:
+    logger.error("Unsupported SENSORS value in config.yaml")
+    try:
+        sys.exit(0)
+    except:
+        os._exit(0)
 
 
 def get_full_path(path, name):
@@ -375,6 +396,8 @@ def stats():
 class Disk:
     @staticmethod
     def stats():
+        used = sensors.Disk.disk_used()
+        free = sensors.Disk.disk_free()
         if THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("SHOW", False):
             display.lcd.DisplayProgressBar(
                 x=THEME_DATA['STATS']['DISK']['USED']['GRAPH'].get("X", 0),
@@ -394,7 +417,7 @@ def stats():
 
         if THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("SHOW", False):
             display.lcd.DisplayText(
-                text=f"{int(sensors.Disk.disk_used() / 1000000000):>5} G",
+                text=f"{int(used / 1000000000):>5} G",
                 x=THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("X", 0),
                 y=THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("Y", 0),
                 font=THEME_DATA['STATS']['DISK']['USED']['TEXT'].get("FONT", "roboto-mono/RobotoMono-Regular.ttf"),
@@ -425,7 +448,7 @@ def stats():
 
         if THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("SHOW", False):
             display.lcd.DisplayText(
-                text=f"{int(sensors.Disk.disk_total() / 1000000000):>5} G",
+                text=f"{int((free + used) / 1000000000):>5} G",
                 x=THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("X", 0),
                 y=THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("Y", 0),
                 font=THEME_DATA['STATS']['DISK']['TOTAL']['TEXT'].get("FONT", "roboto-mono/RobotoMono-Regular.ttf"),
@@ -439,7 +462,7 @@ def stats():
 
         if THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("SHOW", False):
             display.lcd.DisplayText(
-                text=f"{int(sensors.Disk.disk_free() / 1000000000):>5} G",
+                text=f"{int(free / 1000000000):>5} G",
                 x=THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("X", 0),
                 y=THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("Y", 0),
                 font=THEME_DATA['STATS']['DISK']['FREE']['TEXT'].get("FONT", "roboto-mono/RobotoMono-Regular.ttf"),