Merge branch 'hyperion-project:master' into temperture

Author: Lord-Grey

.github/workflows/codeql.yml

@@ -36,15 +36,20 @@ jobs:
         if: ${{ matrix.language == 'cpp' }}
         run: |
           sudo apt-get update
-          sudo apt-get install --yes git cmake build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev
+          sudo apt-get install --yes git build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev libftdi1-dev 
+
+      - name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.28.3'          
 
       - name: 🔁 Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
           config-file: ./.github/config/codeql.yml
-
+          
       - name: 👷 Autobuild
         uses: github/codeql-action/autobuild@v3
 

.github/workflows/qt5_6.yml

@@ -117,9 +117,14 @@ jobs:
           echo '::group::Update/Install dependencies'
             brew untap --force homebrew/core homebrew/cask
             brew update || true
-            brew install qt@${{ inputs.qt_version }} vulkan-headers ninja || true
+            brew install qt@${{ inputs.qt_version }} vulkan-headers ninja libftdi || true
           echo '::endgroup::'
 
+      - name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.28.3'
+
       - name: 👷 Build
         shell: bash
         run: ./.github/scripts/build.sh
@@ -163,33 +168,44 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-          key: ${{ runner.os }}${{ inputs.qt_version == '6' && '-chocolatey-qt6' || '-chocolatey' }}
+          key: ${{ runner.os }}${{ '-chocolatey' }}
 
-      - name: 📥 Install DirectX SDK, OpenSSL, libjpeg-turbo ${{ inputs.qt_version == '6' && 'and Vulkan-SDK' || '' }}
+      - name: 📥 Install DirectX SDK, OpenSSL, libjpeg-turbo
         shell: powershell
         run: |
-          choco install --no-progress directx-sdk ${{env.VULKAN_SDK}} -y
+          choco install --no-progress directx-sdk -y
           choco install --no-progress ${{env.OPENSSL}} -y
           Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/3.0.1/libjpeg-turbo-3.0.1-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
           .\libjpeg-turbo /S
         env:
-          VULKAN_SDK: ${{ inputs.qt_version == '6' && 'vulkan-sdk' || '' }}
           OPENSSL: ${{ inputs.qt_version == '6' && 'openssl' || 'openssl --version=1.1.1.2100' }}
 
+      - name: Install Vulkan SDK
+        if: ${{ inputs.qt_version == '6' }}
+        uses: jakoch/[email protected]
+        with:
+          install_runtime: false
+          cache: true
+          stripdown: true
+
       - name: 📥 Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ inputs.qt_version == '6' && '6.5.2' || '5.15.2' }}
+          version: ${{ inputs.qt_version == '6' && '6.7' || '5.15.*' }}
           target: 'desktop'
           modules: ${{ inputs.qt_version == '6' && 'qtserialport' || '' }}
-          arch: 'win64_msvc2019_64'
           cache: 'true'
           cache-key-prefix: 'cache-qt-windows'
 
       - name: 🛠️ Setup MSVC
         shell: cmd
         run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
 
+      - name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.28.3'
+
       - name: 👷 Build
         shell: bash
         run: ./.github/scripts/build.sh
@@ -226,7 +242,7 @@ jobs:
           echo '::endgroup::'
 
       - name: 💾 Artifact download
