Merge branch 'mathoudebine:main' into SystemSensors

Author: vsalvador

.github/workflows/generate-linux-packages.yml

@@ -0,0 +1,51 @@
+name: Generate Linux Packages
+
+on:
+  release:
+    types: [ published ]
+
+permissions:
+  contents: write
+
+jobs:
+  generate-windows-installer:
+    name: Generate Linux Packages
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Git Checkout ${{github.event.release.tag_name}}
+      uses: actions/checkout@v6
+
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.14'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install -r requirements.txt
+
+    - name: Run PyInstaller to create binaries
+      run: |
+        pyinstaller --noconfirm turing-system-monitor.spec
+        echo "${{github.event.release.tag_name}}" > ./dist/turing-system-monitor/version.txt
+        ln -s configure ./dist/turing-system-monitor/turing-smart-screen
+
+    - name: Create archive from generated binaries
+      run: |
+        rm -rf "./dist/turing-system-monitor/res/themes/--Theme examples"
+        tar -czvf "turing-system-monitor-${{github.event.release.tag_name}}-linux.tar.gz" -C "./dist/turing-system-monitor/" .
+
+    - name: '📦 Archive Linux binaries'
+      uses: actions/upload-artifact@v7
+      with:
+        name: turing-system-monitor-${{github.event.release.tag_name}}-linux
+        path: turing-system-monitor-${{github.event.release.tag_name}}-linux.tar.gz
+        if-no-files-found: error
+
+    - name: '📩 Publish Linux binaries to Release'
+      run: |
+        gh release upload ${{github.event.release.tag_name}} turing-system-monitor-${{github.event.release.tag_name}}-linux.tar.gz
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate-windows-packages-debug.yml

@@ -44,30 +44,30 @@ jobs:
     - name: Create portable zip archive from generated binaries
       run: |
         Remove-Item -r ".\dist\turing-system-monitor\res\themes\--Theme examples\"
-        7z a -tzip turing-system-monitor-${{github.event.release.tag_name}}-portable-debug.zip ".\dist\turing-system-monitor"
+        7z a -tzip turing-system-monitor-${{github.event.release.tag_name}}-debug-portable-windows.zip ".\dist\turing-system-monitor"
 
     - name: '📦 Archive Windows installer'
       uses: actions/upload-artifact@v7
       with:
-        name: turing-system-monitor-${{github.event.release.tag_name}}-debug
-        path: tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-debug.exe
+        name: turing-system-monitor-${{github.event.release.tag_name}}-debug-windows
+        path: tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-debug-windows.exe
         if-no-files-found: error
 
     - name: '📦 Archive Windows portable archive'
       uses: actions/upload-artifact@v7
       with:
-        name: turing-system-monitor-${{github.event.release.tag_name}}-portable-debug
-        path: turing-system-monitor-${{github.event.release.tag_name}}-portable-debug.zip
+        name: turing-system-monitor-${{github.event.release.tag_name}}-debug-portable-windows
+        path: turing-system-monitor-${{github.event.release.tag_name}}-debug-portable-windows.zip
         if-no-files-found: error
 
     - name: '📩 Publish Windows installer to Release'
       run: |
-        gh release upload ${{github.event.release.tag_name}} tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-debug.exe
+        gh release upload ${{github.event.release.tag_name}} tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-debug-windows.exe
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: '📩 Publish Windows portable zip to Release'
       run: |
-        gh release upload ${{github.event.release.tag_name}} turing-system-monitor-${{github.event.release.tag_name}}-portable-debug.zip
+        gh release upload ${{github.event.release.tag_name}} turing-system-monitor-${{github.event.release.tag_name}}-debug-portable-windows.zip
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate-windows-packages.yml

@@ -44,30 +44,30 @@ jobs:
     - name: Create portable zip archive from generated binaries
       run: |
         Remove-Item -r ".\dist\turing-system-monitor\res\themes\--Theme examples\"
-        7z a -tzip turing-system-monitor-${{github.event.release.tag_name}}-portable.zip ".\dist\turing-system-monitor"
+        7z a -tzip turing-system-monitor-${{github.event.release.tag_name}}-portable-windows.zip ".\dist\turing-system-monitor"
 
     - name: '📦 Archive Windows installer'
       uses: actions/upload-artifact@v7
       with:
-        name: turing-system-monitor-${{github.event.release.tag_name}}
-        path: tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}.exe
+        name: turing-system-monitor-${{github.event.release.tag_name}}-windows
+        path: tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-windows.exe
         if-no-files-found: error
 
     - name: '📦 Archive Windows portable archive'
       uses: actions/upload-artifact@v7
       with:
