From 96617ba0b50d3148f5a3f6c91086a8a5d535512a Mon Sep 17 00:00:00 2001
From: gibahjoe <gibahjoe@gmail.com>
Date: Wed, 1 Feb 2023 17:16:49 +0100
Subject: [PATCH] Added support for entertainment api v2 (hue gradient strips)
 (#471)

* added support for philips gradient light strip using v2 api

* added comments

* removed unused code

* added entertainment configuration id, fixed issue with identify

* fixed bridge discovery

* added identify logic for channels.

* Minor changes

* Update Philips Hue scheme

* Power on LED device before streaming Identify colors

* added identify to led layout right click

* Revert "added identify to led layout right click"

This reverts commit a3da48ec6bffd28db1fb310a8b41244df42517e4.

* Blink

* Updated lights count to workaround lights and channel counts mismatch

* Fixes

* Update lang resources

* Do not override LEDs position before saving

* Fix: do not include philipshuev2 into Debug devices list

* Refactoring

* Clean-up schemes

---------

Co-authored-by: awawa-dev <mail4awawa@gmail.com>
Co-authored-by: Awawa <69086569+awawa-dev@users.noreply.github.com>
---
 .gitignore                                    |   2 +
 assets/webconfig/content/light_source.html    |   1 +
 assets/webconfig/i18n/cs.json                 |   5 +
 assets/webconfig/i18n/de.json                 |   5 +
 assets/webconfig/i18n/en.json                 |   9 +-
 assets/webconfig/i18n/es.json                 |   5 +
 assets/webconfig/i18n/fr.json                 |   5 +
 assets/webconfig/i18n/it.json                 |   5 +
 assets/webconfig/i18n/nl.json                 |   5 +
 assets/webconfig/i18n/pl.json                 |   5 +
 assets/webconfig/i18n/ro.json                 |   5 +
 assets/webconfig/i18n/ru.json                 |   5 +
 assets/webconfig/i18n/sv.json                 |   5 +
 assets/webconfig/i18n/tr.json                 |   5 +
 assets/webconfig/i18n/vi.json                 |   5 +
 assets/webconfig/i18n/zh-CN.json              |   5 +
 assets/webconfig/js/hyperhdr.js               |   4 +-
 assets/webconfig/js/light_source.js           |  20 +-
 assets/webconfig/js/wizard.js                 | 332 ++++++----
 include/base/HyperHdrInstance.h               |   2 +
 include/leddevice/LedDevice.h                 |   4 +
 include/leddevice/LedDeviceWrapper.h          |   2 +
 sources/api/JSONRPC_schema/schema-tunnel.json |   3 +
 sources/api/JsonAPI.cpp                       |  31 +-
 sources/base/HyperHdrInstance.cpp             |   6 +
 sources/base/schema/schema-color.json         |   2 +-
 sources/leddevice/LedDevice.cpp               |  43 +-
 sources/leddevice/LedDeviceWrapper.cpp        |  10 +
 .../leddevice/dev_net/LedDevicePhilipsHue.cpp | 591 +++++++++++++++++-
 .../leddevice/dev_net/LedDevicePhilipsHue.h   |  41 +-
 sources/leddevice/dev_net/ProviderRestApi.cpp |  39 +-
 sources/leddevice/dev_net/ProviderRestApi.h   |   8 +-
 .../leddevice/schemas/schema-philipshue.json  |  62 +-
 33 files changed, 1101 insertions(+), 176 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c1b9124b..57a9cb70e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ dependencies/bonjour
 # Visual Studio 2015/2017/2019 cache/options directory
 .vs/
 CMakeSettings.json
+cmake-build-debug
+.idea
diff --git a/assets/webconfig/content/light_source.html b/assets/webconfig/content/light_source.html
index d0ab6788e..d94454b5e 100644
--- a/assets/webconfig/content/light_source.html
+++ b/assets/webconfig/content/light_source.html
@@ -595,6 +595,7 @@ <h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_l
 <div class="dropdown-menu dropdown-menu-sm" style="display: none;" id="creator-context-menu">
 	<a class="dropdown-item" href="#" id="CMD_MOVE"><i class="fa fa-arrows fa-fw"></i><span data-i18n="led_editor_context_move">Move</span></a>
 	<a class="dropdown-item" href="#" id="CMD_PROPERTIES"><i class="fa fa-edit fa-fw"></i><span data-i18n="led_editor_context_properties">Properties</span></a>
+	<a class="dropdown-item" href="#" id="CMD_IDENTIFY"><i class="fa fa-eye-slash fa-fw"></i><span data-i18n="led_editor_context_identify">Identify</span></a>
 	<a class="dropdown-item" href="#" id="CMD_ENABLE"><i class="fa fa-lightbulb-o fa-fw"></i><span id="cmd_dis_enable_text" data-i18n="led_editor_context_enable">Enable</span></a>
 	<a class="dropdown-item" href="#" id="CMD_DELETE"><i class="fa fa-remove fa-fw"></i><span data-i18n="led_editor_context_delete">Delete</span></a>
 </div>
diff --git a/assets/webconfig/i18n/cs.json b/assets/webconfig/i18n/cs.json
index 3127b84c5..07570130f 100644
--- a/assets/webconfig/i18n/cs.json
+++ b/assets/webconfig/i18n/cs.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO mapování",
   "edt_dev_spec_gpioNumber_title": "Číslo GPIO",
   "edt_dev_spec_groupId_title": "ID skupiny",
+  "edt_dev_spec_entertainmentConfigurationId_title": "ID konfigurace zábavy",
   "edt_dev_spec_header_title": "Specifická nastavení",
   "edt_dev_spec_interpolation_title": "Interpolace",
   "edt_dev_spec_intervall_title": "Interval",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Vesmír",
   "edt_dev_spec_useEntertainmentAPI_title": "Použijte Hue Entertainment API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Použít rozhraní Hue Entertainment API V2 (přidává podporu pro světelné pruhy s přechodem odstínu)",
   "edt_dev_spec_useOrbSmoothing_title": "Použijte vyhlazování koule",
   "edt_dev_spec_useRgbwProtocol_title": "Použijte protokol RGBW",
   "edt_dev_spec_username_title": "Uživatelské jméno",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight Wizard",
   "wiz_guideyou": "$1 vás provede nastavením. Stačí stisknout tlačítko!",
   "wiz_hue_blinkblue": "Nechte ID $1 svítit modře",
+  "wiz_hue_identify": "Identifikovat",
   "wiz_hue_clientkey": "Klíč klienta:",
   "wiz_hue_create_user": "Vytvořit nového uživatele",
   "wiz_hue_desc1": "Automaticky vyhledá Hue-Bridge, v případě, že jej nenajde, musíte zadat IP adresu a vpravo stisknout tlačítko pro opětovné načtení. Nyní potřebujete ID uživatele, pokud ho nemáte, vytvořte nové.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Průvodce zábavou Philips Hue",
   "wiz_hue_e_use_group": "Použijte skupinu",
   "wiz_hue_e_use_groupid": "Použijte ID skupiny $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Použijte konfigurační ID $1",
   "wiz_hue_failure_connection": "Časový limit: Stiskněte tlačítko přemostění do 30 sekund",
   "wiz_hue_failure_ip": "Nenalezen žádný most, zadejte prosím platnou IP adresu",
   "wiz_hue_failure_user": "Uživatel nebyl nalezen, vytvořte nového pomocí tlačítka níže nebo zadejte platné ID uživatele a stiskněte symbol „znovu načíst“.",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Hardwarové ovládání odstínu",
   "edt_conf_stream_hardware_hue_expl": "Nastavte odstín hardwaru, pokud to zařízení podporuje, zkontrolujte protokoly (0 = zakázáno)",
   "edt_dev_spec_awa_mode_title": "Vysokorychlostní sériový protokol AWA s kontrolou integrity dat (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>informace</a>)",
+  "led_editor_context_identify": "Identifikovat",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Dole: 0 - 25% zleva",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Dole: 25 - 50% zleva",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Dole: 50 - 75% zleva",
diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json
index 262aa4a38..990bb74cf 100644
--- a/assets/webconfig/i18n/de.json
+++ b/assets/webconfig/i18n/de.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO-Mapping",
   "edt_dev_spec_gpioNumber_title": "GPIO-Nummer",
   "edt_dev_spec_groupId_title": "Gruppen-ID",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Unterhaltungskonfigurations-ID",
   "edt_dev_spec_header_title": "Spezifische Einstellungen",
   "edt_dev_spec_interpolation_title": "Interpolation",
   "edt_dev_spec_intervall_title": "Intervall",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Universe",
   "edt_dev_spec_useEntertainmentAPI_title": "Verwenden Sie die Hue Entertainment-API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Verwenden Sie die Hue Entertainment API V2 (fügt Unterstützung für Lichtstreifen mit Farbverlauf hinzu)",
   "edt_dev_spec_useOrbSmoothing_title": "Verwenden Sie die Kugelglättung",
   "edt_dev_spec_useRgbwProtocol_title": "Verwenden Sie das RGBW-Protokoll",
   "edt_dev_spec_username_title": "Nutzername",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight-Assistent",
   "wiz_guideyou": "Die $1 führt Sie durch die Einstellungen. Drücken Sie einfach den Knopf!",
   "wiz_hue_blinkblue": "Lass ID $1 blau leuchten",
+  "wiz_hue_identify": "Identifizieren",
   "wiz_hue_clientkey": "Kundenschlüssel:",
   "wiz_hue_create_user": "Neuen Benutzer erstellen",
   "wiz_hue_desc1": "Es sucht automatisch nach einer Hue-Bridge, falls es keine findet, müssen Sie die IP-Adresse angeben und den Reload-Button rechts drücken. Jetzt benötigen Sie eine Benutzer-ID, falls Sie noch keine haben, erstellen Sie eine neue.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Philips Hue Entertainment-Assistent",
   "wiz_hue_e_use_group": "Gruppe verwenden",
   "wiz_hue_e_use_groupid": "Verwenden Sie die Gruppen-ID $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Verwenden Sie die Konfigurations-ID $1",
   "wiz_hue_failure_connection": "Timeout: Bitte drücken Sie die Brückentaste innerhalb von 30 Sekunden",
   "wiz_hue_failure_ip": "Keine Bridge gefunden, bitte geben Sie eine gültige IP-Adresse ein",
   "wiz_hue_failure_user": "Benutzer nicht gefunden, erstellen Sie einen neuen mit der Schaltfläche unten oder geben Sie eine gültige Benutzer-ID ein und drücken Sie auf das Symbol \"Neu laden\".",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Hardware Farbtonsteuerung",
   "edt_conf_stream_hardware_hue_expl": "Stellen Sie den Hardware-Farbton ein, wenn das Gerät dies unterstützt, überprüfen Sie die Protokolle (0=deaktiviert)",
   "edt_dev_spec_awa_mode_title": "Serielles AWA-Hochgeschwindigkeitsprotokoll mit Datenintegritätsprüfung (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identifizieren",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Unten: 0 - 25 % von links",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Unten: 25 - 50% von links",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Unten: 50 - 75% von links",
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 18101d4f3..fbd2dcb77 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO mapping",
   "edt_dev_spec_gpioNumber_title": "GPIO number",
   "edt_dev_spec_groupId_title": "Group ID",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Entertainment Configuration ID",
   "edt_dev_spec_header_title": "Specific Settings",
   "edt_dev_spec_interpolation_title": "Interpolation",
   "edt_dev_spec_intervall_title": "Interval",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Universe",
   "edt_dev_spec_useEntertainmentAPI_title": "Use Hue Entertainment API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Use Hue Entertainment API V2 (Adds support for hue gradient light strips)",
   "edt_dev_spec_useOrbSmoothing_title": "Use orb smoothing",
   "edt_dev_spec_useRgbwProtocol_title": "Use RGBW protocol",
   "edt_dev_spec_username_title": "Username",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight Wizard",
   "wiz_guideyou": "The $1 will guide you through the settings. Just press the button!",
   "wiz_hue_blinkblue": "Let ID $1 light up blue",
+  "wiz_hue_identify": "Identify",
   "wiz_hue_clientkey": "Clientkey:",
   "wiz_hue_create_user": "Create new User",
   "wiz_hue_desc1": "It searches automatically for a Hue-Bridge, in case it can't find one you need to provide the IP-address and push the reload button on the right. Now you need a user ID, if you don't have one create a new one.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Philips Hue Entertainment Wizard",
   "wiz_hue_e_use_group": "Use group",
   "wiz_hue_e_use_groupid": "Use group ID $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Use configuration ID $1",
   "wiz_hue_failure_connection": "Timeout: Please press the bridge button within the period of 30 seconds",
   "wiz_hue_failure_ip": "No Bridge found, please type in a valid IP-Address",
   "wiz_hue_failure_user": "User not found, create a new one with the button below or input a valid user id and press the \"reload\" symbol.",
@@ -1004,7 +1008,7 @@
   "general_comp_HDR" : "HDR (global)",
   "language_selector" : "Language",
   "main_menu_dashboard_token" : "Overview",
-  "wiz_hue_intro2" : "<p style='color:red;'><b>PLEASE CONFIGURE THE ENTERTAINMENT GROUP IN THE PHILIPS HUE MOBILE APP FIRST</b></p>1 Create an Entertainment group in the Philips Hue App<br/>2 Check &rsquo;<i>Use Hue Entertainment API</i>&rsquo; option in HyperHDR before entering the wizard<br/>3 Run the wizard. You may have to reconnect to the Hue Bridge by clicking the button on the bridge when you are asked to. &rsquo;<i>Username</i>&rsquo; and &rsquo;<i>Clientkey</i>&rsquo; will be automatically discovered.",
+  "wiz_hue_intro2" : "<p style='color:red;'><b>PLEASE CONFIGURE THE ENTERTAINMENT GROUP IN THE PHILIPS HUE MOBILE APP FIRST</b></p>1 Create an Entertainment group in the Philips Hue App<br/>2 Check &rsquo;<i>Use Hue Entertainment API</i>&rsquo; option in HyperHDR before entering the wizard<br/>3 Also Check &rsquo;<i>Use Hue Entertainment API V2</i>&rsquo; option in HyperHDR to have hue gradient light strips support before entering the wizard. Note that if your bridge does not support this, it will fall back to V1.<br/>4 Run the wizard. You may have to reconnect to the Hue Bridge by clicking the button on the bridge when you are asked to. &rsquo;<i>Username</i>&rsquo; and &rsquo;<i>Clientkey</i>&rsquo; will be automatically discovered.",
   "main_menu_streamer_token" : "Streamer",
   "remote_optgroup_classicEffects" : "Classic effects",
   "remote_optgroup_musicEffects" : "Music effects",
@@ -1190,5 +1194,6 @@
   "conf_leds_layout_btn_zoom" : "Zoom",
   "edt_serial_espHandshake" : "Esp8266/ESP32 handshake (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
   "edt_rpi_ws281x_driver" : "This driver is intended for advanced users and is <b>not recommended or supported</b> by the HyperHDR team. Please read the project FAQ section for reasons and don't ask us for help if you try to use it because it <b>revokes any support for your entire HyperHDR configuration</b>. Choose a better solution like HyperSerialEsp8266/HyperSerialESP32 (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>about</a>) or HyperSPI (<a href='https://github.com/awawa-dev/HyperSPI' style='color:red'>about</a>).",
-  "edt_dev_spec_awa_mode_title": "High speed serial AWA protocol with data integrity check (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)"
+  "edt_dev_spec_awa_mode_title": "High speed serial AWA protocol with data integrity check (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identify"
 } 
diff --git a/assets/webconfig/i18n/es.json b/assets/webconfig/i18n/es.json
index 9b87d98c8..858651820 100644
--- a/assets/webconfig/i18n/es.json
+++ b/assets/webconfig/i18n/es.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Mapeo GPIO",
   "edt_dev_spec_gpioNumber_title": "Número GPIO",
   "edt_dev_spec_groupId_title": "Identificación del grupo",
+  "edt_dev_spec_entertainmentConfigurationId_title": "ID de configuración de entretenimiento",
   "edt_dev_spec_header_title": "Configuraciones específicas",
   "edt_dev_spec_interpolation_title": "Interpolación",
   "edt_dev_spec_intervall_title": "Intervalo",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Universo",
   "edt_dev_spec_useEntertainmentAPI_title": "Utilice la API de Hue Entertainment",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Use Hue Entertainment API V2 (agrega soporte para tiras de luz de gradiente de tono)",
   "edt_dev_spec_useOrbSmoothing_title": "Usar suavizado de orbe",
   "edt_dev_spec_useRgbwProtocol_title": "Utilice el protocolo RGBW",
   "edt_dev_spec_username_title": "Nombre de usuario",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Asistente de Cololight",
   "wiz_guideyou": "El $1 lo guiará a través de la configuración. ¡Solo presiona el botón!",
   "wiz_hue_blinkblue": "Deje que el ID $1 se ilumine en azul",
