Rename C_USB to TUR_USB for config.yaml, add other sizes (5.2", 8.0")

Author: mathoudebine

config.yaml

@@ -1,30 +1,31 @@
+---
 config:
   # Configuration values to set up basic communication
   # Set your COM port e.g. COM3 for Windows, /dev/ttyACM0 for Linux...
-  # Use AUTO for COM port auto-discovery (may not work on every setup)
+  # Use AUTO for COM port auto-discovery (may not work on every setup) or if device is not detected as a COM port
   # COM_PORT: "/dev/ttyACM0"
   # COM_PORT: "COM3"
-  COM_PORT: AUTO
+  COM_PORT: "AUTO"
 
   # Theme to use (located in res/themes)
   # Use the name of the folder as value
   # Choose a theme made for your screen size (see DISPLAY_SIZE inside theme.yaml)
-  THEME: Gradient
+  THEME: 3.5inchTheme2
 
   # 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 - NEEDS ADMIN RIGHTS)
   # - STUB / STATIC  use random/static 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: PYTHON
+  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: Ethernet # Ethernet Card
-  WLO: '' # Wi-Fi Card
+  ETH: "" # Ethernet Card
+  WLO: "" # Wi-Fi Card
 
   # CPU fan
   # For Linux/MacOS platforms, the CPU fan is amongst all fan sensors gathered from the motherboard chipset
@@ -40,26 +41,27 @@ config:
 
   # OpenWeatherMap API KEY. Can be obtained by creating a free account on https://home.openweathermap.org/users/sign_up.
   # You need to subscribe to the 3.0 OneCallAPI that has 1000 free daily calls
-  WEATHER_API_KEY: ''
+  WEATHER_API_KEY: ""
   # Location from which to display the weather. Use for example https://www.latlong.net/ to get latitude/longitude
-  WEATHER_LATITUDE: '45.75'
-  WEATHER_LONGITUDE: '4.85'
+  WEATHER_LATITUDE: 45.75
+  WEATHER_LONGITUDE: 4.85
   # Units used to display temperatures (metric - °C, imperial - °F, standard - °K)
   WEATHER_UNITS: metric
   # Language is used by the API. Find more here https://openweathermap.org/api/one-call-3#multi
-  WEATHER_LANGUAGE: de
+  WEATHER_LANGUAGE: en
 
 display:
   # Display revision:
   # - A         for Turing 3.5" and UsbPCMonitor 3.5"/5"
   # - B         for Xuanfang 3.5" (inc. flagship)
   # - C         for Turing 2.1"/2.8"/5"/8.8"
   # - D         for Kipye Qiye Smart Display 3.5"
+  # - TUR_USB   for Turing HW revisions 1.x: 4.6"/5.2"/8.0"/8.8"/9.2"
   # - WEACT_A   for WeAct Studio Display FS V1 3.5"
   # - WEACT_B   for WeAct Studio Display FS V1 0.96"
   # - SIMU for simulated display (image written in screencap.png). Width & height will be detected from the theme
   # To identify your smart screen: https://github.com/mathoudebine/turing-smart-screen-python/wiki/Hardware-revisions
-  REVISION: C_USB
+  REVISION: A
 
   # Display Brightness
   # Set this as the desired %, 0 being completely dark and 100 being max brightness

configure.py

@@ -63,57 +63,88 @@
 WEACT_MODEL = "WeAct Studio Display FS V1"
 SIMULATED_MODEL = "Simulated screen"
 
+SIZE_0_96_INCH = "0.96\""
+SIZE_2_1_INCH = "2.1\""  # Only for retro compatibility
+SIZE_2_x_INCH = "2.1\" / 2.8\""
 SIZE_3_5_INCH = "3.5\""
 SIZE_4_6_INCH = "4.6\""
-SIZE_4_6_INCH_USB = "4.6\""
 SIZE_5_INCH = "5\""
+SIZE_5_2_INCH = "5.2\""
+SIZE_8_0_INCH = "8.0\""
 SIZE_8_8_INCH = "8.8\""
-SIZE_8_8_INCH_USB = "8.8\" (V1.1) or 9.2\""
-SIZE_2_1_INCH = "2.1\""  # Only for retro compatibility
-SIZE_2_x_INCH = "2.1\" / 2.8\""
-SIZE_0_96_INCH = "0.96\""
-
-size_list = (SIZE_0_96_INCH, SIZE_2_x_INCH, SIZE_3_5_INCH, SIZE_4_6_INCH_USB,  SIZE_5_INCH, SIZE_8_8_INCH, SIZE_8_8_INCH_USB)
+SIZE_8_8_INCH_NEWREV = "8.8\" (V1.X new HW rev.)"
+SIZE_9_2_INCH = "9.2\""
+
+# List of sizes that can be selected
+size_list = (
+    SIZE_0_96_INCH,
+    SIZE_2_x_INCH,
+    SIZE_3_5_INCH,
+    SIZE_4_6_INCH,
+    SIZE_5_INCH,
+    # SIZE_5_2_INCH, Not implemented yet
+    # SIZE_8_0_INCH, Not implemented yet
+    SIZE_8_8_INCH,
+    SIZE_8_8_INCH_NEWREV,
+    # SIZE_9_2_INCH, Not implemented yet
+)
 
 # Maps between config.yaml values and GUI description