-        name: turing-system-monitor-${{github.event.release.tag_name}}-portable
-        path: turing-system-monitor-${{github.event.release.tag_name}}-portable.zip
+        name: turing-system-monitor-${{github.event.release.tag_name}}-portable-windows
+        path: turing-system-monitor-${{github.event.release.tag_name}}-portable-windows.zip
         if-no-files-found: error
 
     - name: '📩 Publish Windows installer to Release'
       run: |
-        gh release upload ${{github.event.release.tag_name}} tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}.exe
+        gh release upload ${{github.event.release.tag_name}} tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-windows.exe
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: '📩 Publish Windows portable zip to Release'
       run: |
-        gh release upload ${{github.event.release.tag_name}} turing-system-monitor-${{github.event.release.tag_name}}-portable.zip
+        gh release upload ${{github.event.release.tag_name}} turing-system-monitor-${{github.event.release.tag_name}}-portable-windows.zip
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -140,4 +140,5 @@ dmypy.json
 screencap.png
 tmp
 
+version.txt
 external/LibreHardwareMonitor/LibreHardwareMonitorLib.sys

README.md

@@ -1,36 +1,30 @@
 # ![Icon](https://raw.githubusercontent.com/mathoudebine/turing-smart-screen-python/main/res/icons/monitor-icon-17865/24.png) turing-smart-screen-python
 
-### ⚠️ DISCLAIMER - PLEASE READ ⚠️
-
-This project is **not affiliated, associated, authorized, endorsed by, or in any way officially connected with Turing / XuanFang / Kipye brands**, or any of theirs subsidiaries, affiliates, manufacturers or sellers of their products. All product and company names are the registered trademarks of their original owners.
-
-This project is an open-source alternative software, NOT the original software provided for the smart screens. **Please do not open issues for USBMonitor.exe/ExtendScreen.exe or for the smart screens hardware here**.
-* for Turing Smart Screen, use the official forum here: http://discuz.turzx.com/
-* for other smart screens, contact your reseller
----
+> [!WARNING]
+> 
+> This project is **not affiliated, associated, authorized, endorsed by, or in any way officially connected with Turing / XuanFang / Kipye brands**, or any of theirs subsidiaries, affiliates, manufacturers or sellers of their products. All product and company names are the registered trademarks of their original owners.
+> 
+> This project is an open-source alternative software, NOT the original software provided for the smart screens. **Please do not open issues for USBMonitor.exe/ExtendScreen.exe or for the smart screens hardware here**.
+> * for Turing Smart Screen, use the official forum here: http://discuz.turzx.com/
+> * for other smart screens, contact your reseller
 
 ![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black) ![Windows](https://img.shields.io/badge/Windows%2010%2F11-0078D6?style=for-the-badge&logoColor=white&logo=data:image/svg%2bxml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+V2luZG93czwvdGl0bGU+PHBhdGggZmlsbCA9ICIjRkZGRkZGIiBkPSJNMCwwSDExLjM3N1YxMS4zNzJIMFpNMTIuNjIzLDBIMjRWMTEuMzcySDEyLjYyM1pNMCwxMi42MjNIMTEuMzc3VjI0SDBabTEyLjYyMywwSDI0VjI0SDEyLjYyMyIvPjwvc3ZnPg==) [![macOS](https://img.shields.io/badge/mac%20os%20(⚠️major%20bug)-000000?style=for-the-badge&logo=apple&logoColor=white)](https://github.com/mathoudebine/turing-smart-screen-python/issues/7) ![Raspberry Pi](https://img.shields.io/badge/Raspberry%20Pi-A22846?style=for-the-badge&logo=Raspberry%20Pi&logoColor=white) ![Python](https://img.shields.io/badge/Python-3.X-3670A0?style=for-the-badge&logo=python&logoColor=ffdd54) [![Licence](https://img.shields.io/github/license/mathoudebine/turing-smart-screen-python?style=for-the-badge)](./LICENSE)
 
-A Python system monitor program and an abstraction library for **small IPS USB-C (UART) displays.**    
+A Python system monitor program and an abstraction library for **small IPS USB-C displays.**    
 
 Supported operating systems : macOS, Windows, Linux (incl. Raspberry Pi), basically all OS that support Python 3.9+  
 
 ### ✅ Supported smart screens models:
 
-| ✅ Turing Smart Screen 3.5"                           | ✅ XuanFang 3.5"                                   | ✅ Turing Smart Screen 5"                    |
-|------------------------------------------------------|---------------------------------------------------|---------------------------------------------|
-| <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" / 2.8"                                 |
-|---------------------------------------------|------------------------------------------------------------------|
-| <img src="res/docs/turing8inch.webp"/>      | <img src="res/docs/turing2inch.webp"  width="60%" height="60%"/> |
-| 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) | basic support (no video or storage for now)                      |
+| ✅ Turing Smart Screen / TURZX                                                                                                                                                                                                                                                                                                                                                                  |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| <img src="res/docs/turing.webp" width="30%" height="30%"/> <img src="res/docs/turing46inch.png" width="30%" height="30%"/> <img src="res/docs/turing5inch.png" width="30%" height="30%"/> <br/> <img src="res/docs/turing2inch.webp" width="30%" height="30%"/> <img src="res/docs/turing8inch.png" width="30%" height="30%"/> <img src="res/docs/turing8inch.webp" width="30%" height="30%"/> |
+| All available sizes and hardware revisions supported: **2.1" / 2.8" / 3.5" / 4.6" / 5" / 5.2" / 8.0" / 8.8" / 9.2" / 12.3"** <br/>UART and USB protocols supported. Note: no video or storage support 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) |
-|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|
-| <img src="res/docs/UsbPCMonitor_5inch.webp" width="60%" height="60%"/>                              | <img src="res/docs/kipye-qiye-35.webp" width="60%" height="60%"/>                       |
-| Unknown manufacturer, visually similar to Turing 3.5" / 5". Original software is `UsbPCMonitor.exe` | Front panel has an engraved inscription "奇叶智显" Qiye Zhixian (Qiye Smart Display)        |
+| ✅ XuanFang 3.5"                                   | ✅ [UsbPCMonitor 3.5" / 5"](https://aliexpress.com/item/1005003931363455.html)                       | ✅ Kipye Qiye Smart Display 3.5"                                                  |
+|---------------------------------------------------|-----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
+| <img src="res/docs/xuanfang.webp"/>               | <img src="res/docs/UsbPCMonitor_5inch.webp" width="60%" height="60%"/>                              | <img src="res/docs/kipye-qiye-35.webp" width="60%" height="60%"/>                |
+| revision B & flagship (with backplate & RGB LEDs) | Unknown manufacturer, visually similar to Turing 3.5" / 5". Original software is `UsbPCMonitor.exe` | Front panel has an engraved inscription "奇叶智显" Qiye Zhixian (Qiye Smart Display) |
 
 | ✅ WeAct Studio Display FS V1 0.96"                            | ✅ WeAct Studio Display FS V1 3.5"                            |
 |---------------------------------------------------------------|--------------------------------------------------------------|