-        uses: actions/[email protected].7
+        uses: actions/[email protected].8
         with:
           pattern: artifact-*
           path: all-artifacts

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Support for ftdi chip based LED-devices with ws2812, sk6812 apa102 LED types (Many thanks to @nurikk) (#1746)
+- Support for Skydimo devices (being an Adalight variant)
 - Support gaps on Matrix Layout (#1696)
 - Windows: Added a new grabber that uses the DXGI DDA (Desktop Duplication API). This has much better performance than the DX grabber as it does more of its work on the GPU.
 

CMakeLists.txt

@@ -94,6 +94,7 @@ set(DEFAULT_DEV_SPI                     OFF)
 set(DEFAULT_DEV_TINKERFORGE             OFF)
 set(DEFAULT_DEV_USB_HID                 OFF)
 set(DEFAULT_DEV_WS281XPWM               OFF)
+set(DEFAULT_DEV_FTDI                    ON )
 
 # Services
 set(DEFAULT_EFFECTENGINE                ON )
@@ -121,9 +122,10 @@ if(${CMAKE_SYSTEM} MATCHES "Linux")
 	set(DEFAULT_DEV_USB_HID     ON)
 	set(DEFAULT_CEC             ON)
 elseif (WIN32)
-	set(DEFAULT_DX ON)
-	set(DEFAULT_DDA ON)
-	set(DEFAULT_MF ON)
+	set(DEFAULT_DX              ON )
+  set(DEFAULT_DDA             ON )
+	set(DEFAULT_MF              ON )
+	set(DEFAULT_DEV_FTDI        OFF)
 else()
 	set(DEFAULT_FB              OFF)
 	set(DEFAULT_V4L2            OFF)
@@ -364,6 +366,9 @@ message(STATUS "ENABLE_DEV_USB_HID = ${ENABLE_DEV_USB_HID}")
 option(ENABLE_DEV_WS281XPWM "Enable the WS281x-PWM device" ${DEFAULT_DEV_WS281XPWM})
 message(STATUS "ENABLE_DEV_WS281XPWM = ${ENABLE_DEV_WS281XPWM}")
 
+option(ENABLE_DEV_FTDI "Enable the FTDI devices" ${DEFAULT_DEV_FTDI} )
+message(STATUS "ENABLE_DEV_FTDI = ${ENABLE_DEV_FTDI}")
+
 removeIndent()
 
 message(STATUS "Services options:")

README.md

@@ -24,14 +24,14 @@
 * Low CPU load makes it perfect for SoCs like Raspberry Pi
 * Json interface which allows easy integration into scripts
 * A command line utility for testing and integration in automated environment
-* Priority channels are not coupled to a specific led data provider which means that a provider can post led data and leave without the need to maintain a connection to Hyperion. This is ideal for a remote application (like our [Android app](https://play.google.com/store/apps/details?id=nl.hyperion.hyperionpro)).
+* Priority channels are not coupled to a specific led data provider which means that a provider can post led data and leave without the need to maintain a connection to Hyperion. This is ideal for a remote application (like our former [Android app](https://play.google.com/store/apps/details?id=nl.hyperion.hyperionpro), which is no longer available).
 * Black border detector and processor
 * A scriptable (Python) effect engine with 39 build-in effects for your inspiration
 * A multi language web interface to configure and remote control hyperion
 
 ### Supported Hardware
 
-You can find a list of supported hardware [here](https://docs.hyperion-project.org/en/user/leddevices/).
+You can find a list of supported hardware [here](https://docs.hyperion-project.org/user/leddevices/Overview.html).
 
 If you need further support please open a topic at the forum!<br>
 [![Forum](https://img.shields.io/website/https/hyperion-project.org.svg?label=Forum&down_color=red&down_message=offline&up_color=4bc51d&up_message=online&logo=homeadvisor&logoColor=white)](https://www.hyperion-project.org)
@@ -50,10 +50,10 @@ Find here more details on [supported platforms and configuration sets](doc/devel
 
 ## Documentation
 Covers these topics:
-- [Installation](https://docs.hyperion-project.org/en/user/Installation.html)
-- [Configuration](https://docs.hyperion-project.org/en/user/Configuration.html)
-- [Effect development](https://docs.hyperion-project.org/en/effects/#effect-files)
-- [JSON API](https://docs.hyperion-project.org/en/json/)
+- [Getting Started and Installation](https://docs.hyperion-project.org/user/GettingStarted.html)
+- [Configuration](https://docs.hyperion-project.org/user/Configuration.html)
+- [Effect development](https://docs.hyperion-project.org/effects/Effects.html)
+- [JSON API](https://docs.hyperion-project.org/json/JSON.html)
 
 [![Visit Documentation](https://img.shields.io/website/https/docs.hyperion-project.org.svg?label=Documentation&down_color=red&down_message=offline&up_color=4bc51d&up_message=online&logo=read-the-docs)](https://docs.hyperion-project.org)
 
@@ -64,7 +64,7 @@ Released and unreleased changes at [CHANGELOG.md](CHANGELOG.md).
 See [CompileHowto.md](doc/development/CompileHowto.md).
 
 ## Installation
-See [Documentation](https://docs.hyperion-project.org/en/user/Installation.html) or on the [Release Repository](https://releases.hyperion-project.org).
+See [Getting Started](https://docs.hyperion-project.org/user/GettingStarted.html) or on the [Release Repository](https://releases.hyperion-project.org).
 
 ## Download
 GitHub Releases are available on the [Hyperion release page](https://github.com/hyperion-project/hyperion.ng/releases).

assets/webconfig/i18n/de.json

@@ -159,8 +159,9 @@
     "conf_leds_note_layout_overwrite": "Achtung: Überschreiben erzeugt ein Standardlayout für {{plural:$1| eine LED| alle $1 LEDs}} gemäß der gegebenen Hardware LED-Anzahl",
     "conf_leds_optgroup_RPiGPIO": "RPi GPIO",
     "conf_leds_optgroup_RPiPWM": "RPi PWM",
-    "conf_leds_optgroup_RPiSPI": "RPi SPI",
+    "conf_leds_optgroup_SPI": "SPI",
     "conf_leds_optgroup_debug": "Debug",
+    "conf_leds_optgroup_ftdi": "USB/Ftdi",
     "conf_leds_optgroup_network": "Netzwerk",
     "conf_leds_optgroup_other": "Andere",
     "conf_leds_optgroup_usb": "USB/Seriell",
@@ -191,6 +192,7 @@
     "conf_network_tok_diaTitle": "Neues Token erstellt!",
     "conf_network_tok_grantMsg": "Eine App fordert Zugriff auf die Hyperion API durch ein Token. Möchtest du dies zulassen? Bitte überprüfe die angegebenen Informationen!",
     "conf_network_tok_grantT": "App Token angefordert",
+    "conf_network_tok_idhead": "ID",
     "conf_network_tok_intro": "Hier kannst du Token zur API-Authentifizierung erstellen oder löschen. Neu erstellte Token werden einmalig angezeigt.",
     "conf_network_tok_lastuse": "Zuletzt genutzt",
     "conf_network_tok_title": "Token Management",
@@ -611,6 +613,11 @@
     "edt_conf_webc_sslport_title": "HTTPS Port",
     "edt_dev_auth_key_title": "Autorisierungs-Token",
     "edt_dev_auth_key_title_info": "Autorisierungs-Token für den Zugriff auf das Gerät erforderlich",
+    "edt_dev_enum_auto": "Auto",
+    "edt_dev_enum_auto_accurate": "Auto genau",
+    "edt_dev_enum_auto_max": "Auto maximal",
+    "edt_dev_enum_cold_white": "Kaltweiß",
+    "edt_dev_enum_neutral_white": "Neutralweiß",
     "edt_dev_enum_sub_min_cool_adjust": "Minimale Anpassung: cool",
     "edt_dev_enum_sub_min_warm_adjust": "Minimale Anpassung: warm",
     "edt_dev_enum_subtract_minimum": "Subtrahiere Minimum",
@@ -735,7 +742,7 @@
     "edt_dev_spec_username_title": "Benutzername",
     "edt_dev_spec_verbose_title": "Protokollierung der HUE-Kommandos",
     "edt_dev_spec_vid_title": "VID",
-    "edt_dev_spec_whiteLedAlgor_title": "Weiß Algorithmus",
+    "edt_dev_spec_whiteLedAlgor_title": "Weißabgleich Algorithmus",
     "edt_dev_spec_whitepoint_title": "Weißpunkt",
     "edt_eff_alarmcolor": "Alarm Farbe",
     "edt_eff_backgroundColor": "Hintergrundfarbe",
@@ -962,6 +969,7 @@
     "general_country_us": "Amerika",
     "general_disabled": "deaktiviert",
     "general_enabled": "aktiviert",
+    "general_speech_bg": "Bulgarisch",
     "general_speech_ca": "Katalanisch",
     "general_speech_cs": "Tschechisch",
     "general_speech_da": "Dänisch",

assets/webconfig/i18n/en.json

@@ -85,6 +85,7 @@
     "conf_leds_layout_cl_bottomleft": "Bottom Left (Corner)",
     "conf_leds_layout_cl_bottomright": "Bottom Right (Corner)",
     "conf_leds_layout_cl_cornergap": "Corner Gap",
+    "conf_leds_layout_cl_disabled": "Deactivated",
     "conf_leds_layout_cl_edgegap": "Edge Gap",
     "conf_leds_layout_cl_entertainment": "Entertainment Area",
     "conf_leds_layout_cl_entertainment_center": "Entertainment Area Center",
@@ -103,6 +104,7 @@
     "conf_leds_layout_cl_lightPosBottomLeft112": "Bottom: 0  - 50%  from Left",
     "conf_leds_layout_cl_lightPosBottomLeft121": "Bottom: 50 - 100% from Left",
     "conf_leds_layout_cl_lightPosBottomLeftNewMid": "Bottom: 25  - 75%  from Left",
+    "conf_leds_layout_cl_lightPosEntire": "Whole picture",
     "conf_leds_layout_cl_lightPosTopLeft112": "Top: 0  - 50%  from Left",
     "conf_leds_layout_cl_lightPosTopLeft121": "Top: 50 - 100% from Left",
     "conf_leds_layout_cl_lightPosTopLeftNewMid": "Top: 25  - 75%  from Left",
@@ -161,11 +163,12 @@
     "conf_leds_note_layout_overwrite": "Note: Overwrite creates a default layout for {{plural:$1| one LED| all $1 LEDs}} given by the hardware LED count",
     "conf_leds_optgroup_RPiGPIO": "RPi GPIO",
     "conf_leds_optgroup_RPiPWM": "RPi PWM",
-    "conf_leds_optgroup_RPiSPI": "RPi SPI",
+    "conf_leds_optgroup_SPI": "SPI",
     "conf_leds_optgroup_debug": "Debug",
     "conf_leds_optgroup_network": "Network",
     "conf_leds_optgroup_other": "Other",
     "conf_leds_optgroup_usb": "USB/Serial",
+    "conf_leds_optgroup_ftdi": "USB/Ftdi",
     "conf_logging_btn_autoscroll": "Auto scrolling",
     "conf_logging_btn_clipboard": "Copy Log to Clipboard",
     "conf_logging_btn_pbupload": "Upload a report for support requests",
@@ -624,6 +627,11 @@
     "edt_dev_enum_sub_min_cool_adjust": "Subtract cool white",
     "edt_dev_enum_sub_min_warm_adjust": "Subtract warm white",
     "edt_dev_enum_subtract_minimum": "Subtract minimum",
+    "edt_dev_enum_cold_white": "Cold white",
+    "edt_dev_enum_neutral_white": "Neutral white",
+    "edt_dev_enum_auto": "Auto",
+    "edt_dev_enum_auto_max": "Auto max",
+    "edt_dev_enum_auto_accurate": "Auto accurate",
     "edt_dev_enum_white_off": "White off",
     "edt_dev_general_autostart_title": "Autostart",
     "edt_dev_general_autostart_title_info": "The LED device is switched-on during startup or not",
@@ -660,13 +668,14 @@
     "edt_dev_spec_colorComponent_title": "Colour component",
     "edt_dev_spec_debugLevel_title": "Debug Level",
     "edt_dev_spec_delayAfterConnect_title": "Delay after connect",
-    "edt_dev_spec_devices_discovered_none": "No Devices Discovered",
-    "edt_dev_spec_devices_discovered_title": "Devices Discovered",
+    "edt_dev_spec_devices_discovered_none": "No Devices discovered",
+    "edt_dev_spec_devices_discovered_title": "Devices discovered",
     "edt_dev_spec_devices_discovered_title_info": "Select your LED-Device discovered",
     "edt_dev_spec_devices_discovered_title_info_custom": "Select your LED-Device discovered or configure a custome one",
     "edt_dev_spec_devices_discovery_inprogress": "Discovery in progress",
     "edt_dev_spec_dithering_title": "Dithering",
     "edt_dev_spec_dmaNumber_title": "DMA channel",
+    "edt_dev_spec_fullBrightnessAtStart_title": "Full brightness at start",    
     "edt_dev_spec_gamma_title": "Gamma",
     "edt_dev_spec_globalBrightnessControlMaxLevel_title": "Max Current Level",
     "edt_dev_spec_globalBrightnessControlThreshold_title": "Adaptive Current Threshold",
@@ -684,6 +693,7 @@
     "edt_dev_spec_ledType_title": "LED Type",
     "edt_dev_spec_lightid_itemtitle": "ID",
     "edt_dev_spec_lightid_title": "Light ID(s)",
+    "edt_dev_spec_lights_discovered_none": "No Lights discovered",
     "edt_dev_spec_lights_itemtitle": "Light",
     "edt_dev_spec_lights_name": "Name",
     "edt_dev_spec_lights_title": "Light(s)",
@@ -705,6 +715,7 @@
     "edt_dev_spec_port_expl": "Service Port [1-65535]",
     "edt_dev_spec_port_title": "Port",
     "edt_dev_spec_printTimeStamp_title": "Add timestamp",
+    "edt_dev_spec_skydimo_mode_title": "Skydimo Mode",
     "edt_dev_spec_stream_protocol_title": "Streaming protocol",
     "edt_dev_spec_pwmChannel_title": "PWM channel",
     "edt_dev_spec_razer_device_title": "Razer Chroma Device",
@@ -1182,9 +1193,10 @@
     "wiz_identify_tip": "Identify configured device by lighting it up",
     "wiz_identify_light": "Identify $1",
     "wiz_layout": "Generate Layout",
+    "wiz_layout_led_position_title": "LED position",
+    "wiz_layout_led_positions_title": "LED position layout wizard",
+    "wiz_layout_led_positions_expl": "Select the LED position for the $1 controller lights.",
     "wiz_layout_tip": "Generate a layout for the configured device",
-    "wiz_ids_disabled": "Deactivated",
-    "wiz_ids_entire": "Whole picture",
     "wiz_nanoleaf_failure_auth_token": "Please press the Nanoleaf Power On/Off button within 30 seconds",
     "wiz_nanoleaf_failure_auth_token_t": "User authorization token generating timeout",
     "wiz_nanoleaf_press_onoff_button": "Please press the Power On/Off button on your Nanoleaf device for 5-7 seconds",

assets/webconfig/i18n/sv.json

@@ -159,8 +159,9 @@
     "conf_leds_note_layout_overwrite": "Varning: Åsidosättande skapar en standardlayout för {{plural:$1| en LED| varje $1 lysdioder}} enligt det givna antalet lysdioder för hårdvara",
     "conf_leds_optgroup_RPiGPIO": "RPi GPIO",
     "conf_leds_optgroup_RPiPWM": "RPi PWM",
-    "conf_leds_optgroup_RPiSPI": "RPi SPI",
+    "conf_leds_optgroup_SPI": "SPI",
     "conf_leds_optgroup_debug": "Felsöka",
+    "conf_leds_optgroup_ftdi": "USB/Ftdi",
     "conf_leds_optgroup_network": "Nätverk",
     "conf_leds_optgroup_other": "Annat",
     "conf_leds_optgroup_usb": "USB/Seriell",
@@ -612,6 +613,11 @@
     "edt_conf_webc_sslport_title": "HTTPS-Port",
     "edt_dev_auth_key_title": "Auktorisationsnyckel",
     "edt_dev_auth_key_title_info": "Auktorisationsnyckel krävs för att få åtkomst till enheten",
+    "edt_dev_enum_auto": "Auto",
+    "edt_dev_enum_auto_accurate": "Auto noggrann",
+    "edt_dev_enum_auto_max": "Auto max",
+    "edt_dev_enum_cold_white": "Kallvitt",
+    "edt_dev_enum_neutral_white": "Neutralvitt",
     "edt_dev_enum_sub_min_cool_adjust": "Minsta justering: kall",
     "edt_dev_enum_sub_min_warm_adjust": "Minsta justering: varm",
     "edt_dev_enum_subtract_minimum": "Subtrahera minimum",
@@ -963,6 +969,7 @@
     "general_country_us": "USA",
     "general_disabled": "Inaktiverad",
     "general_enabled": "Aktiverad",
+    "general_speech_bg": "Bulgariska",
     "general_speech_ca": "Katalanska",
     "general_speech_cs": "Tjeckiska",
     "general_speech_da": "Danska",

assets/webconfig/js/content_index.js

@@ -197,7 +197,7 @@ $(document).ready(function () {
       removeStorage("loginToken");
       requestRequiresDefaultPasswortChange();
     }
-    else if (event.reason == "Selected Hyperion instance isn't running") {
+    else if (event.reason == "Selected Hyperion instance is not running") {
       //Switch to default instance
       instanceSwitch(0);
     } else {