+# This map is used to select the correct smart screen model based on config.yaml "REVISION" and selected "THEME" size
 revision_and_size_to_model_map = {
     ('A', SIZE_3_5_INCH): TURING_MODEL,  # Can also be UsbPCMonitor 3.5, does not matter since protocol is the same
     ('A', SIZE_5_INCH): USBPCMONITOR_MODEL,
     ('B', SIZE_3_5_INCH): XUANFANG_MODEL,
     ('C', SIZE_2_x_INCH): TURING_MODEL,
     ('C', SIZE_5_INCH): TURING_MODEL,
     ('C', SIZE_8_8_INCH): TURING_MODEL,
-    ('C_USB', SIZE_4_6_INCH_USB): TURING_MODEL,
-    ('C_USB', SIZE_8_8_INCH_USB): TURING_MODEL,
     ('D', SIZE_3_5_INCH): KIPYE_MODEL,
+    ('TUR_USB', SIZE_4_6_INCH): TURING_MODEL,
+    ('TUR_USB', SIZE_5_2_INCH): TURING_MODEL,
+    ('TUR_USB', SIZE_8_0_INCH): TURING_MODEL,
+    ('TUR_USB', SIZE_8_8_INCH): TURING_MODEL,
+    ('TUR_USB', SIZE_8_8_INCH_NEWREV): TURING_MODEL,
+    ('TUR_USB', SIZE_9_2_INCH): TURING_MODEL,
     ('WEACT_A', SIZE_3_5_INCH): WEACT_MODEL,
     ('WEACT_B', SIZE_0_96_INCH): WEACT_MODEL,
+
     ('SIMU', SIZE_0_96_INCH): SIMULATED_MODEL,
     ('SIMU', SIZE_2_x_INCH): SIMULATED_MODEL,
     ('SIMU', SIZE_3_5_INCH): SIMULATED_MODEL,
     ('SIMU', SIZE_4_6_INCH): SIMULATED_MODEL,
     ('SIMU', SIZE_5_INCH): SIMULATED_MODEL,
+    ('SIMU', SIZE_5_2_INCH): SIMULATED_MODEL,
+    ('SIMU', SIZE_8_0_INCH): SIMULATED_MODEL,
     ('SIMU', SIZE_8_8_INCH): SIMULATED_MODEL,
+    ('SIMU', SIZE_9_2_INCH): SIMULATED_MODEL,
 }
+# This map is used to write the correct config.yaml "REVISION" from selected smart screen model and size
 model_and_size_to_revision_map = {
-    (TURING_MODEL, SIZE_3_5_INCH): 'A',
-    (USBPCMONITOR_MODEL, SIZE_3_5_INCH): 'A',
-    (USBPCMONITOR_MODEL, SIZE_5_INCH): 'A',
-    (XUANFANG_MODEL, SIZE_3_5_INCH): 'B',
+    (KIPYE_MODEL, SIZE_3_5_INCH): 'D',
     (TURING_MODEL, SIZE_2_x_INCH): 'C',
+    (TURING_MODEL, SIZE_3_5_INCH): 'A',
+    (TURING_MODEL, SIZE_4_6_INCH): 'TUR_USB',
+    (TURING_MODEL, SIZE_5_2_INCH): 'TUR_USB',
     (TURING_MODEL, SIZE_5_INCH): 'C',
+    (TURING_MODEL, SIZE_8_0_INCH): 'TUR_USB',
     (TURING_MODEL, SIZE_8_8_INCH): 'C',
-    (TURING_MODEL, SIZE_4_6_INCH_USB): 'C_USB',
-    (TURING_MODEL, SIZE_8_8_INCH_USB): 'C_USB',
-    (KIPYE_MODEL, SIZE_3_5_INCH): 'D',
-    (WEACT_MODEL, SIZE_3_5_INCH): 'WEACT_A',
+    (TURING_MODEL, SIZE_8_8_INCH_NEWREV): 'TUR_USB',
+    (TURING_MODEL, SIZE_9_2_INCH): 'TUR_USB',
+    (USBPCMONITOR_MODEL, SIZE_3_5_INCH): 'A',
+    (USBPCMONITOR_MODEL, SIZE_5_INCH): 'A',
     (WEACT_MODEL, SIZE_0_96_INCH): 'WEACT_B',
+    (WEACT_MODEL, SIZE_3_5_INCH): 'WEACT_A',
+    (XUANFANG_MODEL, SIZE_3_5_INCH): 'B',
+
     (SIMULATED_MODEL, SIZE_0_96_INCH): 'SIMU',
     (SIMULATED_MODEL, SIZE_2_x_INCH): 'SIMU',
     (SIMULATED_MODEL, SIZE_3_5_INCH): 'SIMU',
     (SIMULATED_MODEL, SIZE_4_6_INCH): 'SIMU',
     (SIMULATED_MODEL, SIZE_5_INCH): 'SIMU',
+    (SIMULATED_MODEL, SIZE_5_2_INCH): 'SIMU',
+    (SIMULATED_MODEL, SIZE_8_0_INCH): 'SIMU',
     (SIMULATED_MODEL, SIZE_8_8_INCH): 'SIMU',
+    (SIMULATED_MODEL, SIZE_9_2_INCH): 'SIMU',
 }
 hw_lib_map = {"AUTO": "Automatic", "LHM": "LibreHardwareMonitor (admin.)", "PYTHON": "Python libraries",
               "STUB": "Fake random data", "STATIC": "Fake static data"}