+  "wiz_hue_identify": "Identificar",
   "wiz_hue_clientkey": "Clave de cliente:",
   "wiz_hue_create_user": "Crear nuevo usuario",
   "wiz_hue_desc1": "Busca automáticamente un Hue-Bridge, en caso de que no pueda encontrar uno, debe proporcionar la dirección IP y presionar el botón de recarga a la derecha. Ahora necesita una identificación de usuario, si no tiene una, cree una nueva.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Asistente de entretenimiento de Philips Hue",
   "wiz_hue_e_use_group": "Usar grupo",
   "wiz_hue_e_use_groupid": "Usar ID de grupo $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Usar ID de configuración $1",
   "wiz_hue_failure_connection": "Tiempo de espera: presione el botón de puente dentro del período de 30 segundos",
   "wiz_hue_failure_ip": "No se encontró ningún puente, ingrese una dirección IP válida",
   "wiz_hue_failure_user": "Usuario no encontrado, cree uno nuevo con el botón de abajo o ingrese una identificación de usuario válida y presione el símbolo \"recargar\".",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Control de tono de hardware",
   "edt_conf_stream_hardware_hue_expl": "Configure el tono del hardware si el dispositivo lo admite, verifique los registros (0 = deshabilitado)",
   "edt_dev_spec_awa_mode_title": "Protocolo AWA serial de alta velocidad con verificación de integridad de datos (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identificar",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Abajo: 0-25% desde la izquierda",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Abajo: 25 - 50% desde la izquierda",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Abajo: 50 - 75% desde la izquierda",
diff --git a/assets/webconfig/i18n/fr.json b/assets/webconfig/i18n/fr.json
index 31c69ba0e..4e0a8079a 100644
--- a/assets/webconfig/i18n/fr.json
+++ b/assets/webconfig/i18n/fr.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Cartographie GPIO",
   "edt_dev_spec_gpioNumber_title": "Numéro GPIO",
   "edt_dev_spec_groupId_title": "Identifiant du groupe",
+  "edt_dev_spec_entertainmentConfigurationId_title": "ID de configuration de divertissement",
   "edt_dev_spec_header_title": "Paramètres spécifiques",
   "edt_dev_spec_interpolation_title": "Interpolation",
   "edt_dev_spec_intervall_title": "Intervalle",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Univers",
   "edt_dev_spec_useEntertainmentAPI_title": "Utiliser l'API Hue Entertainment",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Utiliser Hue Entertainment API V2 (ajoute la prise en charge des bandes lumineuses à dégradé de teinte)",
   "edt_dev_spec_useOrbSmoothing_title": "Utiliser le lissage d'orbe",
   "edt_dev_spec_useRgbwProtocol_title": "Utiliser le protocole RGBW",
   "edt_dev_spec_username_title": "Nom d'utilisateur",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Assistant Cololight",
   "wiz_guideyou": "Le $1 vous guidera à travers les réglages. Appuyez simplement sur le bouton !",
   "wiz_hue_blinkblue": "Laissez ID $1 s'allumer en bleu",
+  "wiz_hue_identify": "Identité",
   "wiz_hue_clientkey": "Clé client :",
   "wiz_hue_create_user": "Créer un nouvel utilisateur",
   "wiz_hue_desc1": "Il recherche automatiquement un Hue-Bridge, au cas où il n'en trouve pas, vous devez fournir l'adresse IP et appuyer sur le bouton de rechargement sur la droite. Maintenant, vous avez besoin d'un identifiant d'utilisateur, si vous n'en avez pas, créez-en un nouveau.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Assistant de divertissement Philips Hue",
   "wiz_hue_e_use_group": "Utiliser le groupe",
   "wiz_hue_e_use_groupid": "Utiliser l'ID de groupe $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Utiliser l'ID de configuration $1",
   "wiz_hue_failure_connection": "Délai d'attente : veuillez appuyer sur le bouton du pont dans un délai de 30 secondes",
   "wiz_hue_failure_ip": "Aucun pont trouvé, veuillez saisir une adresse IP valide",
   "wiz_hue_failure_user": "Utilisateur introuvable, créez-en un nouveau avec le bouton ci-dessous ou entrez un identifiant d'utilisateur valide et appuyez sur le symbole \"recharger\".",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Contrôle de la teinte matérielle",
   "edt_conf_stream_hardware_hue_expl": "Définir la teinte du matériel si l'appareil le prend en charge, vérifier les journaux (0 = désactivé)",
   "edt_dev_spec_awa_mode_title": "Protocole AWA série haute vitesse avec vérification de l'intégrité des données (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identité",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Bas : 0 - 25 % à partir de la gauche",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Bas : 25 - 50 % à partir de la gauche",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Bas : 50 - 75 % de la gauche",
diff --git a/assets/webconfig/i18n/it.json b/assets/webconfig/i18n/it.json
index b2d1de41e..32d8bbb81 100644
--- a/assets/webconfig/i18n/it.json
+++ b/assets/webconfig/i18n/it.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Mappatura GPIO",
   "edt_dev_spec_gpioNumber_title": "Numero GPIO",
   "edt_dev_spec_groupId_title": "ID gruppo",
+  "edt_dev_spec_entertainmentConfigurationId_title": "ID configurazione intrattenimento",
   "edt_dev_spec_header_title": "Impostazioni specifiche",
   "edt_dev_spec_interpolation_title": "interpolazione",
   "edt_dev_spec_intervall_title": "Intervallo",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Universo",
   "edt_dev_spec_useEntertainmentAPI_title": "Usa l'API Hue Entertainment",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Usa Hue Entertainment API V2 (aggiunge il supporto per strisce luminose sfumate di tonalità)",
   "edt_dev_spec_useOrbSmoothing_title": "Usa il livellamento del globo",
   "edt_dev_spec_useRgbwProtocol_title": "Usa protocollo RGBW",
   "edt_dev_spec_username_title": "Nome utente",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Mago Cololight",
   "wiz_guideyou": "Il $1 ti guiderà attraverso le impostazioni. Basta premere il pulsante!",
   "wiz_hue_blinkblue": "Lascia che l'ID $1 si illumini di blu",
+  "wiz_hue_identify": "Identificare",
   "wiz_hue_clientkey": "Chiave cliente:",
   "wiz_hue_create_user": "Crea nuovo utente",
   "wiz_hue_desc1": "Cerca automaticamente un Hue-Bridge, nel caso in cui non riesca a trovarne uno è necessario fornire l'indirizzo IP e premere il pulsante di ricarica a destra. Ora hai bisogno di un ID utente, se non ne hai uno creane uno nuovo.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Procedura guidata di intrattenimento Philips Hue",
   "wiz_hue_e_use_group": "Usa gruppo",
   "wiz_hue_e_use_groupid": "Usa ID gruppo $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Utilizza l'ID configurazione $1",
   "wiz_hue_failure_connection": "Timeout: premere il pulsante bridge entro 30 secondi",
   "wiz_hue_failure_ip": "Nessun bridge trovato, inserisci un indirizzo IP valido",
   "wiz_hue_failure_user": "Utente non trovato, creane uno nuovo con il pulsante in basso o inserisci un ID utente valido e premi il simbolo \"ricarica\".",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Controllo tonalità hardware",
   "edt_conf_stream_hardware_hue_expl": "Imposta la tonalità hardware se il dispositivo lo supporta, controlla i registri (0=disabilitato)",
   "edt_dev_spec_awa_mode_title": "Protocollo AWA seriale ad alta velocità con controllo dell'integrità dei dati (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identificare",
   "conf_leds_layout_cl_lightPosBottomLeft14": "In basso: 0 - 25% da sinistra",
   "conf_leds_layout_cl_lightPosBottomLeft12": "In basso: 25 - 50% da sinistra",
   "conf_leds_layout_cl_lightPosBottomLeft34": "In basso: 50 - 75% da sinistra",
diff --git a/assets/webconfig/i18n/nl.json b/assets/webconfig/i18n/nl.json
index cf2b3bb67..6e935facd 100644
--- a/assets/webconfig/i18n/nl.json
+++ b/assets/webconfig/i18n/nl.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO-toewijzing",
   "edt_dev_spec_gpioNumber_title": "GPIO-nummer",
   "edt_dev_spec_groupId_title": "Groeps-ID",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Entertainmentconfiguratie-ID",
   "edt_dev_spec_header_title": "Specifieke instellingen",
   "edt_dev_spec_interpolation_title": "Interpolatie",
   "edt_dev_spec_intervall_title": "Interval",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Universum",
   "edt_dev_spec_useEntertainmentAPI_title": "Hue Entertainment API gebruiken",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Gebruik Hue Entertainment API V2 (voegt ondersteuning toe voor hue gradient light strips)",
   "edt_dev_spec_useOrbSmoothing_title": "Orb smoothing gebruiken",
   "edt_dev_spec_useRgbwProtocol_title": "RGBW-protocol gebruiken",
   "edt_dev_spec_username_title": "gebruikersnaam",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight-wizard",
   "wiz_guideyou": "De $1 leidt u door de instellingen. Druk gewoon op de knop!",
   "wiz_hue_blinkblue": "Laat ID $1 blauw oplichten",
+  "wiz_hue_identify": "Identificeren",
   "wiz_hue_clientkey": "Klantsleutel:",
   "wiz_hue_create_user": "Nieuwe gebruiker maken",
   "wiz_hue_desc1": "Hij zoekt automatisch naar een Hue-Bridge, voor het geval hij er geen kan vinden, moet je het IP-adres opgeven en op de herlaadknop aan de rechterkant drukken. Nu heb je een gebruikers-ID nodig, als je er geen hebt, maak dan een nieuwe aan.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Philips Hue Entertainment-wizard",
   "wiz_hue_e_use_group": "Gebruik groep",
   "wiz_hue_e_use_groupid": "Gebruik groeps-ID $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Gebruik configuratie-ID $1",
   "wiz_hue_failure_connection": "Time-out: druk binnen 30 seconden op de bridge-knop",
   "wiz_hue_failure_ip": "Geen Bridge gevonden, typ een geldig IP-adres in",
   "wiz_hue_failure_user": "Gebruiker niet gevonden, maak een nieuwe aan met de onderstaande knop of voer een geldige gebruikers-ID in en druk op het symbool \"opnieuw laden\".",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Hardware tint controle",
   "edt_conf_stream_hardware_hue_expl": "Stel hardwaretint in als het apparaat dit ondersteunt, controleer de logboeken (0=uitgeschakeld)",
   "edt_dev_spec_awa_mode_title": "Snel serieel AWA-protocol met gegevensintegriteitscontrole (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identificeren",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Onder: 0 - 25% vanaf links",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Onder: 25 - 50% van links",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Onder: 50 - 75% van links",
diff --git a/assets/webconfig/i18n/pl.json b/assets/webconfig/i18n/pl.json
index 2d41c01ed..e54d65eb0 100644
--- a/assets/webconfig/i18n/pl.json
+++ b/assets/webconfig/i18n/pl.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Mapowanie GPIO",
   "edt_dev_spec_gpioNumber_title": "Numer GPIO",
   "edt_dev_spec_groupId_title": "Identyfikator grupy",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Identyfikator konfiguracji rozrywki",
   "edt_dev_spec_header_title": "Specyficzne ustawienia",
   "edt_dev_spec_interpolation_title": "Interpolacja",
   "edt_dev_spec_intervall_title": "Interwał",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Wszechświat",
   "edt_dev_spec_useEntertainmentAPI_title": "Użyj interfejsu API Hue Entertainment",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Użyj Hue Entertainment API V2 (Dodaje obsługę pasków świetlnych z gradientem odcienia)",
   "edt_dev_spec_useOrbSmoothing_title": "Użyj wygładzania kuli",
   "edt_dev_spec_useRgbwProtocol_title": "Użyj protokołu RGBW",
   "edt_dev_spec_username_title": "Nazwa użytkownika",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Kreator Cololight",
   "wiz_guideyou": "$1 poprowadzi Cię przez ustawienia. Wystarczy nacisnąć przycisk!",
   "wiz_hue_blinkblue": "Niech ID $1 zaświeci się na niebiesko",
+  "wiz_hue_identify": "Zidentyfikować",
   "wiz_hue_clientkey": "Klucz klienta:",
   "wiz_hue_create_user": "Utwórz nowego użytkownika",
   "wiz_hue_desc1": "Automatycznie wyszukuje Hue-Bridge, w przypadku gdy nie może go znaleźć, musisz podać adres IP i nacisnąć przycisk ponownego ładowania po prawej stronie. Teraz potrzebujesz identyfikatora użytkownika, jeśli go nie masz, utwórz nowy.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Kreator rozrywki Philips Hue",
   "wiz_hue_e_use_group": "Użyj grupy",
   "wiz_hue_e_use_groupid": "Użyj identyfikatora grupy $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Użyj identyfikatora konfiguracji $1",
   "wiz_hue_failure_connection": "Limit czasu: naciśnij przycisk mostka w ciągu 30 sekund",
   "wiz_hue_failure_ip": "Nie znaleziono mostka, proszę wpisać poprawny adres IP",
   "wiz_hue_failure_user": "Nie znaleziono użytkownika, utwórz nowego za pomocą przycisku poniżej lub wprowadź prawidłowy identyfikator użytkownika i naciśnij symbol „przeładuj”.",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Sprzętowa kontrola odcienia",
   "edt_conf_stream_hardware_hue_expl": "Ustaw odcień sprzętu, jeśli urządzenie to obsługuje, sprawdź logi (0=wyłączone)",
   "edt_dev_spec_awa_mode_title": "Szybki protokół szeregowy AWA z kontrolą integralności danych (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>informacje</a>)",
+  "led_editor_context_identify": "Zidentyfikować",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Dół: 0 - 25% od lewej",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Dół: 25 - 50% od lewej",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Dół: 50 - 75% od lewej",
diff --git a/assets/webconfig/i18n/ro.json b/assets/webconfig/i18n/ro.json
index 5e593ac09..49dde3a3c 100644
--- a/assets/webconfig/i18n/ro.json
+++ b/assets/webconfig/i18n/ro.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Cartografierea GPIO",
   "edt_dev_spec_gpioNumber_title": "Numărul GPIO",
   "edt_dev_spec_groupId_title": "ID grup",
+  "edt_dev_spec_entertainmentConfigurationId_title": "ID de configurare de divertisment",
   "edt_dev_spec_header_title": "Setări specifice",
   "edt_dev_spec_interpolation_title": "Interpolare",
   "edt_dev_spec_intervall_title": "Interval",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Univers",
   "edt_dev_spec_useEntertainmentAPI_title": "Utilizați Hue Entertainment API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Utilizați Hue Entertainment API V2 (Adaugă suport pentru benzi luminoase cu gradient de nuanță)",
   "edt_dev_spec_useOrbSmoothing_title": "Utilizați netezirea orbului",
   "edt_dev_spec_useRgbwProtocol_title": "Utilizați protocolul RGBW",
   "edt_dev_spec_username_title": "Nume de utilizator",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Vrăjitorul Cololight",
   "wiz_guideyou": "$1 vă va ghida prin setări. Doar apăsați butonul!",
   "wiz_hue_blinkblue": "Lăsați ID-ul $1 să se aprindă în albastru",
+  "wiz_hue_identify": "Identifica",
   "wiz_hue_clientkey": "Cheie client:",
   "wiz_hue_create_user": "Creați un utilizator nou",
   "wiz_hue_desc1": "Se caută automat un Hue-Bridge, în cazul în care nu poate găsi unul, trebuie să furnizați adresa IP și să apăsați butonul de reîncărcare din dreapta. Acum aveți nevoie de un ID de utilizator, dacă nu aveți unul, creați unul nou.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Expertul de divertisment Philips Hue",
   "wiz_hue_e_use_group": "Folosiți grupul",
   "wiz_hue_e_use_groupid": "Folosiți ID-ul grupului $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Utilizați ID-ul de configurare $1",
   "wiz_hue_failure_connection": "Timeout: Vă rugăm să apăsați butonul bridge în intervalul de 30 de secunde",
   "wiz_hue_failure_ip": "Nu a fost găsit niciun Bridge, introduceți o adresă IP validă",
   "wiz_hue_failure_user": "Utilizatorul nu a fost găsit, creați unul nou cu butonul de mai jos sau introduceți un ID de utilizator valid și apăsați simbolul „reîncarcă”.",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Controlul nuanței hardware",
   "edt_conf_stream_hardware_hue_expl": "Setați nuanța hardware dacă dispozitivul o acceptă, verificați jurnalele (0 = dezactivat)",
   "edt_dev_spec_awa_mode_title": "Protocol serial AWA de mare viteză cu verificarea integrității datelor (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>informații</a>)",
