Merge remote-tracking branch 'origin/main' into fix/724-turing-88-no-info-and-scrambled-screen

Author: mathoudebine

README.md

@@ -22,10 +22,10 @@ Supported operating systems : macOS, Windows, Linux (incl. Raspberry Pi), basica
 | <img src="res/docs/turing.webp"/>                    | <img src="res/docs/xuanfang.webp"/>               | <img src="res/docs/turing5inch.png"/>       |
 | also improperly called "revision A" by the resellers | revision B & flagship (with backplate & RGB LEDs) | basic support (no video or storage for now) |
 
-| ✅ Turing Smart Screen 8.8"                  | ✅ Turing Smart Screen 2.1"                                       |
+| ⚠️ Turing Smart Screen 8.8"                  | ✅ Turing Smart Screen 2.1"                                       |
 |---------------------------------------------|------------------------------------------------------------------|
 | <img src="res/docs/turing8inch.webp"/>      | <img src="res/docs/turing2inch.webp"  width="60%" height="60%"/> |
-| basic support (no video or storage for now) | basic support (no video or storage for now)                      |
+| basic support (no video or storage for now)<br/>⚠️ [New revision V1.1 not supported!](https://github.com/mathoudebine/turing-smart-screen-python/issues/727)<br/>⚠️ [Current issues with first revision](https://github.com/mathoudebine/turing-smart-screen-python/issues/724) | basic support (no video or storage for now)                      |
 
 | ✅ [UsbPCMonitor 3.5" / 5"](https://aliexpress.com/item/1005003931363455.html)                       | ✅ [Kipye Qiye Smart Display 3.5"](https://www.aliexpress.us/item/3256803899049957.html) |
 |-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|

library/config.py

@@ -68,7 +68,6 @@ def load_theme():
 
 
 def check_theme_compatible(display_size: str):
-    global THEME_DATA
     # Check if theme is compatible with hardware revision
     if display_size != THEME_DATA['display'].get("DISPLAY_SIZE", '3.5"'):
         logger.error("The selected theme " + CONFIG_DATA['config'][

library/scheduler.py

@@ -56,7 +56,6 @@ def decorator(func):
 
         def periodic(scheduler, periodic_interval, action, actionargs=()):
             """ Wrap the scheduler with our periodic interval """
-            global STOPPING
             if not STOPPING:
                 # If the program is not stopping: re-schedule the task for future execution
                 scheduler.enter(periodic_interval, 1, periodic,
@@ -188,7 +187,6 @@ def PingStats():
 @schedule(timedelta(milliseconds=1).total_seconds())
 def QueueHandler():
     # Do next action waiting in the queue
-    global STOPPING
     if STOPPING:
         # Empty the action queue to allow program to exit cleanly
         while not config.update_queue.empty():

library/sensors/sensors_python.py

@@ -175,7 +175,6 @@ class Gpu(sensors.Gpu):
     @staticmethod
     def stats() -> Tuple[
         float, float, float, float, float]:  # load (%) / used mem (%) / used mem (Mb) / total mem (Mb) / temp (°C)
-        global DETECTED_GPU
         if DETECTED_GPU == GpuType.AMD:
             return GpuAmd.stats()
         elif DETECTED_GPU == GpuType.NVIDIA:
@@ -185,7 +184,6 @@ def stats() -> Tuple[
 
     @staticmethod
     def fps() -> int:
-        global DETECTED_GPU
         if DETECTED_GPU == GpuType.AMD:
             return GpuAmd.fps()
         elif DETECTED_GPU == GpuType.NVIDIA:
@@ -195,7 +193,6 @@ def fps() -> int:
 
     @staticmethod
     def fan_percent() -> float:
-        global DETECTED_GPU
         if DETECTED_GPU == GpuType.AMD:
             return GpuAmd.fan_percent()
         elif DETECTED_GPU == GpuType.NVIDIA:
@@ -205,7 +202,6 @@ def fan_percent() -> float:
 
     @staticmethod
     def frequency() -> float:
-        global DETECTED_GPU
         if DETECTED_GPU == GpuType.AMD:
             return GpuAmd.frequency()
         elif DETECTED_GPU == GpuType.NVIDIA:
@@ -471,7 +467,6 @@ class Net(sensors.Net):
     @staticmethod
     def stats(if_name, interval) -> Tuple[
         int, int, int, int]:  # up rate (B/s), uploaded (B), dl rate (B/s), downloaded (B)
-        global PNIC_BEFORE
         try:
             # Get current counters
             pnic_after = psutil.net_io_counters(pernic=True)

theme-editor.py

@@ -163,7 +163,6 @@ def on_button1_press(event):
 
 
     def on_button1_press_and_drag(event):
-        global x0, y0
         display_width, display_height = int(display.lcd.get_width() / RESIZE_FACTOR), int(
             display.lcd.get_height() / RESIZE_FACTOR)
         x1, y1 = event.x, event.y
@@ -186,7 +185,6 @@ def on_button1_press_and_drag(event):
 
 
     def on_button1_release(event):
-        global x0, y0
         display_width, display_height = int(display.lcd.get_width() / RESIZE_FACTOR), int(
             display.lcd.get_height() / RESIZE_FACTOR)
         x1, y1 = event.x, event.y