@@ -318,13 +349,10 @@ def run(self):
     def load_theme_preview(self):
         theme_data = get_theme_data(self.theme_cb.get())
 
-        if theme_data and theme_data['display'].get("DISPLAY_SIZE", '3.5"') == SIZE_2_1_INCH:
-            theme_preview.paste(circular_mask, mask=circular_mask)
-
         try:
             theme_preview = Image.open(MAIN_DIRECTORY / "res" / "themes" / self.theme_cb.get() / "preview.png")
 
-            if theme_data['display'].get("DISPLAY_SIZE", '3.5"') == SIZE_2_1_INCH:
+            if theme_data and theme_data['display'].get("DISPLAY_SIZE", '3.5"') == SIZE_2_1_INCH:
                 # This is a circular screen: apply a circle mask over the preview
                 theme_preview.paste(circular_mask, mask=circular_mask)
         except:
@@ -394,8 +422,8 @@ def load_config_values(self):
         size = get_theme_size(self.config['config']['THEME'])
         size = size.replace(SIZE_2_1_INCH, SIZE_2_x_INCH)   # If a theme is for 2.1" then it also is for 2.8"
         try:
-            if size == SIZE_8_8_INCH and self.config['display']['REVISION'] == 'C_USB':
-                size = SIZE_8_8_INCH_USB
+            if size == SIZE_8_8_INCH and self.config['display']['REVISION'] == 'TUR_USB':
+                size = SIZE_8_8_INCH_NEWREV
             self.size_cb.set(size)
         except:
             self.size_cb.current(0)
@@ -540,7 +568,7 @@ def on_model_change(self, e=None):
     def on_size_change(self, e=None):
         size = self.size_cb.get()
         size = size.replace(SIZE_2_x_INCH, SIZE_2_1_INCH)  # For '2.1" / 2.8"' size, keep '2.1"' as size to get themes for
-        size = size.replace(SIZE_8_8_INCH_USB, SIZE_8_8_INCH)
+        size = size.replace(SIZE_8_8_INCH_NEWREV, SIZE_8_8_INCH)
         themes = get_themes(size)
         self.theme_cb.config(values=themes)
 

library/display.py

@@ -88,12 +88,12 @@ def __init__(self):
             # Because of issue with Turing rev. C size auto-detection, manually configure screen width/height from theme
             self.lcd = LcdCommRevC(com_port=config.CONFIG_DATA['config']['COM_PORT'],
                                    update_queue=config.update_queue, display_width=width, display_height=height)
-        elif config.CONFIG_DATA["display"]["REVISION"] == "C_USB":
-            # On all USB models, manually configure screen width/height from theme
-            self.lcd = LcdCommTuringUSB(display_width=width, display_height=height)
         elif config.CONFIG_DATA["display"]["REVISION"] == "D":
             self.lcd = LcdCommRevD(com_port=config.CONFIG_DATA['config']['COM_PORT'],
                                    update_queue=config.update_queue)
+        elif config.CONFIG_DATA["display"]["REVISION"] == "TUR_USB":
+            # On all USB models, manually configure screen width/height from theme
+            self.lcd = LcdCommTuringUSB(display_width=width, display_height=height)
         elif config.CONFIG_DATA["display"]["REVISION"] == "WEACT_A":
             self.lcd = LcdCommWeActA(com_port=config.CONFIG_DATA['config']['COM_PORT'],
                                    update_queue=config.update_queue)

library/lcd/lcd_comm_turing_usb.py

@@ -39,7 +39,13 @@
 from library.lcd.lcd_comm import Orientation, LcdComm
 
 VENDOR_ID = 0x1cbe
-PRODUCT_ID = [0x0046, 0x0088, 0x0092]   # 4.6", 8.8", 9.2"
+PRODUCT_ID = [
+    0x0046, # Turing 4.6", 960x320
+    0x0052, # Turing 5.2", 1280x720
+    0x0080, # Turing 8.0", 1280x800
+    0x0088, # Turing 8.8", 1920x480
+    0x0092, # Turing 9.2", 1920x462
+]
 
 
 MAX_CHUNK_BYTES = 1024*1024  # Data sent to screen cannot exceed 1024MB or there will be a timeout