Merge remote-tracking branch 'origin/main' into hicwic/feature/plot-graph

Author: mathoudebine

library/lcd/lcd_comm_rev_c.py

@@ -77,7 +77,7 @@ class Command(Enum):
     # STATIC IMAGE
     START_DISPLAY_BITMAP = bytearray((0x2c,))
     PRE_UPDATE_BITMAP = bytearray((0x86, 0xef, 0x69, 0x00, 0x00, 0x00, 0x01))
-    UPDATE_BITMAP = bytearray((0xcc, 0xef, 0x69, 0x00, 0x00))
+    UPDATE_BITMAP = bytearray((0xcc, 0xef, 0x69, 0x00))
 
     RESTARTSCREEN = bytearray((0x84, 0xef, 0x69, 0x00, 0x00, 0x00, 0x01))
     DISPLAY_BITMAP = bytearray((0xc8, 0xef, 0x69, 0x00, 0x17, 0x70))
@@ -352,7 +352,7 @@ def _generate_update_image(self, image, x, y, count, cmd: Command = None,
                 img_raw_data.append(f'{current_pixel[2]:02x}{current_pixel[1]:02x}{current_pixel[0]:02x}')
 
         image_msg = ''.join(img_raw_data)
-        image_size = f'{int((len(image_msg) / 2) + 2):04x}'  # The +2 is for the "ef69" that will be added later.
+        image_size = f'{int((len(image_msg) / 2) + 2):06x}'  # The +2 is for the "ef69" that will be added later.
 
         # logger.debug("Render Count: {}".format(count))
         payload = bytearray()

library/sensors/sensors_python.py

@@ -355,11 +355,15 @@ def virtual_percent() -> float:
 
     @staticmethod
     def virtual_used() -> int:  # In bytes
-        return psutil.virtual_memory().used
+        # Do not use psutil.virtual_memory().used: from https://psutil.readthedocs.io/en/latest/#memory
+        # "It is calculated differently depending on the platform and designed for informational purposes only"
+        return psutil.virtual_memory().total - psutil.virtual_memory().available
 
     @staticmethod
     def virtual_free() -> int:  # In bytes
-        return psutil.virtual_memory().free
+        # Do not use psutil.virtual_memory().free: from https://psutil.readthedocs.io/en/latest/#memory
+        # "note that this doesn’t reflect the actual memory available (use available instead)."
+        return psutil.virtual_memory().available
 
 
 class Disk(sensors.Disk):

library/stats.py

@@ -518,19 +518,19 @@ def stats():
 
         display_themed_value(
             theme_data=memory_stats_theme_data['VIRTUAL']['USED'],
-            value=int(sensors.Memory.virtual_used() / 1000000),
+            value=int(sensors.Memory.virtual_used() / 1024**2),
             min_size=5,
             unit=" M"
         )
         display_themed_value(
             theme_data=memory_stats_theme_data['VIRTUAL']['FREE'],
-            value=int(sensors.Memory.virtual_free() / 1000000),
+            value=int(sensors.Memory.virtual_free() / 1024**2),
             min_size=5,
             unit=" M"
         )
         display_themed_value(
             theme_data=memory_stats_theme_data['VIRTUAL']['TOTAL'],
-            value=int((sensors.Memory.virtual_free() + sensors.Memory.virtual_used()) / 1000000),
+            value=int((sensors.Memory.virtual_free() + sensors.Memory.virtual_used()) / 1024**2),
             min_size=5,
             unit=" M"
         )

requirements.txt

@@ -6,7 +6,7 @@ psutil~=5.9.8         # CPU / disk / network metrics
 pystray~=0.19.5       # Tray icon (all OS)
 babel~=2.14.0         # Date/time formatting
 ruamel.yaml~=0.18.5  # For configuration editor
-sv-ttk~=2.5.5         # Tk Sun Valley theme for configuration editor
+sv-ttk~=2.6.0         # Tk Sun Valley theme for configuration editor
 
 # Efficient image serialization
 numpy~=1.24.4; python_version < "3.9"   # For Python 3.8 max.