+  "led_editor_context_identify": "Identifica",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Jos: 0 - 25% din stânga",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Partea de jos: 25 - 50% din stânga",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Jos: 50 - 75% din stânga",
diff --git a/assets/webconfig/i18n/ru.json b/assets/webconfig/i18n/ru.json
index 6552ab553..52c9f4b23 100644
--- a/assets/webconfig/i18n/ru.json
+++ b/assets/webconfig/i18n/ru.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Отображение GPIO",
   "edt_dev_spec_gpioNumber_title": "Номер GPIO",
   "edt_dev_spec_groupId_title": "ID группы",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Идентификатор конфигурации развлечения",
   "edt_dev_spec_header_title": "Конкретные настройки",
   "edt_dev_spec_interpolation_title": "Интерполяция",
   "edt_dev_spec_intervall_title": "Интервал",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Вселенная",
   "edt_dev_spec_useEntertainmentAPI_title": "Используйте Hue Entertainment API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Используйте Hue Entertainment API V2 (добавляет поддержку световых полос с градиентом оттенка)",
   "edt_dev_spec_useOrbSmoothing_title": "Использовать сглаживание сфер",
   "edt_dev_spec_useRgbwProtocol_title": "Использовать протокол RGBW",
   "edt_dev_spec_username_title": "Имя пользователя",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight Wizard",
   "wiz_guideyou": "$1 проведет вас через настройки. Просто нажмите кнопку!",
   "wiz_hue_blinkblue": "Пусть ID $1 загорится синим",
+  "wiz_hue_identify": "Идентифицировать",
   "wiz_hue_clientkey": "Клиентский ключ:",
   "wiz_hue_create_user": "Создать нового пользователя",
   "wiz_hue_desc1": "Он автоматически ищет Hue-Bridge, если он не может найти его, вам нужно указать IP-адрес и нажать кнопку перезагрузки справа. Теперь вам нужен идентификатор пользователя, если у вас его нет, создайте новый.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Мастер развлечений Philips Hue",
   "wiz_hue_e_use_group": "Использовать группу",
   "wiz_hue_e_use_groupid": "Использовать идентификатор группы $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Использовать идентификатор конфигурации $1",
   "wiz_hue_failure_connection": "Тайм-аут: нажмите кнопку моста в течение 30 секунд.",
   "wiz_hue_failure_ip": "Мост не найден, введите действующий IP-адрес",
   "wiz_hue_failure_user": "Пользователь не найден, создайте новый с помощью кнопки ниже или введите действительный идентификатор пользователя и нажмите символ «перезагрузить».",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Аппаратный контроль оттенка",
   "edt_conf_stream_hardware_hue_expl": "Установите аппаратный оттенок, если устройство поддерживает его, проверьте журналы (0 = отключено)",
   "edt_dev_spec_awa_mode_title": "Высокоскоростной последовательный протокол AWA с проверкой целостности данных (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Идентифицировать",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Внизу: 0-25% слева",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Внизу: 25-50% слева",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Внизу: 50–75% слева",
diff --git a/assets/webconfig/i18n/sv.json b/assets/webconfig/i18n/sv.json
index 0b5a18edc..22dffc4dc 100644
--- a/assets/webconfig/i18n/sv.json
+++ b/assets/webconfig/i18n/sv.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO -kartläggning",
   "edt_dev_spec_gpioNumber_title": "GPIO -nummer",
   "edt_dev_spec_groupId_title": "Grupp -ID",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Underhållningskonfigurations-ID",
   "edt_dev_spec_header_title": "Specifika inställningar",
   "edt_dev_spec_interpolation_title": "Interpolation",
   "edt_dev_spec_intervall_title": "Intervall",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Universum",
   "edt_dev_spec_useEntertainmentAPI_title": "Använd Hue Entertainment API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Använd Hue Entertainment API V2 (lägger till stöd för färgtonsgradientljusremsor)",
   "edt_dev_spec_useOrbSmoothing_title": "Använd kulautjämning",
   "edt_dev_spec_useRgbwProtocol_title": "Använd RGBW -protokoll",
   "edt_dev_spec_username_title": "Användarnamn",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight Wizard",
   "wiz_guideyou": "$1 guidar dig genom inställningarna. Tryck bara på knappen!",
   "wiz_hue_blinkblue": "Låt ID $1 lysa blått",
+  "wiz_hue_identify": "Identifiera",
   "wiz_hue_clientkey": "Klientnyckel:",
   "wiz_hue_create_user": "Skapa ny användare",
   "wiz_hue_desc1": "Den söker automatiskt efter en Hue-Bridge, om den inte kan hitta en så behöver du ange IP-adressen och trycka på omladdningsknappen till höger. Nu behöver du ett användar -ID, om du inte har ett, skapa ett nytt.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Philips Hue Entertainment Wizard",
   "wiz_hue_e_use_group": "Använd grupp",
   "wiz_hue_e_use_groupid": "Använd grupp -ID $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Använd konfigurations-ID $1",
   "wiz_hue_failure_connection": "Timeout: Tryck på bryggknappen inom 30 sekunder",
   "wiz_hue_failure_ip": "Ingen bro hittades, skriv in en giltig IP-adress",
   "wiz_hue_failure_user": "Användaren hittades inte, skapa en ny med knappen nedan eller mata in ett giltigt användar -ID och tryck på \"ladda om\" -symbolen.",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Hårdvaru nyans kontroll",
   "edt_conf_stream_hardware_hue_expl": "Ställ in maskinvarufärg om enheten stöder det, kontrollera loggar (0 = inaktiverad)",
   "edt_dev_spec_awa_mode_title": "Höghastighetsseriellt AWA-protokoll med dataintegritetskontroll (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Identifiera",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Nederst: 0 - 25% från vänster",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Botten: 25 - 50% från vänster",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Botten: 50 - 75% från vänster",
diff --git a/assets/webconfig/i18n/tr.json b/assets/webconfig/i18n/tr.json
index 9b19a5071..70bbdebc9 100644
--- a/assets/webconfig/i18n/tr.json
+++ b/assets/webconfig/i18n/tr.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO eşlemesi",
   "edt_dev_spec_gpioNumber_title": "GPIO numarası",
   "edt_dev_spec_groupId_title": "Grup kimliği",
+  "edt_dev_spec_entertainmentConfigurationId_title": "Eğlence Yapılandırma Kimliği",
   "edt_dev_spec_header_title": "Özel Ayarlar",
   "edt_dev_spec_interpolation_title": "İnterpolasyon",
   "edt_dev_spec_intervall_title": "Aralık",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "kullanıcı kimliği",
   "edt_dev_spec_universe_title": "Evren",
   "edt_dev_spec_useEntertainmentAPI_title": "Hue Entertainment API'sini kullanın",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Hue Entertainment API V2'yi kullanın (Ton gradyan ışık şeritleri için destek ekler)",
   "edt_dev_spec_useOrbSmoothing_title": "Küre yumuşatma kullanın",
   "edt_dev_spec_useRgbwProtocol_title": "RGBW protokolünü kullan",
   "edt_dev_spec_username_title": "Kullanıcı adı",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight Sihirbazı",
   "wiz_guideyou": "$1, ayarlarda size rehberlik edecektir. Sadece düğmeye basın!",
   "wiz_hue_blinkblue": "ID $1'ın mavi yanmasına izin verin",
+  "wiz_hue_identify": "Tanımlamak",
   "wiz_hue_clientkey": "Müşteri anahtarı:",
   "wiz_hue_create_user": "Yeni kullanıcı oluştur",
   "wiz_hue_desc1": "Bir Hue-Bridge'i otomatik olarak arar, bulamazsa IP adresini sağlamanız ve sağdaki yeniden yükle düğmesine basmanız gerekir. Şimdi bir kullanıcı kimliğine ihtiyacınız var, yoksa yeni bir tane oluşturun.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Philips Hue Eğlence Sihirbazı",
   "wiz_hue_e_use_group": "Grubu kullan",
   "wiz_hue_e_use_groupid": "$1 grup kimliğini kullan",
+  "wiz_hue_e_use_entertainmentconfigurationid": "$1 yapılandırma kimliğini kullan",
   "wiz_hue_failure_connection": "Zaman aşımı: Lütfen 30 saniye içinde köprü düğmesine basın",
   "wiz_hue_failure_ip": "Köprü bulunamadı, lütfen geçerli bir IP Adresi girin",
   "wiz_hue_failure_user": "Kullanıcı bulunamadı, aşağıdaki buton ile yeni bir tane oluşturun veya geçerli bir kullanıcı kimliği girin ve \"yeniden yükle\" sembolüne basın.",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Donanım tonu kontrolü",
   "edt_conf_stream_hardware_hue_expl": "Cihaz destekliyorsa donanım tonunu ayarlayın, günlükleri kontrol edin (0=devre dışı)",
   "edt_dev_spec_awa_mode_title": "Veri bütünlüğü kontrolüne sahip yüksek hızlı seri AWA protokolü (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>bilgi</a>)",
+  "led_editor_context_identify": "Tanımlamak",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Alt: Soldan %0 - 25",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Alt: Soldan %25 - %50",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Alt: Soldan %50 - 75",
diff --git a/assets/webconfig/i18n/vi.json b/assets/webconfig/i18n/vi.json
index 5324895af..dc0cafea7 100644
--- a/assets/webconfig/i18n/vi.json
+++ b/assets/webconfig/i18n/vi.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "Ánh xạ GPIO",
   "edt_dev_spec_gpioNumber_title": "Số GPIO",
   "edt_dev_spec_groupId_title": "Id nhóm",
+  "edt_dev_spec_entertainmentConfigurationId_title": "ID cấu hình giải trí",
   "edt_dev_spec_header_title": "Cài đặt cụ thể",
   "edt_dev_spec_interpolation_title": "Phép nội suy",
   "edt_dev_spec_intervall_title": "Khoảng thời gian",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "UID",
   "edt_dev_spec_universe_title": "Vũ trụ",
   "edt_dev_spec_useEntertainmentAPI_title": "Sử dụng API giải trí Huế",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "Sử dụng Hue Entertainment API V2 (Thêm hỗ trợ cho các dải ánh sáng chuyển sắc màu)",
   "edt_dev_spec_useOrbSmoothing_title": "Sử dụng làm mịn quả cầu",
   "edt_dev_spec_useRgbwProtocol_title": "Sử dụng giao thức RGBW",
   "edt_dev_spec_username_title": "tên tài khoản",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "Cololight Wizard",
   "wiz_guideyou": "$1 sẽ hướng dẫn bạn thông qua các cài đặt. Chỉ cần nhấn nút!",
   "wiz_hue_blinkblue": "Để ID $1 sáng lên màu xanh lam",
+  "wiz_hue_identify": "Nhận dạng",
   "wiz_hue_clientkey": "Mã khách hàng:",
   "wiz_hue_create_user": "Tạo người dùng mới",
   "wiz_hue_desc1": "Nó tự động tìm kiếm Hue-Bridge, trong trường hợp không thể tìm thấy, bạn cần cung cấp địa chỉ IP và nhấn nút tải lại ở bên phải. Bây giờ bạn cần một ID người dùng, nếu bạn không có ID, hãy tạo một ID mới.",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "Philips Hue Entertainment Wizard",
   "wiz_hue_e_use_group": "Sử dụng nhóm",
   "wiz_hue_e_use_groupid": "Sử dụng ID nhóm $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "Sử dụng ID cấu hình $1",
   "wiz_hue_failure_connection": "Hết giờ: Vui lòng nhấn nút cầu trong khoảng thời gian 30 giây",
   "wiz_hue_failure_ip": "Không tìm thấy Cầu nối, vui lòng nhập Địa chỉ IP hợp lệ",
   "wiz_hue_failure_user": "Không tìm thấy người dùng, hãy tạo mới bằng nút bên dưới hoặc nhập id người dùng hợp lệ và nhấn biểu tượng \"tải lại\".",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "Kiểm soát màu sắc phần cứng",
   "edt_conf_stream_hardware_hue_expl": "Đặt màu sắc phần cứng nếu thiết bị hỗ trợ nó, kiểm tra nhật ký (0 = đã tắt)",
   "edt_dev_spec_awa_mode_title": "Giao thức AWA nối tiếp tốc độ cao với tính năng kiểm tra tính toàn vẹn của dữ liệu (<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>)",
+  "led_editor_context_identify": "Nhận dạng",
   "conf_leds_layout_cl_lightPosBottomLeft14": "Dưới cùng: 0 - 25% từ Trái",
   "conf_leds_layout_cl_lightPosBottomLeft12": "Dưới cùng: 25 - 50% từ Trái",
   "conf_leds_layout_cl_lightPosBottomLeft34": "Dưới cùng: 50 - 75% từ Trái",
diff --git a/assets/webconfig/i18n/zh-CN.json b/assets/webconfig/i18n/zh-CN.json
index 9399d4c93..8e10d5992 100644
--- a/assets/webconfig/i18n/zh-CN.json
+++ b/assets/webconfig/i18n/zh-CN.json
@@ -472,6 +472,7 @@
   "edt_dev_spec_gpioMap_title": "GPIO 映射",
   "edt_dev_spec_gpioNumber_title": "GPIO编号",
   "edt_dev_spec_groupId_title": "组ID",
+  "edt_dev_spec_entertainmentConfigurationId_title": "娱乐配置 ID",
   "edt_dev_spec_header_title": "具体设置",
   "edt_dev_spec_interpolation_title": "插值",
   "edt_dev_spec_intervall_title": "间隔",
@@ -516,6 +517,7 @@
   "edt_dev_spec_uid_title": "用户标识",
   "edt_dev_spec_universe_title": "宇宙",
   "edt_dev_spec_useEntertainmentAPI_title": "使用 Hue 娱乐 API",
+  "edt_dev_spec_useEntertainmentAPIV2_title": "使用Hue Entertainment API V2（增加对色调渐变灯带的支持）",
   "edt_dev_spec_useOrbSmoothing_title": "使用球体平滑",
   "edt_dev_spec_useRgbwProtocol_title": "使用 RGBW 协议",
   "edt_dev_spec_username_title": "用户名",
@@ -886,6 +888,7 @@
   "wiz_cololight_title": "聚光灯精灵",
   "wiz_guideyou": "$1 将引导您完成设置。只需按下按钮！",
   "wiz_hue_blinkblue": "让 ID $1 亮蓝色",
+  "wiz_hue_identify": "确认",
   "wiz_hue_clientkey": "客户端密钥：",
   "wiz_hue_create_user": "创建新用户",
   "wiz_hue_desc1": "它会自动搜索 Hue-Bridge，以防它找不到您需要提供的 IP 地址并按下右侧的重新加载按钮。现在您需要一个用户 ID，如果您没有，请创建一个新用户 ID。",
@@ -903,6 +906,7 @@
   "wiz_hue_e_title": "飞利浦 Hue 娱乐向导",
   "wiz_hue_e_use_group": "使用组",
   "wiz_hue_e_use_groupid": "使用组 ID $1",
+  "wiz_hue_e_use_entertainmentconfigurationid": "使用配置 ID $1",
   "wiz_hue_failure_connection": "超时：请在 30 秒内按下桥接按钮",
   "wiz_hue_failure_ip": "未找到网桥，请输入有效的 IP 地址",
   "wiz_hue_failure_user": "未找到用户，使用下面的按钮创建一个新用户或输入有效的用户 ID 并按“重新加载”符号。",
@@ -970,6 +974,7 @@
   "edt_conf_stream_hardware_hue_title": "硬件色调控制",
   "edt_conf_stream_hardware_hue_expl": "如果设备支持，设置硬件色调，检查日志（0=禁用）",
   "edt_dev_spec_awa_mode_title": "具有数据完整性检查功能的高速串行 AWA 协议（<a href='https://github.com/awawa-dev/HyperHDR/wiki/HyperSerial' style='color:red'>info</a>）",