@@ -87,7 +81,7 @@ Some themes are already included for a quick start!
 
 * Fully functional multi-OS code base (operates out of the box, tested on Windows, Linux & MacOS).
 * Display configuration using GUI configuration wizard or `config.yaml` file: no Python code to edit.
-* Compatible with [3.5" & 5" smart screen models (Turing, XuanFang...)](https://github.com/mathoudebine/turing-smart-screen-python/wiki/Hardware-revisions). Backplate RGB LEDs are also supported for available models!
+* Compatible with [multiple smart screen models (Turing, XuanFang...)](https://github.com/mathoudebine/turing-smart-screen-python/wiki/Hardware-revisions). Backplate RGB LEDs are also supported for available models!
 * Support [multiple hardware sensors and metrics (CPU/GPU usage, temperatures, memory, disks, etc)](https://github.com/mathoudebine/turing-smart-screen-python/wiki/System-monitor-:-themes#stats-entry) with configurable refresh intervals.
 * Allow [creation of themes (see `res/themes`) with `theme.yaml` files using theme editor](https://github.com/mathoudebine/turing-smart-screen-python/wiki/System-monitor-:-themes) to be [shared with the community!](https://github.com/mathoudebine/turing-smart-screen-python/discussions/categories/themes)
 * Easy to expand: [custom Python data sources](https://github.com/mathoudebine/turing-smart-screen-python/wiki/System-monitor-:-themes#add-custom-stats-to-a-theme) can be written to pull specific information and display it on themes like any other sensor.

config.yaml

@@ -2,7 +2,7 @@
 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"
@@ -68,6 +68,7 @@ display:
   # - 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