+  "led_editor_context_identify": "确认",
   "conf_leds_layout_cl_lightPosBottomLeft14": "底部：从左侧 0 - 25%",
   "conf_leds_layout_cl_lightPosBottomLeft12": "底部：从左侧开始 25 - 50%",
   "conf_leds_layout_cl_lightPosBottomLeft34": "底部：从左边开始 50 - 75%",
diff --git a/assets/webconfig/js/hyperhdr.js b/assets/webconfig/js/hyperhdr.js
index 7e0048b15..a8d7e8b47 100644
--- a/assets/webconfig/js/hyperhdr.js
+++ b/assets/webconfig/js/hyperhdr.js
@@ -576,9 +576,9 @@ async function requestLedDeviceProperties(type, params)
 	return sendAsyncToHyperhdr("leddevice", "getProperties", data, Math.floor(Math.random() * 1000));
 }
 
-async function tunnel_hue_get(_ip, _path)
+async function tunnel_hue_get(_ip, _path,header={})
 {
-	let data = { service: "hue", ip: _ip, path: _path, data: "" };
+	let data = { service: "hue", ip: _ip, path: _path, data: "",header };
 	let r = await sendAsyncToHyperhdr("tunnel", "get", data, Math.floor(Math.random() * 1000));
 	if (r["success"] != true || r["isTunnelOk"] != true)
 		return null;
diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index 3a68d1d2b..d8895fcea 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -835,17 +835,21 @@ $(document).ready(function()
 		
 		if (ledType == "philipshue")
 		{
-			$("input[name='root[specificOptions][useEntertainmentAPI]']").bind("change", function()
+			$("input[name='root[specificOptions][useEntertainmentAPI]'], input[name='root[specificOptions][useEntertainmentAPIV2]']").bind("change",function()
 			{
-				var ledWizardType = (this.checked) ? "philipshueentertainment" : ledType;
+				let useApiV1 = $("input[name='root[specificOptions][useEntertainmentAPI]']").is(':checked');
+				let useApiV2 = $("input[name='root[specificOptions][useEntertainmentAPIV2]']").is(':checked');
+
+				var ledWizardType = (useApiV1 || useApiV2) ? "philipshueentertainment" : ledType;
 				var data = {
-					type: ledWizardType
+					type: ledWizardType,
+					useApiV2
 				};
-				var hue_title = (this.checked) ? 'wiz_hue_e_title' : 'wiz_hue_title';
+				var hue_title = (useApiV1 || useApiV2) ? 'wiz_hue_e_title' : 'wiz_hue_title';
 				changeWizard(data, hue_title, startWizardPhilipsHue);
 								
 				createHintH('callout-warning', $.i18n('philips_option_changed_bri'), 'btn_wiz_holder');
-				
+
 			});
 			$("input[name='root[specificOptions][useEntertainmentAPI]']").trigger("change");
 		}
@@ -1155,6 +1159,12 @@ $(document).ready(function()
 
 					selectedObject = null;
 				}
+				else if (this.id == "CMD_IDENTIFY")
+				{
+					let params = { blinkIndex: parsedIndex };
+					requestLedDeviceIdentification("blink", params);
+					selectedObject = null;
+				}
 				else if (this.id == "CMD_DELETE")
 				{
 					finalLedArray[parsedIndex] = undefined;
diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js
index 55ed29c6a..3da393dd3 100644
--- a/assets/webconfig/js/wizard.js
+++ b/assets/webconfig/js/wizard.js
@@ -736,12 +736,19 @@ var lightIDs = null;
 var groupIDs = null;
 var lightLocation = [];
 var groupLights = [];
+// CHannels for v2 api
+var channels = {};
+var entertainmentResources = null;
+var deviceResources = null;
 var groupLightsLocations = [];
 var hueType = "philipshue";
+var useV2Api=false;
+var useV2ApiConfig=false;
 
 function startWizardPhilipsHue(e)
 {
 	if (typeof e.data.type != "undefined") hueType = e.data.type;
+	useV2ApiConfig=(e.data.useApiV2||false)&&(hueType == 'philipshueentertainment');
 
 	//create html
 
@@ -770,7 +777,7 @@ function startWizardPhilipsHue(e)
 	}
 	if (hueType == 'philipshueentertainment')
 	{
-		$('#usrcont').append('<label>' + $.i18n('wiz_hue_username') + '</label><div class="form-group input-group" style="width:250px"><input type="text" class="form-control" id="user"></div><label>' + $.i18n('wiz_hue_clientkey') + '</label><div class="input-group" style="width:250px"><input type="text" class="form-control" id="clientkey"><div class="input-group-append"><span class="input-group-text" id="retry_usr" style="height: 100%;display: inline-block;cursor:pointer"><i class="fa fa-refresh"></i></span></div></div><input type="hidden" id="groupId">');
+		$('#usrcont').append('<label>' + $.i18n('wiz_hue_username') + '</label><div class="form-group input-group" style="width:250px"><input type="text" class="form-control" id="user"></div><label>' + $.i18n('wiz_hue_clientkey') + '</label><div class="input-group" style="width:250px"><input type="text" class="form-control" id="clientkey"><div class="input-group-append"><span class="input-group-text" id="retry_usr" style="height: 100%;display: inline-block;cursor:pointer"><i class="fa fa-refresh"></i></span></div></div><input type="hidden" id="groupId"><input type="hidden" id="entertainmentConfigurationId">');
 	}
 	$('#usrcont').append('<span style="font-weight:bold;color:red" id="wiz_hue_usrstate"></span><br><button type="button" class="btn btn-primary" style="display:none" id="wiz_hue_create_user"> <i class="fa fa-fw fa-plus"></i>' + $.i18n(hue_create_user) + '</button>');
 	if (hueType == 'philipshueentertainment')
@@ -878,11 +885,13 @@ function checkHueBridge(cb, hueUser)
 			if (json != null)
 			{
 				if (json.config)
-				{					
+				{
+					useV2Api=parseInt(json.config.swversion)>1948086000&&useV2ApiConfig
 					cb(true, usr);
 				}
 				else if (json.name && json.bridgeid && json.modelid)
 				{
+					useV2Api=parseInt(json.swversion)>1948086000&&useV2ApiConfig
 					conf_editor.getEditor("root.specificOptions.output").setValue(hueIPs[hueIPsinc].internalipaddress);
 					$('#wiz_hue_discovered').html("Bridge: " + json.name + ", Modelid: " + json.modelid + ", API-Version: " + json.apiversion);
 					cb(true);
@@ -901,9 +910,36 @@ function checkHueBridge(cb, hueUser)
 
 function useGroupId(id)
 {
-	$('#groupId').val(id);
-	groupLights = groupIDs[id].lights;
-	groupLightsLocations = groupIDs[id].locations;
+	if(useV2Api){
+		$('#entertainmentConfigurationId').val(id);
+		channels={};
+		for (const channel of groupIDs[id].channels) {
+			groupLights.push(channel.channel_id+"")
+			// Fetch the device IDs for this channel (used for identify)
+			channels[channel.channel_id+""]=channel;
+			for (var member of channel.members) {
+				var service = member.service;
+				if (service.rtype == "entertainment") {
+					for (const entertainmentResource of entertainmentResources) {
+						if(service.rid==entertainmentResource.id){
+							if(entertainmentResource.owner?.rtype=="device"){
+								if(channels[channel.channel_id+""].deviceIds){
+									channels[channel.channel_id+""].deviceIds.push(entertainmentResource.owner?.rid)
+								}else{
+									channels[channel.channel_id+""].deviceIds=[entertainmentResource.owner?.rid]
+								}
+							}
+						}
+					}
+				}
+			}
+			groupLightsLocations[channel.channel_id+""] = [channel.position.x,channel.position.y,channel.position.z];
+		}
+	}else{
+		$('#groupId').val(id);
+		groupLights = groupIDs[id].lights;
+		groupLightsLocations = groupIDs[id].locations;
+	}
 	get_hue_lights();
 }
 
@@ -962,8 +998,23 @@ async function discover_hue_bridges()
 
 function identify_hue_device(hostAddress, username, id)
 {
-	let params = { host: hostAddress, user: username, lightId: id };
-	requestLedDeviceIdentification("philipshue", params);
+	if(useV2Api)
+	{
+		// 	flash the channel
+		let params = {
+			host: hostAddress,
+			clientkey: $('#clientkey').val()||conf_editor.getEditor("root.specificOptions.clientkey")?.getValue(),
+			user: username,
+			entertainmentConfigurationId: $('#entertainmentConfigurationId').val(),
+			channelId: id
+		};
+		requestLedDeviceIdentification("philipshuev2", params);
+	}
+	else
+	{
+		let params = { host: hostAddress, user: username, lightId: id };
+		requestLedDeviceIdentification("philipshue", params);
+	}
 }
 
 async function getProperties_hue_bridge(hostAddress, username, resourceFilter)
@@ -983,6 +1034,98 @@ async function getProperties_hue_bridge(hostAddress, username, resourceFilter)
 	}
 }
 
+function SaveHueConfig(saveLamps = true)
+{
+	var hueLedConfig = [];
+	var finalLightIds = [];
+
+	//create hue led config
+	for (var key in lightIDs)
+	{
+		if (hueType == 'philipshueentertainment')
+		{
+			if (groupLights.indexOf(key) == -1) continue;
+		}
+		if ($('#hue_' + key).val() != "disabled")
+		{
+			finalLightIds.push(key);
+			var idx_content = assignLightPos(key, $('#hue_' + key).val(), lightIDs[key].name);
+			hueLedConfig.push(JSON.parse(JSON.stringify(idx_content)));
+		}
+	}
+
+	var sc = window.serverConfig;
+
+	if (!saveLamps && Array.isArray(sc.leds) && sc.leds.length ==  hueLedConfig.length)
+	{
+		hueLedConfig = sc.leds;
+	}
+	
+	sc.leds = hueLedConfig;
+
+	//Adjust gamma, brightness and compensation
+	var c = sc.color.channelAdjustment[0];
+	c.gammaBlue = 1.0;
+	c.gammaRed = 1.0;
+	c.gammaGreen = 1.0;
+	c.brightness = 100;
+	c.brightnessCompensation = 0;
+
+	//device config
+
+	//Start with a clean configuration
+	var d = {};
+
+	d.output = $('#ip').val();
+	d.username = $('#user').val();
+	d.type = 'philipshue';
+	d.colorOrder = 'rgb';
+	d.lightIds = finalLightIds;
+	d.transitiontime = parseInt(eV("transitiontime", 1));
+	d.restoreOriginalState = (eV("restoreOriginalState", false) == true);
+	d.switchOffOnBlack = (eV("switchOffOnBlack", false) == true);
+
+	d.blackLevel = parseFloat(eV("blackLevel", 0.009));
+	d.onBlackTimeToPowerOff = parseInt(eV("onBlackTimeToPowerOff", 600));
+	d.onBlackTimeToPowerOn = parseInt(eV("onBlackTimeToPowerOn", 300));
+	d.brightnessFactor = parseFloat(eV("brightnessFactor", 1));
+
+	d.clientkey = $('#clientkey').val();
+	d.groupId = parseInt($('#groupId').val());
+	d.entertainmentConfigurationId = $('#entertainmentConfigurationId').val();
+	d.blackLightsTimeout = parseInt(eV("blackLightsTimeout", 5000));
+	d.brightnessMin = parseFloat(eV("brightnessMin", 0));
+	d.brightnessMax = parseFloat(eV("brightnessMax", 1));
+	d.brightnessThreshold = parseFloat(eV("brightnessThreshold", 0.0001));
+	d.handshakeTimeoutMin = parseInt(eV("handshakeTimeoutMin", 300));
+	d.handshakeTimeoutMax = parseInt(eV("handshakeTimeoutMax", 1000));
+	d.verbose = (eV("verbose") == true);
+
+	if (hueType == 'philipshue')
+	{
+		d.useEntertainmentAPI = false;
+		d.hardwareLedCount = finalLightIds.length;
+		d.refreshTime = 0;
+		d.verbose = false;
+		//smoothing off
+		sc.smoothing.enable = false;
+	}
+
+	if (hueType == 'philipshueentertainment')
+	{
+		d.useEntertainmentAPI = true;
+		// using 'useV2Api' instead of 'useV2ApiConfig' because it includes the bridge check for api v2
+		d.useEntertainmentAPIV2 = useV2Api;
+		d.hardwareLedCount = groupLights.length;
+		d.refreshTime = 20;
+		//smoothing on
+		sc.smoothing.enable = true;
+	}
+
+	window.serverConfig.device = d;
+	requestWriteConfig(sc, true);
+}
+
 //return editor Value
 function eV(vn, defaultVal = "")
 {
@@ -1058,86 +1201,7 @@ function beginWizardHue()
 
 	$('#btn_wiz_save').off().on("click", function ()
 	{
-		var hueLedConfig = [];
-		var finalLightIds = [];
-
-		//create hue led config
-		for (var key in lightIDs)
-		{
-			if (hueType == 'philipshueentertainment')
-			{
-				if (groupLights.indexOf(key) == -1) continue;
-			}
-			if ($('#hue_' + key).val() != "disabled")
-			{
-				finalLightIds.push(key);
-				var idx_content = assignLightPos(key, $('#hue_' + key).val(), lightIDs[key].name);
-				hueLedConfig.push(JSON.parse(JSON.stringify(idx_content)));
-			}
-		}
-
-		var sc = window.serverConfig;
-		sc.leds = hueLedConfig;
-
-		//Adjust gamma, brightness and compensation
-		var c = sc.color.channelAdjustment[0];
-		c.gammaBlue = 1.0;
-		c.gammaRed = 1.0;
-		c.gammaGreen = 1.0;
-		c.brightness = 100;
-		c.brightnessCompensation = 0;
-
-		//device config
-
-		//Start with a clean configuration
-		var d = {};
-
-		d.output = $('#ip').val();
-		d.username = $('#user').val();
-		d.type = 'philipshue';
-		d.colorOrder = 'rgb';
-		d.lightIds = finalLightIds;
-		d.transitiontime = parseInt(eV("transitiontime", 1));
-		d.restoreOriginalState = (eV("restoreOriginalState", false) == true);
-		d.switchOffOnBlack = (eV("switchOffOnBlack", false) == true);
-
-		d.blackLevel = parseFloat(eV("blackLevel", 0.009));
-		d.onBlackTimeToPowerOff = parseInt(eV("onBlackTimeToPowerOff", 600));
-		d.onBlackTimeToPowerOn = parseInt(eV("onBlackTimeToPowerOn", 300));
-		d.brightnessFactor = parseFloat(eV("brightnessFactor", 1));
-
-		d.clientkey = $('#clientkey').val();
-		d.groupId = parseInt($('#groupId').val());
-		d.blackLightsTimeout = parseInt(eV("blackLightsTimeout", 5000));
-		d.brightnessMin = parseFloat(eV("brightnessMin", 0));
-		d.brightnessMax = parseFloat(eV("brightnessMax", 1));
-		d.brightnessThreshold = parseFloat(eV("brightnessThreshold", 0.0001));
-		d.handshakeTimeoutMin = parseInt(eV("handshakeTimeoutMin", 300));
-		d.handshakeTimeoutMax = parseInt(eV("handshakeTimeoutMax", 1000));
-		d.verbose = (eV("verbose") == true);
-
-		if (hueType == 'philipshue')
-		{
-			d.useEntertainmentAPI = false;
-			d.hardwareLedCount = finalLightIds.length;
-			d.refreshTime = 0;
-			d.verbose = false;
-			//smoothing off
-			sc.smoothing.enable = false;
-		}
-
-		if (hueType == 'philipshueentertainment')
-		{
-			d.useEntertainmentAPI = true;
-			d.hardwareLedCount = groupLights.length;
-			d.refreshTime = 20;
-			//smoothing on
-			sc.smoothing.enable = true;
-		}
-
-		window.serverConfig.device = d;
-
-		requestWriteConfig(sc, true);
+		SaveHueConfig();		
 		resetWizard();
 	});
 
@@ -1216,38 +1280,77 @@ function createHueUser()
 
 function get_hue_groups()
 {
-	tunnel_hue_get($("#ip").val(), '/api/' + $("#user").val() + '/groups').then( (r) =>
-		{
-			if (r != null)
+	if(useV2Api){
+		// api v2 uses entertainment configurations not groups
+		tunnel_hue_get($("#ip").val(), '/clip/v2/resource/entertainment_configuration',{'hue-application-key':$("#user").val() }).then( (r) =>
 			{
-				if (Object.keys(r).length > 0)
+				if (r != null)
 				{
-					$('#wh_topcontainer').toggle(false);
-					$('#hue_grp_ids_t').toggle(true);
-
-					groupIDs = r;
-
-					var gC = 0;
-					for (var groupid in r)
+					// Also get all entertainment resources and devices. this will be used later to identify a channel
+					tunnel_hue_get($("#ip").val(), '/clip/v2/resource/entertainment',{'hue-application-key':$("#user").val() }).then(value => {
+						entertainmentResources=value?.data
+					})
+					tunnel_hue_get($("#ip").val(), '/clip/v2/resource/device',{'hue-application-key':$("#user").val() }).then(value => {
+						deviceResources=value?.data
+					})
+					if (r.data.length>0)
 					{
-						if (r[groupid].type == 'Entertainment')
-						{
-							$('.gidsb').append(createTableRowFlex([groupid + ' (' + r[groupid].name + ')', '<button class="btn btn-sm btn-primary" onClick=useGroupId(' + groupid + ')>' + $.i18n('wiz_hue_e_use_groupid', groupid) + '</button>']));
+						$('#wh_topcontainer').toggle(false);
+						$('#hue_grp_ids_t').toggle(true);
+
+						var gC = 0;
+						groupIDs={};
+						for (const group of r.data) {
+							groupIDs[group.id] = group;
+							$('.gidsb').append(createTableRowFlex([group.name + '<br> (' + group.id + ')', '<button class="btn btn-sm btn-primary" onClick=useGroupId("' + group.id + '")>' + $.i18n(useV2Api?'wiz_hue_e_use_entertainmentconfigurationid':'wiz_hue_e_use_groupid', group.id) + '</button>']));
 							gC++;
 						}
+						if (gC == 0)
+						{
+							noAPISupport('wiz_hue_e_noegrpids');
+						}
 					}
-					if (gC == 0)
+					else
 					{
-						noAPISupport('wiz_hue_e_noegrpids');
+						noAPISupport('wiz_hue_e_nogrpids');
 					}
 				}
-				else
+			}
+		)
+	}else{
+		tunnel_hue_get($("#ip").val(), '/api/' + $("#user").val() + '/groups').then( (r) =>
+			{
+				if (r != null)
 				{
-					noAPISupport('wiz_hue_e_nogrpids');
+					if (Object.keys(r).length > 0)
+					{
+						$('#wh_topcontainer').toggle(false);
+						$('#hue_grp_ids_t').toggle(true);
+
+						groupIDs = r;
+
+						var gC = 0;
+						for (var groupid in r)
+						{
+							if (r[groupid].type == 'Entertainment')
+							{
+								$('.gidsb').append(createTableRowFlex([groupid + ' (' + r[groupid].name + ')', '<button class="btn btn-sm btn-primary" onClick=useGroupId(' + groupid + ')>' + $.i18n('wiz_hue_e_use_groupid', groupid) + '</button>']));
+								gC++;
+							}
+						}
+						if (gC == 0)
+						{
+							noAPISupport('wiz_hue_e_noegrpids');
+						}
+					}
+					else
+					{
+						noAPISupport('wiz_hue_e_nogrpids');
+					}
 				}
 			}
-		}
-	)
+		)
+	}
 }
 
 function noAPISupport(txt)
@@ -1280,8 +1383,8 @@ function get_light_state(id)
 
 function get_hue_lights()
 {
-	tunnel_hue_get($("#ip").val(), '/api/' + $("#user").val() + '/lights').then( (r) =>
-		{		
+	(useV2Api?Promise.resolve(channels):tunnel_hue_get($("#ip").val(), '/api/' + $("#user").val() + '/lights')).then( (r) =>
+		{
 			if (r != null && Object.keys(r).length > 0)
 			{
 				if (hueType == 'philipshue')
@@ -1345,9 +1448,9 @@ function get_hue_lights()
 						if (pos == val) options += ' selected="selected"';
 						options += '>' + $.i18n(txt + val) + '</option>';
 					}
-					$('.lidsb').append(createTableRowFlex([lightid + ' (' + r[lightid].name + ')', '<select id="hue_' + lightid + '" class="hue_sel_watch form-select">'
-						+ options
-						+ '</select>', '<button class="btn btn-sm btn-primary" onClick=identify_hue_device("' + $("#ip").val() + '","' + $("#user").val() + '",' + lightid + ')>' + $.i18n('wiz_hue_blinkblue', lightid) + '</button>']));
+					$('.lidsb').append(createTableRowFlex([lightid + ' ( '+(useV2Api?`Channel ${lightid}`: r[lightid].name )+ ' )', '<select id="hue_' + lightid + '" class="hue_sel_watch form-select">'
+					+ options
+					+ '</select>', '<button class="btn btn-sm btn-primary" onClick=identify_hue_device("' + $("#ip").val() + '","' + $("#user").val() + '",' + lightid + ')>' + $.i18n(useV2Api?'wiz_hue_identify':'wiz_hue_blinkblue', lightid) + '</button>']));
 				}
 
 				if (hueType != 'philipshueentertainment')
@@ -1368,6 +1471,11 @@ function get_hue_lights()
 					});
 				}
 				$('.hue_sel_watch').trigger('change');
+
+				if (useV2Api)
+				{
+					SaveHueConfig(false);
+				}
 			}
 			else
 			{
diff --git a/include/base/HyperHdrInstance.h b/include/base/HyperHdrInstance.h
index 4f9e2ea5c..b5e16221a 100644
--- a/include/base/HyperHdrInstance.h
+++ b/include/base/HyperHdrInstance.h
@@ -109,6 +109,8 @@ class HyperHdrInstance : public QObject
 
 public slots:
 
+	void identifyLed(const QJsonObject& params);
+
 	bool getReadOnlyMode() { return _readOnlyMode; };
 
 	void saveCalibration(QString saveData);
diff --git a/include/leddevice/LedDevice.h b/include/leddevice/LedDevice.h
index cfe612f8a..33b2dad22 100644
--- a/include/leddevice/LedDevice.h
+++ b/include/leddevice/LedDevice.h
@@ -110,6 +110,8 @@ class LedDevice : public QObject
 	///
 	virtual void identify(const QJsonObject& /*params*/) {}
 
+	virtual void identifyLed(const QJsonObject& /*params*/);
+
 	///
 	/// @brief Check, if device is properly initialised
 	///
@@ -430,6 +432,8 @@ protected slots:
 		qint64		incomingframes = 0;
 		qint64		droppedFrames = 0;
 	} _computeStats;
+
+	int _blinkIndex;
 };
 
 #endif // LEDEVICE_H
diff --git a/include/leddevice/LedDeviceWrapper.h b/include/leddevice/LedDeviceWrapper.h
index 9bb551bc2..a5d4c692a 100644
--- a/include/leddevice/LedDeviceWrapper.h
+++ b/include/leddevice/LedDeviceWrapper.h
@@ -61,6 +61,8 @@ class LedDeviceWrapper : public QObject
 	///
 	unsigned int getLedCount() const;
 
+	void identifyLed(const QJsonObject& params);
+
 public slots:
 	///
 	/// @brief Handle new component state request
diff --git a/sources/api/JSONRPC_schema/schema-tunnel.json b/sources/api/JSONRPC_schema/schema-tunnel.json
index a48531bf9..78560e77c 100644
--- a/sources/api/JSONRPC_schema/schema-tunnel.json
+++ b/sources/api/JSONRPC_schema/schema-tunnel.json
@@ -31,6 +31,9 @@
 		"data": {
 			"type" : "string",
 			"required" : true
+		},
+		"header": {
+			"type" : "object"
 		}
 	},
 	"additionalProperties": false
diff --git a/sources/api/JsonAPI.cpp b/sources/api/JsonAPI.cpp
index c86bd16c4..6f452e528 100644
--- a/sources/api/JsonAPI.cpp
+++ b/sources/api/JsonAPI.cpp
@@ -1667,9 +1667,19 @@ void JsonAPI::handleLedDeviceCommand(const QJsonObject& message, const QString&
 		}
 		else if (subc == "identify")
 		{
-			ledDevice = LedDeviceFactory::construct(config);
 			const QJsonObject& params = message["params"].toObject();
-			ledDevice->identify(params);
+
+			if (devType == "philipshuev2" || devType == "blink")
+			{
+				QMetaObject::invokeMethod(_hyperhdr, [=]() {
+					_hyperhdr->identifyLed(params);
+					});
+			}
+			else
+			{
+				auto ledDevice = LedDeviceFactory::construct(config);
+				ledDevice->identify(params);
+			}
 
 			sendSuccessReply(full_command, tan);
 		}
@@ -1897,14 +1907,16 @@ void JsonAPI::handleTunnel(const QJsonObject& message, const QString& command, i
 
 		if (service == "hue")
 		{
-			if (path.indexOf("/api") != 0 || ip.indexOf("/") >= 0)
+			QUrl tempUrl("http://"+ip);
+			if ((path.indexOf("/clip/v2") != 0 && path.indexOf("/api") != 0) || ip.indexOf("/") >= 0)
 			{
 				sendErrorReply("Invalid path", full_command, tan);
 				return;
 			}
 			
 			ProviderRestApi provider;
-			QUrl url = QUrl("http://"+ip+path);
+
+			QUrl url = QUrl((path.startsWith("/clip/v2")?"https://":"http://")+tempUrl.host()+path);
 
 			Debug(_log, "Tunnel request for: %s", QSTRING_CSTR(url.toString()));
 
@@ -1920,8 +1932,17 @@ void JsonAPI::handleTunnel(const QJsonObject& message, const QString& command, i
 				sendErrorReply("The Philips Hue wizard supports only valid IP addresses in the LOCAL network.\nIt may be preferable to use the IP4 address instead of the host name if you are having problems with DNS resolution.", full_command, tan);
 				return;
 			}
-
 			httpResponse result;
+			const QJsonObject& headerObject = message["header"].toObject();
+
+			if (!headerObject.isEmpty())
+			{
+				for (const auto& item : headerObject.keys())
+				{
+					provider.addHeader(item, headerObject[item].toString());
+				}
+			}
+
 			if (subcommand == "put")
 				result = provider.put(url, data);
 			else if (subcommand == "post")
diff --git a/sources/base/HyperHdrInstance.cpp b/sources/base/HyperHdrInstance.cpp
index f4e1261d1..00c8188a3 100644
--- a/sources/base/HyperHdrInstance.cpp
+++ b/sources/base/HyperHdrInstance.cpp
@@ -21,6 +21,7 @@
 
 // LedDevice includes
 #include <leddevice/LedDeviceWrapper.h>
+#include <leddevice/LedDeviceFactory.h>
 
 #include <base/MultiColorAdjustment.h>
 #include <base/LinearSmoothing.h>
@@ -765,3 +766,8 @@ QString HyperHdrInstance::deleteEffect(const QString& effectName)
 }
 
 
+void HyperHdrInstance::identifyLed(const QJsonObject& params)
+{
+	_ledDeviceWrapper->handleComponentState(hyperhdr::Components::COMP_LEDDEVICE, true);
+	_ledDeviceWrapper->identifyLed(params);
+}
diff --git a/sources/base/schema/schema-color.json b/sources/base/schema/schema-color.json
index 65bd10b64..b938be598 100644
--- a/sources/base/schema/schema-color.json
+++ b/sources/base/schema/schema-color.json
@@ -13,7 +13,7 @@
 			"options" : {
 				"enum_titles" : ["edt_conf_enum_multicolor_mean", "edt_conf_enum_unicolor_mean", "edt_conf_enum_unicolor_advanced", "edt_conf_enum_unicolor_weighted"]
 			},
-			"default"  : "multicolor_mean",
+			"default"  : "advanced",
 			"propertyOrder" : 1
 		},
 		"sparse_processing" :
diff --git a/sources/leddevice/LedDevice.cpp b/sources/leddevice/LedDevice.cpp
index 6ec62b3c2..cc3c1191c 100644
--- a/sources/leddevice/LedDevice.cpp
+++ b/sources/leddevice/LedDevice.cpp
@@ -33,6 +33,7 @@ LedDevice::LedDevice(const QJsonObject& deviceConfig, QObject* parent)
 	, _isRefreshEnabled(false)
 	, _newFrame2Send(false)
 	, _newFrame2SendTime(0)
+	, _blinkIndex(-1)
 {
 	_activeDeviceType = deviceConfig["type"].toString("UNSPECIFIED").toLower();
 
@@ -131,6 +132,7 @@ void LedDevice::enableDevice(bool toEmit)
 	}
 
 	_newFrame2Send = false;
+	_blinkIndex = -1;
 }
 
 void LedDevice::disable()
@@ -156,6 +158,7 @@ void LedDevice::disableDevice(bool toEmit)
 	}
 
 	_newFrame2Send = false;
+	_blinkIndex = -1;
 }
 
 void LedDevice::setActiveDeviceType(const QString& deviceType)
@@ -274,7 +277,8 @@ int LedDevice::updateLeds(std::vector<ColorRgb> ledValues)
 	}
 	else
 	{
-		_lastLedValues = ledValues;
+		if (_blinkIndex < 0)
+			_lastLedValues = ledValues;
 
 		if (!_isRefreshEnabled && (!_newFrame2Send || now - _newFrame2SendTime > 1000 || now < _newFrame2SendTime))
 		{
@@ -537,4 +541,41 @@ bool LedDevice::componentState() const {
 	return _isEnabled;
 }
 
+void LedDevice::identifyLed(const QJsonObject& params)
+{
+	_blinkIndex = params["blinkIndex"].toInt(-1);
+
+	if (_blinkIndex < 0 || _blinkIndex >= _lastLedValues.size())
+	{
+		_blinkIndex = -1;
+	}
+	else
+	{
+		const int blinkOrg = _blinkIndex;
+
+		for (auto iter = _lastLedValues.begin(); iter != _lastLedValues.end(); ++iter)
+		{
+			*iter = ColorRgb::BLACK;
+		}
+
+		for (int i = 0; i < 6; i++)
+		{
+			ColorRgb color = (i % 3 == 0) ? ColorRgb::RED : (i % 3 == 1) ? ColorRgb::GREEN : ColorRgb::BLUE;
+
+			QTimer::singleShot(800 * i, this, [this, color, blinkOrg]() {
+				if (_blinkIndex == blinkOrg && _blinkIndex >= 0 && _blinkIndex < _lastLedValues.size())
+				{
+					_lastLedValues[_blinkIndex] = color;
+					rewriteLEDs();
+				}
+			});
+		}
+
+		// disable blinking after the sequence
+		QTimer::singleShot(4800, this, [this, blinkOrg]() {
+			if (_blinkIndex == blinkOrg) _blinkIndex = -1;
+		});
+	}
+}
+
 
diff --git a/sources/leddevice/LedDeviceWrapper.cpp b/sources/leddevice/LedDeviceWrapper.cpp
index 28b264531..84ee58726 100644
--- a/sources/leddevice/LedDeviceWrapper.cpp
+++ b/sources/leddevice/LedDeviceWrapper.cpp
@@ -187,3 +187,13 @@ QJsonObject LedDeviceWrapper::getLedDeviceSchemas()
 
 	return result;
 }
+
+void LedDeviceWrapper::identifyLed(const QJsonObject& params)
+{	
+	QMetaObject::invokeMethod(_ledDevice, [=]() {
+		if (params["blinkIndex"].toInt(-1) != -1)
+			_ledDevice->identifyLed(params);
+		else
+			_ledDevice->identify(params);
+	});
+}
diff --git a/sources/leddevice/dev_net/LedDevicePhilipsHue.cpp b/sources/leddevice/dev_net/LedDevicePhilipsHue.cpp
index 83f219e4b..fa5964d7a 100644
--- a/sources/leddevice/dev_net/LedDevicePhilipsHue.cpp
+++ b/sources/leddevice/dev_net/LedDevicePhilipsHue.cpp
@@ -10,6 +10,10 @@
 #include <chrono>
 #include <cmath>
 
+#define RESERVED 0x00
+#define VERSION_MINOR 0x00
+#define COLORSPACE_XYBRI 0x01
+
 // Constants
 namespace {
 
@@ -93,6 +97,17 @@ namespace {
 	constexpr std::chrono::milliseconds STREAM_REFRESH_TIME{ 20 };
 	const int SSL_CIPHERSUITES[2] = { MBEDTLS_TLS_PSK_WITH_AES_128_GCM_SHA256, 0 };
 
+	// V2
+	const char CONFIG_ENTERTAINMENT_CONFIGURATION_ID[] = "entertainmentConfigurationId";
+	const int API_DEFAULT_PORT_V2 = 443;
+	const char API_CHANNELS_V2[] = "channels";
+	const char API_GROUPS_V2[] = "entertainment_configuration";
+	const char API_BASE_PATH_V2[] = "/clip/v2/resource";
+	const char API_HEADER_KEY_V2[] = "hue-application-key";
+	const char API_HEADER_ID_V2[] = "hue-application-id";
+	const char API_LIGHT_V2[] = "light";
+	const char API_STREAM_OWNER_V2[] = "rid";
+
 } //End of constants
 
 bool operator ==(const CiColor& p1, const CiColor& p2)
@@ -250,6 +265,7 @@ LedDevicePhilipsHueBridge::LedDevicePhilipsHueBridge(const QJsonObject& deviceCo
 	, _api_minor(0)
 	, _api_patch(0)
 	, _isHueEntertainmentReady(false)
+	, _apiV2(false)
 {
 }
 
@@ -261,8 +277,6 @@ LedDevicePhilipsHueBridge::~LedDevicePhilipsHueBridge()
 
 bool LedDevicePhilipsHueBridge::init(const QJsonObject& deviceConfig)
 {
-	_useHueEntertainmentAPI = deviceConfig[CONFIG_USE_HUE_ENTERTAINMENT_API].toBool(false);	
-
 	// Overwrite non supported/required features
 	if (deviceConfig["refreshTime"].toInt(0) > 0)
 	{
@@ -328,12 +342,21 @@ bool LedDevicePhilipsHueBridge::init(const QJsonObject& deviceConfig)
 
 bool LedDevicePhilipsHueBridge::initRestAPI(const QString& hostname, int port, const QString& token)
 {
+	if (_apiV2)
+		port = API_DEFAULT_PORT_V2;
+
 	if (_restApi == nullptr)
 		_restApi = new ProviderRestApi(hostname, port);
 	else
 		_restApi->updateHost(hostname, port);
 
-	_restApi->setBasePath(QString(API_BASE_PATH).arg(token));
+	if (_apiV2)
+	{
+		_restApi->setBasePath(QString(API_BASE_PATH_V2) + "/");
+		_restApi->addHeader(API_HEADER_KEY_V2, token);
+	}
+	else
+		_restApi->setBasePath(QString(API_BASE_PATH).arg(token));
 
 	return true;
 }
@@ -401,13 +424,15 @@ void LedDevicePhilipsHueBridge::log(const char* msg, const char* type, ...) cons
 
 QJsonDocument LedDevicePhilipsHueBridge::getAllBridgeInfos()
 {
-	return get(API_ROOT);
+	if (_apiV2)
+		return get(API_BASE_PATH_V2);
+	else
+		return get(API_ROOT);
 }
 
 bool LedDevicePhilipsHueBridge::initMaps()
 {
 	bool isInitOK = true;
-
 	QJsonDocument doc = getAllBridgeInfos();
 
 	DebugIf(verbose, _log, "doc: [%s]", QString(QJsonDocument(doc).toJson(QJsonDocument::Compact)).toUtf8().constData());
@@ -415,6 +440,23 @@ bool LedDevicePhilipsHueBridge::initMaps()
 	if (doc.isEmpty())
 		setInError("Could not read the bridge details");
 
+	if (_apiV2)
+	{
+		if (this->isInError())
+		{
+			isInitOK = false;
+		}
+		else
+		{
+			setApplicationIdV2();
+			setBridgeConfig(get("/api/config"));
+			setGroupMapV2(doc);
+			setLightsMapV2(doc);
+		}
+
+		return isInitOK;
+	}
+
 	if (this->isInError())
 	{
 		isInitOK = false;
@@ -434,7 +476,7 @@ bool LedDevicePhilipsHueBridge::initMaps()
 
 void LedDevicePhilipsHueBridge::setBridgeConfig(const QJsonDocument& doc)
 {
-	QJsonObject jsonConfigInfo = doc.object()[API_CONFIG].toObject();
+	QJsonObject jsonConfigInfo = (isApiV2()) ? doc.object() : doc.object()[API_CONFIG].toObject();
 	if (verbose)
 	{
 		std::cout << "jsonConfigInfo: [" << QString(QJsonDocument(jsonConfigInfo).toJson(QJsonDocument::Compact)).toUtf8().constData() << "]" << std::endl;
@@ -605,7 +647,7 @@ QJsonDocument LedDevicePhilipsHueBridge::get(const QString& route)
 
 	_restApi->setPath(route);
 
-	httpResponse response = _restApi->get();		
+	httpResponse response = _restApi->get();
 
 	checkApiError(response.getBody());
 	return response.getBody();
@@ -622,7 +664,189 @@ QJsonDocument LedDevicePhilipsHueBridge::post(const QString& route, const QStrin
 
 bool LedDevicePhilipsHueBridge::isStreamOwner(const QString& streamOwner) const
 {
-	return (streamOwner != "" && streamOwner == _username);
+	if (_apiV2)
+		return (streamOwner != "" && streamOwner == _hueApplicationId);
+	else
+		return (streamOwner != "" && streamOwner == _username);
+}
+
+void LedDevicePhilipsHueBridge::setLightsMapV2(const QJsonDocument& doc)
+{
+	QJsonArray jsonLightsInfo;
+	_lightsMapV2.clear();
+	for (const auto& item : doc.object()["data"].toArray())
+	{
+		if (item.toObject()["type"] == API_LIGHT_V2)
+		{
+			jsonLightsInfo.append(item.toObject());
+			_lightsMapV2.insert(item.toObject()["id_v1"].toString(), item.toObject());
+		}
+	};
+	DebugIf(verbose, _log, "jsonLightsInfo: [%s]",
+		QString(QJsonDocument(jsonLightsInfo).toJson(QJsonDocument::Compact)).toUtf8().constData());
+
+	_ledCount = static_cast<uint>(_lightsMapV2.size());
+
+
+	if (getLedCount() == 0)
+	{
+		this->setInError("No light-IDs found at the Philips Hue Bridge");
+	}
+	else
+	{
+		log("Lights in Bridge found", "%d", getLedCount());
+	}
+}
+
+void LedDevicePhilipsHueBridge::setGroupMapV2(const QJsonDocument& doc)
+{
+	QJsonArray jsonGroupsInfo;
+	_groupsMapV2.clear();
+	for (const auto& item : doc.object()["data"].toArray())
+	{
+		if (item.toObject()["type"] == "entertainment_configuration")
+		{
+			jsonGroupsInfo.append(item.toObject());
+			_groupsMapV2.insert(item.toObject()["id"].toString(), item.toObject());
+		}
+	};
+
+	DebugIf(verbose, _log, "jsonGroupsInfo: [%s]",
+		QString(QJsonDocument(jsonGroupsInfo).toJson(QJsonDocument::Compact)).toUtf8().constData());
+}
+
+QMap<QString, QJsonObject> LedDevicePhilipsHueBridge::getGroupMapV2() const
+{
+	return _groupsMapV2;
+}
+
+QString LedDevicePhilipsHueBridge::getGroupNameV2(QString groupId) const
+{
+	QString groupName;
+	if (_groupsMapV2.contains(groupId))
+	{
+		QJsonObject group = _groupsMapV2.value(groupId);
+		groupName = group.value(API_GROUP_NAME).toString().trimmed().replace("\"", "");
+	}
+	else
+	{
+		Error(_log, "Group ID %s doesn't exists on this bridge", QSTRING_CSTR(groupId));
+	}
+	return groupName;
+}
+
+QJsonArray LedDevicePhilipsHueBridge::getGroupChannelsV2(QString groupId) const
+{
+	QJsonArray groupLights;
+	// search user groupid inside _groupsMap and create light if found
+	if (_groupsMapV2.contains(groupId))
+	{
+		QJsonObject group = _groupsMapV2.value(groupId);
+		QString groupName = getGroupNameV2(groupId);
+		groupLights = group.value(API_CHANNELS_V2).toArray();
+
+		log("Entertainment Group found", "[%s] %s", QSTRING_CSTR(groupId), QSTRING_CSTR(groupName));
+		log("Channels in Group", "%d", groupLights.size());
+		Info(_log, "Entertainment Group [%s] \"%s\" with %d channels found", QSTRING_CSTR(groupId),
+			QSTRING_CSTR(groupName),
+			groupLights.size());
+	}
+	else
+	{
+		Error(_log, "Group ID %d doesn't exists on this bridge", QSTRING_CSTR(groupId));
+	}
+
+	return groupLights;
+}
+
+
+QJsonDocument LedDevicePhilipsHueBridge::getLightStateV2(QString lightId)
+{
+	DebugIf(verbose, _log, "GetLightState [%s]", QSTRING_CSTR(lightId));
+	return get(QString("%1/%2").arg(API_LIGHT_V2).arg(lightId));
+}
+
+void LedDevicePhilipsHueBridge::setLightStateV2(QString lightId, const QString& state)
+{
+	DebugIf(verbose, _log, "SetLightState [%s]: %s", QSTRING_CSTR(lightId), QSTRING_CSTR(state));
+	post(QString("%1/%2").arg(API_LIGHT_V2).arg(lightId), state);
+}
+
+QJsonDocument LedDevicePhilipsHueBridge::getGroupStateV2(QString groupId)
+{
+	DebugIf(verbose, _log, "GetGroupState [%s]", QSTRING_CSTR(groupId));
+	return get(QString("%1/%2").arg(API_GROUPS_V2).arg(groupId));
+}
+
+QJsonDocument LedDevicePhilipsHueBridge::setGroupStateV2(QString groupId, bool state)
+{
+	return post(QString("%1/%2").arg(API_GROUPS_V2).arg(groupId),
+		QString(R"({"action":"%1"})").arg(state ? "start" : "stop"), true);
+}
+
+void LedDevicePhilipsHueBridge::setApplicationIdV2()
+{
+	httpResponse res = getRaw(QString("/auth/v1"));
+	_hueApplicationId = res.getHeaders().value(API_HEADER_ID_V2);
+	Debug(_log, "Application ID is %s", QSTRING_CSTR(_hueApplicationId));
+}
+
+httpResponse LedDevicePhilipsHueBridge::getRaw(const QString& route)
+{
+	if (_restApi == nullptr)
+		return httpResponse();
+
+	_restApi->setPath(route);
+
+	httpResponse response = _restApi->get();
+	return response;
+}
+
+QMap<QString, QJsonObject>& LedDevicePhilipsHueBridge::getLightStateMapV2()
+{
+	return _lightStateMapV2;
+}
+
+QStringList LedDevicePhilipsHueBridge::getLightIdsInChannelV2(QJsonObject channel)
+{
+	QStringList lightIDS;
+	for (const auto& item : channel["members"].toArray())
+	{
+		QJsonObject service = item.toObject()["service"].toObject();
+		if (service["rtype"].toString() == "entertainment")
+		{
+			QJsonDocument jsonDocument = get(QString("%1/%2").arg("entertainment", service["rid"].toString()));
+			QJsonObject entertainment = jsonDocument.object()["data"].toArray().first().toObject();
+			QString ownerType = entertainment["owner"].toObject()["rtype"].toString();
+			if (ownerType == "device")
+			{
+				QJsonDocument deviceDocument = get(
+					QString("%1/%2").arg("device", entertainment["owner"].toObject()["rid"].toString()));
+				QJsonObject device = deviceDocument.object()["data"].toArray().first().toObject();
+				for (const auto& item : device["services"].toArray())
+				{
+					if (item.toObject()["rtype"].toString() == "light")
+					{
+						const QString& lightId = item.toObject()["rid"].toString();
+						lightIDS.append(lightId);
+						_lightStateMapV2.insert(lightId, QJsonObject());
+					}
+				}
+			}
+		}
+	}
+	return lightIDS;
+}
+
+
+bool LedDevicePhilipsHueBridge::isApiV2()
+{
+	return _apiV2;
+}
+
+void LedDevicePhilipsHueBridge::setApiV2(bool version2)
+{
+	_apiV2 = version2;
 }
 
 const std::set<QString> PhilipsHueLight::GAMUT_A_MODEL_IDS =
@@ -688,6 +912,25 @@ PhilipsHueLight::PhilipsHueLight(Logger* log, unsigned int id, QJsonObject value
 	Info(_log, "Light ID %d (\"%s\", LED index \"%d\", onBlackTimeToPowerOff: %d, _onBlackTimeToPowerOn: %d) created", id, QSTRING_CSTR(_lightname), ledidx, _onBlackTimeToPowerOff, _onBlackTimeToPowerOn);
 }
 
+PhilipsHueLight::PhilipsHueLight(Logger* log, unsigned int id, QJsonObject values, QStringList lightIds,
+	unsigned int ledidx)
+	: _log(log), _id(id), _ledidx(ledidx), _on(false), _transitionTime(0), _color({ 0.0, 0.0, 0.0 }),
+	_hasColor(false),
+	_colorBlack({ 0.0, 0.0, 0.0 }), _modelId(""),
+	_lastSendColor(0), _lastBlack(-1), _lastWhite(-1),
+	_lightIds(std::move(lightIds))
+{
+
+	_colorSpace.red = { 1.0, 0.0 };
+	_colorSpace.green = { 0.0, 1.0 };
+	_colorSpace.blue = { 0.0, 0.0 };
+	_colorBlack = { 0.0, 0.0, 0.0 };
+
+	_lightname = values["name"].toString().trimmed().replace("\"", "");
+	Info(_log, "Channel ID %d (\"%s\", LED index \"%d\") created",
+		id, QSTRING_CSTR(_lightname), ledidx);
+}
+
 void PhilipsHueLight::blackScreenTriggered()
 {
 	_blackScreenTriggered = true;
@@ -860,6 +1103,21 @@ CiColorTriangle PhilipsHueLight::getColorSpace() const
 	return _colorSpace;
 }
 
+ColorRgb PhilipsHueLight::getRGBColor() const
+{
+	return _colorRgb;
+}
+
+void PhilipsHueLight::setRGBColor(const ColorRgb color)
+{
+	_colorRgb = color;
+}
+
+QStringList PhilipsHueLight::getLightIds() const
+{
+	return _lightIds;
+}
+
 LedDevicePhilipsHue::LedDevicePhilipsHue(const QJsonObject& deviceConfig)
 	: LedDevicePhilipsHueBridge(deviceConfig)
 	, _switchOffOnBlack(false)
@@ -879,7 +1137,7 @@ LedDevicePhilipsHue::LedDevicePhilipsHue(const QJsonObject& deviceConfig)
 	, _lastConfirm(0)
 	, _lastId(-1)
 	, _groupStreamState(false)
-{	
+{
 }
 
 LedDevice* LedDevicePhilipsHue::construct(const QJsonObject& deviceConfig)
@@ -895,6 +1153,61 @@ bool LedDevicePhilipsHue::setLights()
 {
 	bool isInitOK = true;
 
+	if (isApiV2())
+	{
+		QJsonArray lArray;
+
+		if (_useHueEntertainmentAPI && !_entertainmentConfigurationId.isEmpty())
+		{
+			lArray = getGroupChannelsV2(_entertainmentConfigurationId);
+		}
+
+		if (lArray.empty())
+		{
+			if (_useHueEntertainmentAPI)
+			{
+				_useHueEntertainmentAPI = false;
+				Error(_log, "Group-ID [%s] is not usable - Entertainment API usage was disabled!", QSTRING_CSTR(_entertainmentConfigurationId));
+			}
+		}
+
+		QString lightIDStr;
+		_lights.clear();
+		if (!lArray.empty())
+		{
+			unsigned int ledidx = 0;
+			for (const QJsonValueRef channel : lArray)
+			{
+				_lights.emplace_back(_log, channel.toObject()["channel_id"].toInt(), channel.toObject(),
+					getLightIdsInChannelV2(channel.toObject()), ledidx);
+				ledidx++;
+				if (!lightIDStr.isEmpty())
+				{
+					lightIDStr.append(", ");
+				}
+				lightIDStr.append(QString::number(channel.toObject()["channel_id"].toInt()));
+			}
+		}
+
+		unsigned int configuredLightsCount = static_cast<unsigned int>(_lights.size());
+		_lightsCount = configuredLightsCount;
+
+		log("Light-IDs configured", "%d", configuredLightsCount);
+
+		if (configuredLightsCount == 0)
+		{
+			this->setInError("No light-IDs configured");
+			Error(_log, "No usable lights found!");
+			isInitOK = false;
+		}
+		else
+		{
+			log("Light-IDs", "%s", QSTRING_CSTR(lightIDStr));
+		}
+
+		return isInitOK;
+	}
+
 	_lightIds.clear();
 
 	QJsonArray lArray;
@@ -956,7 +1269,7 @@ bool LedDevicePhilipsHue::setLights()
 }
 
 
-bool LedDevicePhilipsHue::initLeds()
+bool LedDevicePhilipsHue::initLeds(QString groupName)
 {
 	bool isInitOK = false;
 
@@ -966,7 +1279,7 @@ bool LedDevicePhilipsHue::initLeds()
 		{
 			if (_useHueEntertainmentAPI)
 			{
-				_groupName = getGroupName(_groupId);
+				_groupName = groupName;
 				_devConfig["host"] = _hostname;
 				_devConfig["sslport"] = API_SSL_SERVER_PORT;
 				_devConfig["servername"] = API_SSL_SERVER_NAME;
@@ -1011,6 +1324,8 @@ bool LedDevicePhilipsHue::init(const QJsonObject& deviceConfig)
 	_brightnessFactor = _devConfig[CONFIG_BRIGHTNESSFACTOR].toDouble(1.0);
 	_transitionTime = _devConfig[CONFIG_TRANSITIONTIME].toInt(1);
 	_isRestoreOrigState = _devConfig[CONFIG_RESTORE_STATE].toBool(true);
+	_useHueEntertainmentAPI = deviceConfig[CONFIG_USE_HUE_ENTERTAINMENT_API].toBool(false);
+	_entertainmentConfigurationId = _devConfig[CONFIG_ENTERTAINMENT_CONFIGURATION_ID].toString("");
 	_groupId = static_cast<quint16>(_devConfig[CONFIG_GROUPID].toInt(0));
 	_blackLevel = _devConfig["blackLevel"].toDouble(0.0);
 	_onBlackTimeToPowerOff = _devConfig["onBlackTimeToPowerOff"].toInt(100);
@@ -1019,6 +1334,7 @@ bool LedDevicePhilipsHue::init(const QJsonObject& deviceConfig)
 	_handshake_timeout_min = _devConfig["handshakeTimeoutMin"].toInt(300);
 	_handshake_timeout_max = _devConfig["handshakeTimeoutMax"].toInt(1000);
 	_maxRetry = _devConfig["maxRetry"].toInt(60);
+	setApiV2(_devConfig["useEntertainmentAPIV2"].toBool(false));
 
 	if (_blackLevel < 0.0) { _blackLevel = 0.0; }
 	if (_blackLevel > 1.0) { _blackLevel = 1.0; }
@@ -1029,6 +1345,7 @@ bool LedDevicePhilipsHue::init(const QJsonObject& deviceConfig)
 	log("Transition Time", "%d", _transitionTime);
 	log("Restore Original State", "%d", static_cast<int>(_isRestoreOrigState));
 	log("Use Hue Entertainment API", "%d", static_cast<int>(_useHueEntertainmentAPI));
+	log("Use Hue Entertainment API V2", "%d", static_cast<int>(isApiV2()));
 	log("Brightness Threshold", "%f", _blackLevel);
 	log("CandyGamma", "%d", static_cast<int>(_candyGamma));
 	log("Time to power off the lamp on black", "%d", _onBlackTimeToPowerOff);
@@ -1036,22 +1353,41 @@ bool LedDevicePhilipsHue::init(const QJsonObject& deviceConfig)
 	log("SSL Handshake min", "%d", _handshake_timeout_min);
 	log("SSL Handshake max", "%d", _handshake_timeout_max);
 
+	_useHueEntertainmentAPI = _useHueEntertainmentAPI || isApiV2();
+
 	if (_useHueEntertainmentAPI)
 	{
-		log("Entertainment API Group-ID", "%d", _groupId);
+		if (isApiV2())
+		{
+			log("Entertainment API Group-ID", "%s", QSTRING_CSTR(_entertainmentConfigurationId));
 
-		if (_groupId == 0)
+			if (_entertainmentConfigurationId.isEmpty())
+			{
+				Error(_log, "Disabling usage of HueEntertainmentAPI: Group-ID is invalid", "%s", QSTRING_CSTR(_entertainmentConfigurationId));
+				_useHueEntertainmentAPI = false;
+			}
+		}
+		else
 		{
-			Error(_log, "Disabling usage of HueEntertainmentAPI: Group-ID is invalid", "%d", _groupId);
-			_useHueEntertainmentAPI = false;
+			log("Entertainment API Group-ID", "%d", _groupId);
+
+			if (_groupId == 0)
+			{
+				Error(_log, "Disabling usage of HueEntertainmentAPI: Group-ID is invalid", "%d", _groupId);
+				_useHueEntertainmentAPI = false;
+			}
 		}
 	}
 
 	bool isInitOK = LedDevicePhilipsHueBridge::init(deviceConfig);
 
 	if (isInitOK)
-		isInitOK = initLeds();
-
+	{
+		if (isApiV2())
+			isInitOK = initLeds(getGroupNameV2(_entertainmentConfigurationId));
+		else
+			isInitOK = initLeds(getGroupName(_groupId));
+	}
 
 	return isInitOK;
 }
@@ -1069,7 +1405,7 @@ bool LedDevicePhilipsHue::openStream()
 			// if same owner stop stream
 			if (isStreamOwner(_streamOwner))
 			{
-				Debug(_log, "Group: \"%s\" [%u] is in use, try to stop stream", QSTRING_CSTR(_groupName), _groupId);
+				Debug(_log, "Group: \"%s\" [%u/%s] is in use, try to stop stream", QSTRING_CSTR(_groupName), _groupId, QSTRING_CSTR(_entertainmentConfigurationId));
 
 				if (stopStream())
 				{
@@ -1080,12 +1416,12 @@ bool LedDevicePhilipsHue::openStream()
 				}
 				else
 				{
-					Error(_log, "Group: \"%s\" [%u] couldn't stop by user: \"%s\" - Entertainment API not usable", QSTRING_CSTR(_groupName), _groupId, QSTRING_CSTR(_streamOwner));
+					Error(_log, "Group: \"%s\" [%u/%s] couldn't stop by user: \"%s\" - Entertainment API not usable", QSTRING_CSTR(_groupName), _groupId, QSTRING_CSTR(_entertainmentConfigurationId), QSTRING_CSTR(_streamOwner));
 				}
 			}
 			else
 			{
-				Error(_log, "Group: \"%s\" [%u] is in use and owned by other user: \"%s\" - Entertainment API not usable", QSTRING_CSTR(_groupName), _groupId, QSTRING_CSTR(_streamOwner));
+				Error(_log, "Group: \"%s\" [%u/%s] is in use and owned by other user: \"%s\" - Entertainment API not usable", QSTRING_CSTR(_groupName), _groupId, QSTRING_CSTR(_entertainmentConfigurationId), QSTRING_CSTR(_streamOwner));
 			}
 		}
 		else
@@ -1168,7 +1504,10 @@ bool LedDevicePhilipsHue::startStream()
 	rc = setStreamGroupState(true);
 
 	if (rc)
+	{
 		Debug(_log, "The stream has started.");
+		_sequenceNumber = 0;
+	}
 	else
 		Error(_log, "The stream has NOT started.");
 
@@ -1180,7 +1519,7 @@ bool LedDevicePhilipsHue::stopStream()
 	bool canRestore = false;
 
 	// Set to black
-	if (!_lightIds.empty() && _isDeviceReady && !_stopConnection && _useHueEntertainmentAPI)
+	if (!_lights.empty() && _isDeviceReady && !_stopConnection && _useHueEntertainmentAPI)
 	{
 		if (!_isRestoreOrigState)
 		{
@@ -1225,6 +1564,14 @@ bool LedDevicePhilipsHue::stopStream()
 
 bool LedDevicePhilipsHue::setStreamGroupState(bool state)
 {
+	if (isApiV2())
+	{
+		QJsonDocument doc = setGroupStateV2(_entertainmentConfigurationId, state);
+
+		_groupStreamState = (getStreamGroupState() && isStreamOwner(_streamOwner));
+		return _groupStreamState == state;
+	}
+
 	QString active = state ? API_STREAM_ACTIVE_VALUE_TRUE : API_STREAM_ACTIVE_VALUE_FALSE;
 
 	QJsonDocument doc = setGroupState(_groupId, state);
@@ -1274,6 +1621,32 @@ bool LedDevicePhilipsHue::setStreamGroupState(bool state)
 
 bool LedDevicePhilipsHue::getStreamGroupState()
 {
+	if (isApiV2())
+	{
+		QJsonObject doc = getGroupStateV2(_entertainmentConfigurationId)["data"].toArray().first().toObject();
+
+		if (!this->isInError())
+		{
+			QString status = doc["status"].toString();
+			log("Group state  ", "%s", QString(QJsonDocument(doc).toJson(QJsonDocument::Compact)).toUtf8().constData());
+			log("Stream status ", "%s", QSTRING_CSTR(status));
+			QJsonObject obj = doc["active_streamer"].toObject();
+
+			if (status.isEmpty())
+			{
+				this->setInError("no Streaming Infos in Group found");
+				return false;
+			}
+			else
+			{
+				_streamOwner = obj.value(API_STREAM_OWNER_V2).toString();
+				bool streamState = (status == API_STREAM_ACTIVE);
+				return streamState;
+			}
+		}
+		return false;
+	}
+
 	QJsonDocument doc = getGroupState(_groupId);
 
 	if (!this->isInError())
@@ -1354,7 +1727,7 @@ bool LedDevicePhilipsHue::switchOn()
 	if (_retryMode)
 		return false;
 
-	Info(_log, "Switching ON Philips Hue device");	
+	Info(_log, "Switching ON Philips Hue device");
 
 	try
 	{
@@ -1373,9 +1746,9 @@ bool LedDevicePhilipsHue::switchOn()
 				_currentRetry = 0;
 				_isDeviceInitialised = true;
 			}
-				
+
 			if (_isDeviceInitialised)
-			{				
+			{
 				if (_useHueEntertainmentAPI)
 				{
 					if (openStream())
@@ -1491,6 +1864,37 @@ int LedDevicePhilipsHue::write(const std::vector<ColorRgb>& ledValues)
 
 int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValues)
 {
+	if (isApiV2())
+	{
+		// Iterate through lights and set colors.
+		unsigned int idx = 0;
+		for (PhilipsHueLight& light : _lights)
+		{
+			// Get color.
+			ColorRgb color;
+			if (idx > ledValues.size() - 1)
+			{
+				color.red = 0;
+				color.green = 0;
+				color.blue = 0;
+			}
+			else
+			{
+				color = ledValues.at(idx);
+			}
+
+			light.setRGBColor(color);
+			// Scale colors from [0, 255] to [0, 1] and convert to xy space.
+			CiColor xy = CiColor::rgbToCiColor(color.red / 255.0, color.green / 255.0, color.blue / 255.0,
+				light.getColorSpace(), _candyGamma);
+
+			this->setOnOffState(light, true);
+			this->setColor(light, xy);
+			idx++;
+		}
+		return 0;
+	}
+
 	// Iterate through lights and set colors.
 	unsigned int idx = 0;
 	for (PhilipsHueLight& light : _lights)
@@ -1563,16 +1967,80 @@ int LedDevicePhilipsHue::writeSingleLights(const std::vector<ColorRgb>& ledValue
 
 void LedDevicePhilipsHue::writeStream(bool flush)
 {
+	if (isApiV2())
+	{		
+		std::vector<uint8_t> payload = prepareStreamDataV2();
+		writeBytes(static_cast<unsigned int>(payload.size()), reinterpret_cast<unsigned char*>(payload.data()), flush);
+		return;
+	}
+
 	QByteArray streamData = prepareStreamData();
 	writeBytes(static_cast<uint>(streamData.size()), reinterpret_cast<unsigned char*>(streamData.data()), flush);
 }
 
+std::vector<uint8_t> LedDevicePhilipsHue::prepareStreamDataV2()
+{
+	QString entertainmentConfigId = _entertainmentConfigurationId;
+	std::vector<uint8_t> payload;
+
+	payload.push_back(static_cast<uint8_t>('H'));
+	payload.push_back(static_cast<uint8_t>('u'));
+	payload.push_back(static_cast<uint8_t>('e'));
+	payload.push_back(static_cast<uint8_t>('S'));
+	payload.push_back(static_cast<uint8_t>('t'));
+	payload.push_back(static_cast<uint8_t>('r'));
+	payload.push_back(static_cast<uint8_t>('e'));
+	payload.push_back(static_cast<uint8_t>('a'));
+	payload.push_back(static_cast<uint8_t>('m'));
+	payload.push_back(static_cast<uint8_t>(0x02));
+	payload.push_back(static_cast<uint8_t>(VERSION_MINOR));
+	payload.push_back(static_cast<uint8_t>(_sequenceNumber++));
+	payload.push_back(static_cast<uint8_t>(RESERVED));
+	payload.push_back(static_cast<uint8_t>(RESERVED));
+	payload.push_back(static_cast<uint8_t>(COLORSPACE_XYBRI));
+	payload.push_back(static_cast<uint8_t>(RESERVED));
+	for (int i = 0; i < entertainmentConfigId.size(); ++i)
+	{
+		payload.push_back(static_cast<uint8_t>(entertainmentConfigId.at(i).toLatin1()));
+	}
+	for (auto light : _lights)
+	{
+		auto id = static_cast<uint8_t>(light.getId() & 0x00ff);
+
+		CiColor lightXY = light.getColor();
+		payload.push_back(id);
+		quint64 R = lightXY.x * 0xffff;
+		quint64 G = lightXY.y * 0xffff;
+		quint64 B = lightXY.bri * 0xffff;
+
+		payload.push_back(static_cast<uint8_t>((R >> 8) & 0xff));
+		payload.push_back(static_cast<uint8_t>(R & 0xff));
+		payload.push_back(static_cast<uint8_t>((G >> 8) & 0xff));
+		payload.push_back(static_cast<uint8_t>(G & 0xff));
+		payload.push_back(static_cast<uint8_t>((B >> 8) & 0xff));
+		payload.push_back(static_cast<uint8_t>(B & 0xff));
+
+
+	}
+	return payload;
+}
+
 void LedDevicePhilipsHue::setOnOffState(PhilipsHueLight& light, bool on, bool force)
 {
 	if (light.getOnOffState() != on || force)
 	{
 		light.setOnOffState(on);
 		QString state = on ? API_STATE_VALUE_TRUE : API_STATE_VALUE_FALSE;
+
+		if (isApiV2())
+		{
+			for (const auto& item : light.getLightIds())
+			{
+				setLightStateV2(item, QString(R"({"on":{"%1": %2 }})").arg(API_STATE_ON, state));
+			}
+			return;
+		}
+
 		setLightState(light.getId(), QString("{\"%1\": %2 }").arg(API_STATE_ON, state));
 	}
 }
@@ -1587,7 +2055,7 @@ void LedDevicePhilipsHue::setTransitionTime(PhilipsHueLight& light)
 }
 
 void LedDevicePhilipsHue::setColor(PhilipsHueLight& light, CiColor& color)
-{
+{	
 	if (!light.hasColor() || light.getColor() != color)
 	{
 		if (!_useHueEntertainmentAPI)
@@ -1704,6 +2172,27 @@ bool LedDevicePhilipsHue::storeState()
 
 	if (_isRestoreOrigState)
 	{
+		if (isApiV2())
+		{
+			QMap<QString, QJsonObject>& lightStateMap = getLightStateMapV2();
+			if (!lightStateMap.empty())
+			{
+				for (auto it = lightStateMap.begin(); it != lightStateMap.end(); ++it)
+				{
+					auto ret = getLightStateV2(it.key());
+					if (ret.isObject() && ret.object().contains("data") && ret.object()["data"].toArray().size() > 0)
+					{
+						auto state = ret.object()["data"].toArray().first().toObject();
+						QJsonObject obj;
+						obj["color"] = state["color"];
+						obj["on"] = state["on"];
+						lightStateMap[it.key()] = obj;
+					}
+				}
+			}
+			return rc;
+		}
+
 		if (!_lightIds.empty())
 		{
 			for (PhilipsHueLight& light : _lights)
@@ -1722,23 +2211,23 @@ QJsonObject LedDevicePhilipsHue::discover(const QJsonObject& /*params*/)
 	QJsonObject devicesDiscovered;
 	QJsonArray deviceList;
 	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);
-	
+
 #ifdef ENABLE_BONJOUR
 	auto bonInstance = BonjourBrowserWrapper::getInstance();
 	if (bonInstance != nullptr)
 	{
 		QList<BonjourRecord> recs;
-		
+
 		if (QThread::currentThread() == bonInstance->thread())
 			recs = bonInstance->getPhilipsHUE();
 		else
 			QMetaObject::invokeMethod(bonInstance, "getPhilipsHUE", Qt::ConnectionType::BlockingQueuedConnection, Q_RETURN_ARG(QList<BonjourRecord>, recs));
 
-		for(BonjourRecord& r : recs)
+		for (BonjourRecord& r : recs)
 		{
 			QJsonObject newIp;
 			newIp["ip"] = r.address;
-			newIp["port"] = (r.port == 443) ? 80: r.port;
+			newIp["port"] = (r.port == 443) ? 80 : r.port;
 			deviceList.push_back(newIp);
 		}
 	}
@@ -1772,7 +2261,19 @@ bool LedDevicePhilipsHue::restoreState()
 
 	if (_isRestoreOrigState)
 	{
-		// Restore device's original state
+		if (isApiV2())
+		{
+			if (!_lights.empty())
+			{
+				const QMap<QString, QJsonObject>& lightStateMap = getLightStateMapV2();
+				for (auto it = lightStateMap.begin(); it != lightStateMap.end(); ++it)
+				{
+					setLightStateV2(it.key(), QJsonDocument(it.value()).toJson(QJsonDocument::JsonFormat::Compact).trimmed());
+				}
+			}
+			return rc;
+		}
+
 		if (!_lightIds.empty())
 		{
 			for (PhilipsHueLight& light : _lights)
@@ -1830,11 +2331,27 @@ QJsonObject LedDevicePhilipsHue::getProperties(const QJsonObject& params)
 
 void LedDevicePhilipsHue::identify(const QJsonObject& params)
 {
-	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
-	QJsonObject properties;
+	Debug(_log, "Device: [%s], params: [%s]", (_isOn) ? "ON" : "OFF", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
+
+	if (_isOn && isApiV2())
+	{
+		auto channelsBackup = _lights;
+		auto lightsCountBackup = _lightsCount;
+		unsigned int channelId = params["channelId"].toInt(0);
+		_lightsCount = 1;
+		_lights.clear();
+		_lights.emplace_back(_log, channelId, QJsonObject(), QStringList(), channelId);
+		colorChannel(ColorRgb::RED, channelId);
+		colorChannel(ColorRgb::GREEN, channelId);
+		colorChannel(ColorRgb::BLUE, channelId);
+		_lights = channelsBackup;
+		_lightsCount = lightsCountBackup;
+		return;
+	}
 
-	// Identify Phillips-Bridge device
+	QJsonObject properties;
 	QString host = params["host"].toString("");
+
 	if (!host.isEmpty())
 	{
 		QString username = params["user"].toString("");
@@ -1872,3 +2389,11 @@ void LedDevicePhilipsHue::identify(const QJsonObject& params)
 		}
 	}
 }
+
+void LedDevicePhilipsHue::colorChannel(const ColorRgb& colorRgb, unsigned int i)
+{
+	std::vector<ColorRgb> ledValues;
+	ledValues.emplace_back(colorRgb);
+	write(ledValues);
+	QThread::sleep(1);
+}
diff --git a/sources/leddevice/dev_net/LedDevicePhilipsHue.h b/sources/leddevice/dev_net/LedDevicePhilipsHue.h
index 9a8e97277..078cfecc8 100644
--- a/sources/leddevice/dev_net/LedDevicePhilipsHue.h
+++ b/sources/leddevice/dev_net/LedDevicePhilipsHue.h
@@ -148,6 +148,8 @@ class PhilipsHueLight
 	PhilipsHueLight(Logger* log, unsigned int id, QJsonObject values, unsigned int ledidx,
 		int onBlackTimeToPowerOff,
 		int onBlackTimeToPowerOn);
+	PhilipsHueLight(Logger* log, unsigned int id, QJsonObject values, QStringList lightIds,
+		unsigned int ledidx);
 	~PhilipsHueLight();
 
 	///
@@ -182,7 +184,11 @@ class PhilipsHueLight
 	bool isBlack(bool isBlack);
 	bool isWhite(bool isWhite);
 	void setBlack();
-	void blackScreenTriggered();
+	void blackScreenTriggered();	
+	ColorRgb getRGBColor() const;
+	void setRGBColor(const ColorRgb color);
+	QStringList getLightIds() const;
+
 private:
 
 	Logger* _log;
@@ -192,6 +198,7 @@ class PhilipsHueLight
 	bool _on;
 	int _transitionTime;
 	CiColor _color;
+	ColorRgb _colorRgb;
 	bool    _hasColor;
 	/// darkes blue color in hue lamp GAMUT = black
 	CiColor _colorBlack;
@@ -211,6 +218,7 @@ class PhilipsHueLight
 	bool _blackScreenTriggered;
 	uint64_t _onBlackTimeToPowerOff;
 	uint64_t _onBlackTimeToPowerOn;
+	QStringList _lightIds;
 };
 
 class LedDevicePhilipsHueBridge : public ProviderUdpSSL
@@ -261,6 +269,15 @@ class LedDevicePhilipsHueBridge : public ProviderUdpSSL
 
 	QJsonArray getGroupLights(quint16 groupId = 0) const;
 
+	QJsonDocument getLightStateV2(QString lightId);
+	void setLightStateV2(QString lightId = "", const QString& state = "");
+	QMap<QString, QJsonObject> getGroupMapV2() const;
+	QString getGroupNameV2(QString groupId = "0") const;
+	QJsonArray getGroupChannelsV2(QString groupId = 0) const;
+	void setApplicationIdV2();
+	bool isApiV2();
+	void setApiV2(bool version2);
+
 protected:
 
 	///
@@ -300,6 +317,14 @@ class LedDevicePhilipsHueBridge : public ProviderUdpSSL
 
 	const int* getCiphersuites() const override;
 
+	QJsonDocument getGroupStateV2(QString groupId);
+	QJsonDocument setGroupStateV2(QString groupId, bool state);
+	QStringList getLightIdsInChannelV2(QJsonObject channel);
+	QMap<QString, QJsonObject>& getLightStateMapV2();
+	void setLightsMapV2(const QJsonDocument& doc);
+	void setGroupMapV2(const QJsonDocument& doc);
+	httpResponse getRaw(const QString& route);
+
 private:
 
 	QJsonDocument getAllBridgeInfos();
@@ -320,6 +345,13 @@ class LedDevicePhilipsHueBridge : public ProviderUdpSSL
 
 	QMap<quint16, QJsonObject> _lightsMap;
 	QMap<quint16, QJsonObject> _groupsMap;
+
+	QString _hueApplicationId;
+	QMap<QString, QJsonObject> _lightsMapV2;
+	QMap<QString, QJsonObject> _lightStateMapV2;
+	QMap<QString, QJsonObject> _groupsMapV2;
+
+	bool _apiV2;
 };
 
 /**
@@ -505,9 +537,11 @@ public slots:
 	///
 	bool restoreState() override;
 
+	void colorChannel(const ColorRgb& colorRgb, unsigned int i);
+
 private:
 
-	bool initLeds();
+	bool initLeds(QString groupName);
 
 	bool powerOn(bool wait);
 
@@ -543,6 +577,7 @@ public slots:
 	int writeSingleLights(const std::vector<ColorRgb>& ledValues);
 
 	QByteArray prepareStreamData() const;
+	std::vector<uint8_t> prepareStreamDataV2();
 
 	///
 	bool _switchOffOnBlack;
@@ -560,6 +595,7 @@ public slots:
 	std::vector<PhilipsHueLight> _lights;
 
 	unsigned int _lightsCount;
+	QString		_entertainmentConfigurationId;
 	quint16		_groupId;
 
 	int			_blackLightsTimeout;
@@ -581,4 +617,5 @@ public slots:
 	int			_lastId;
 	bool		_groupStreamState;
 	QJsonObject _configBackup;
+	std::atomic<uint8_t> _sequenceNumber;
 };
diff --git a/sources/leddevice/dev_net/ProviderRestApi.cpp b/sources/leddevice/dev_net/ProviderRestApi.cpp
index 8986e9704..99c3d1204 100644
--- a/sources/leddevice/dev_net/ProviderRestApi.cpp
+++ b/sources/leddevice/dev_net/ProviderRestApi.cpp
@@ -45,7 +45,7 @@ std::unique_ptr<networkHelper> ProviderRestApi::_networkWorker(nullptr);
 
 ProviderRestApi::ProviderRestApi(const QString& host, int port, const QString& basePath)
 	:_log(Logger::getInstance("LEDDEVICE"))
-	, _scheme("http")
+	, _scheme((port == 443) ? "https" : "http")
 	, _hostname(host)
 	, _port(port)
 {
@@ -101,6 +101,11 @@ void ProviderRestApi::appendPath(QString& path, const QString& appendPath) const
 	path = QUrl(path).resolved(appendPath).toString();	
 }
 
+void ProviderRestApi::addHeader(const QString &key, const QString &value)
+{
+	_headers.insert(key, value);
+}
+
 void ProviderRestApi::setFragment(const QString& fragment)
 {
 	_fragment = fragment;
@@ -176,7 +181,13 @@ httpResponse ProviderRestApi::executeOperation(QNetworkAccessManager::Operation
 	QNetworkRequest request(url);
 	QNetworkReply* networkReply = nullptr;
 
-	request.setOriginatingObject(this);	
+	request.setOriginatingObject(this);
+	QMapIterator<QString, QString> i(_headers);
+	while (i.hasNext())
+	{
+		i.next();
+		request.setRawHeader(i.key().toUtf8(), i.value().toUtf8());
+	}
 
 	QMetaObject::invokeMethod(_networkWorker.get(), "executeOperation", Qt::BlockingQueuedConnection,
 		Q_RETURN_ARG(QNetworkReply*, networkReply), Q_ARG(QNetworkAccessManager::Operation, op), Q_ARG(QNetworkRequest, request), Q_ARG(QByteArray, body.toUtf8()));
@@ -226,6 +237,14 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply, bool time
 	int httpStatusCode = (timeout) ? 408 : reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
 	response.setHttpStatusCode(httpStatusCode);
 	
+	QMap<QString, QString> headers;
+	// We sometimes need headers in the response to get the hue application id for instance
+	for (const auto &item: reply->rawHeaderPairs())
+	{
+		headers[item.first] = item.second;
+	};
+	response.setHeaders(headers);
+	
 	if (timeout)
 		response.setNetworkReplyError(QNetworkReply::TimeoutError);
 	else
@@ -334,7 +353,11 @@ QNetworkReply* networkHelper::executeOperation(QNetworkAccessManager::Operation
 {
 	ProviderRestApi* parent = static_cast<ProviderRestApi*>(request.originatingObject());
 	parent->aquireResultLock();
-	
+
+	QSslConfiguration conf = request.sslConfiguration();
+	conf.setPeerVerifyMode(QSslSocket::VerifyNone);
+	request.setSslConfiguration(conf);
+
 	auto ret = (op == QNetworkAccessManager::PutOperation) ? _networkManager->put(request, body):
 				(op == QNetworkAccessManager::PostOperation) ? _networkManager->post(request, body) : _networkManager->get(request);
 
@@ -392,3 +415,13 @@ void httpResponse::setNetworkReplyError(const QNetworkReply::NetworkError networ
 	_hasError = (networkReplyError != QNetworkReply::NetworkError::NoError);
 	_networkReplyError = networkReplyError;
 }
+
+QMap<QString, QString> httpResponse::getHeaders() const
+{
+	return _headers;
+}
+
+void httpResponse::setHeaders(const QMap<QString, QString> &h)
+{
+	_headers = h;
+}
diff --git a/sources/leddevice/dev_net/ProviderRestApi.h b/sources/leddevice/dev_net/ProviderRestApi.h
index c37eee126..5a3a3e775 100644
--- a/sources/leddevice/dev_net/ProviderRestApi.h
+++ b/sources/leddevice/dev_net/ProviderRestApi.h
@@ -74,6 +74,7 @@ class ProviderRestApi : public QObject
 	/// @param[in] path
 	///
 	void appendPath(const QString& appendPath);
+	void addHeader(const QString &key, const QString &value);
 
 	///
 	/// @brief Set an API's fragment
@@ -141,7 +142,7 @@ class ProviderRestApi : public QObject
 
 	QString   _basePath;
 	QString   _path;
-
+	QMap<QString, QString> _headers;
 	QString   _fragment;
 	QUrlQuery _query;
 
@@ -180,6 +181,9 @@ class httpResponse
 	QJsonDocument getBody() const;
 	void setBody(const QJsonDocument& body);
 
+     QMap<QString, QString> getHeaders() const;
+     void setHeaders( const QMap<QString, QString> &h);
+
 	QString getErrorReason() const;
 	void setErrorReason(const QString& errorReason);
 
@@ -194,7 +198,7 @@ class httpResponse
 	QJsonDocument _responseBody;
 	bool _hasError = false;
 	QString _errorReason;
-
+	QMap<QString, QString> _headers;
 	int _httpStatusCode = 0;
 	QNetworkReply::NetworkError _networkReplyError = QNetworkReply::NoError;
 };
diff --git a/sources/leddevice/schemas/schema-philipshue.json b/sources/leddevice/schemas/schema-philipshue.json
index 246f9caa4..ced29694e 100644
--- a/sources/leddevice/schemas/schema-philipshue.json
+++ b/sources/leddevice/schemas/schema-philipshue.json
@@ -31,13 +31,30 @@
 			"title":"edt_dev_spec_useEntertainmentAPI_title",
 			"default" : true,
 			"propertyOrder" : 4
-		},		
+		},
+		"useEntertainmentAPIV2": {
+			"type": "boolean",
+			"format": "checkbox",
+			"title":"edt_dev_spec_useEntertainmentAPIV2_title",
+			"default" : false,
+			"propertyOrder" : 5,
+			"options": {
+				"dependencies": {
+					"useEntertainmentAPI": true
+				}
+			}
+		},
 		"switchOffOnBlack": {
 			"type": "boolean",
 			"format": "checkbox",
 			"title":"edt_dev_spec_switchOffOnBlack_title",
 			"default" : false,
-			"propertyOrder" : 6
+			"propertyOrder" : 6,
+			"options": {
+				"dependencies": {
+					"useEntertainmentAPIV2": false
+				}
+			}
 		},
 		"blackLevel": {
 			"type": "number",
@@ -47,7 +64,12 @@
 			"step": 0.01,
 			"minimum" : 0.001,
 			"maximum" : 1.0,				
-			"propertyOrder" : 7
+			"propertyOrder" : 7,
+			"options": {
+				"dependencies": {
+					"useEntertainmentAPIV2": false
+				}
+			}
 		},
 		"onBlackTimeToPowerOff" :
 		{
@@ -60,7 +82,12 @@
 			"maximum" : 100000,
 			"default" : 600,
 			"required" : true,
-			"propertyOrder" : 8
+			"propertyOrder" : 8,
+			"options": {
+				"dependencies": {
+					"useEntertainmentAPIV2": false
+				}
+			}
 		},
 		"onBlackTimeToPowerOn" :
 		{
@@ -73,7 +100,12 @@
 			"maximum" : 100000,
 			"default" : 300,
 			"required" : true,
-			"propertyOrder" : 9
+			"propertyOrder" : 9,
+			"options": {
+				"dependencies": {
+					"useEntertainmentAPIV2": false
+				}
+			}
 		},
 		"candyGamma": {
 			"type": "boolean",
@@ -101,7 +133,8 @@
 			},
 			"options": {
 				"dependencies": {
-					"useEntertainmentAPI": false
+					"useEntertainmentAPI": false,
+					"useEntertainmentAPIV2": false
 				}
 			},
 			"propertyOrder" : 12
@@ -114,11 +147,24 @@
 			"default" : 0,
 			"options": {
 				"dependencies": {
-					"useEntertainmentAPI": true
+					"useEntertainmentAPI": true,
+					"useEntertainmentAPIV2": false
 				}
 			},
 			"propertyOrder" : 13
-		},			
+		},
+		"entertainmentConfigurationId": {
+			"type": "string",
+			"title":"edt_dev_spec_entertainmentConfigurationId_title",
+			"default" : "",
+			"required" : true,
+			"propertyOrder" : 13,
+			"options": {
+				"dependencies": {
+					"useEntertainmentAPIV2": true
+				}
+			}
+		},
 		"brightnessFactor": {
 			"type": "number",
 			"format" : "stepper",