From 5521205b873992a90578af9885df801c8dc83b9b Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Mon, 12 Sep 2022 20:53:04 +0200
Subject: [PATCH 01/10] SPI devices discovery

---
 assets/webconfig/js/light_source.js           | 33 +++++++++++++++++++
 sources/leddevice/dev_spi/ProviderSpi.cpp     | 31 +++++++++++++++++
 sources/leddevice/dev_spi/ProviderSpi.h       |  2 ++
 sources/leddevice/schemas/schema-apa102.json  |  4 ---
 sources/leddevice/schemas/schema-apa104.json  |  4 ---
 sources/leddevice/schemas/schema-awa_spi.json |  4 ---
 sources/leddevice/schemas/schema-lpd6803.json |  4 ---
 sources/leddevice/schemas/schema-lpd8806.json |  4 ---
 sources/leddevice/schemas/schema-p9813.json   |  4 ---
 .../leddevice/schemas/schema-sk6812spi.json   |  4 ---
 .../leddevice/schemas/schema-sk6822spi.json   |  4 ---
 sources/leddevice/schemas/schema-sk9822.json  |  4 ---
 sources/leddevice/schemas/schema-ws2801.json  |  4 ---
 .../leddevice/schemas/schema-ws2812spi.json   |  4 ---
 14 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index ba591ca49..236aaf40a 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -894,6 +894,39 @@ $(document).ready(function()
 			$("input[name='root[specificOptions][host]']")[0].style.width = String(58) + "%";
 			$("input[name='root[specificOptions][host]']")[0].parentElement.appendChild(sPort[0]);			
 		}
+		else if (["apa102", "apa104", "awa_spi", "lpd6803", "lpd8806", "p9813", "sk6812spi", "sk6822spi", "sk9822", "ws2801", "ws2812spi"].includes(ledType))
+		{					
+			async function spiDevRefresh(result)
+			{
+				let receiver = $("#selectSpiOutput");
+				receiver.off();
+				receiver.empty();
+
+				$("<option />", {value: "", text: $.i18n("edt_dev_spec_spipath_title")}).appendTo(receiver);
+
+				if (result.info != null && result.info.devices != null)
+				{					
+					(result.info.devices).forEach(function (val) {
+						$("<option />", {value: val.value, text: val.name}).appendTo(receiver);
+					});
+				}
+
+				receiver.on('change', function ()
+				{
+					let selVal = $("#selectSpiOutput").val();
+					if (selVal != "")
+						conf_editor.getEditor('root.specificOptions.output').setValue(selVal);
+				});			
+			}
+
+			let sPort = $("<select id=\"selectSpiOutput\" />");				
+			sPort.addClass("form-select bg-warning").css('width', String(40)+'%');
+
+			requestLedDeviceDiscovery(ledType).then( (result) => spiDevRefresh(result));
+				
+			$("input[name='root[specificOptions][output]']")[0].style.width = String(58) + "%";
+			$("input[name='root[specificOptions][output]']")[0].parentElement.appendChild(sPort[0]);			
+		}
 		
 		function changeWizard(data, hint, fn)
 		{
diff --git a/sources/leddevice/dev_spi/ProviderSpi.cpp b/sources/leddevice/dev_spi/ProviderSpi.cpp
index 2cd530eb4..4f4ab0470 100644
--- a/sources/leddevice/dev_spi/ProviderSpi.cpp
+++ b/sources/leddevice/dev_spi/ProviderSpi.cpp
@@ -14,6 +14,8 @@
 #include "ProviderSpi.h"
 #include <utils/Logger.h>
 
+#include <QDirIterator>
+
 ProviderSpi::ProviderSpi(const QJsonObject& deviceConfig)
 	: LedDevice(deviceConfig)
 	, _deviceName("/dev/spidev0.0")
@@ -222,3 +224,32 @@ int ProviderSpi::writeBytesEsp32(unsigned size, const uint8_t* data)
 
 	return retVal;
 }
+
+QJsonObject ProviderSpi::discover(const QJsonObject& /*params*/)
+{
+	QJsonObject devicesDiscovered;
+	QJsonArray deviceList;
+	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);
+
+	QStringList filter;
+	filter << "spidev*";
+	QDirIterator it("/dev", filter, QDir::Files);
+	QStringList files;
+	while (it.hasNext())
+		files << it.next();
+	files.sort();
+
+	for (const auto& s : files)
+	{
+		QJsonObject newSPI;
+		QString path = QString("%1").arg(s);
+		newSPI["value"] = path;
+		newSPI["name"] = path;
+		deviceList.push_back(newSPI);
+	}
+
+	devicesDiscovered.insert("devices", deviceList);
+	Debug(_log, "SPI devices discovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());
+
+	return devicesDiscovered;
+}
diff --git a/sources/leddevice/dev_spi/ProviderSpi.h b/sources/leddevice/dev_spi/ProviderSpi.h
index 7a4a96616..bf952ee7c 100644
--- a/sources/leddevice/dev_spi/ProviderSpi.h
+++ b/sources/leddevice/dev_spi/ProviderSpi.h
@@ -36,6 +36,8 @@ class ProviderSpi : public LedDevice
 	///
 	int open() override;
 
+	QJsonObject discover(const QJsonObject& params) override;
+
 public slots:
 	///
 	/// Closes the output device.
diff --git a/sources/leddevice/schemas/schema-apa102.json b/sources/leddevice/schemas/schema-apa102.json
index e7a84f122..dabe3f5c2 100644
--- a/sources/leddevice/schemas/schema-apa102.json
+++ b/sources/leddevice/schemas/schema-apa102.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-apa104.json b/sources/leddevice/schemas/schema-apa104.json
index 37eedb83e..4f6ef7c17 100644
--- a/sources/leddevice/schemas/schema-apa104.json
+++ b/sources/leddevice/schemas/schema-apa104.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-awa_spi.json b/sources/leddevice/schemas/schema-awa_spi.json
index eb2dd39d1..385197418 100644
--- a/sources/leddevice/schemas/schema-awa_spi.json
+++ b/sources/leddevice/schemas/schema-awa_spi.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-lpd6803.json b/sources/leddevice/schemas/schema-lpd6803.json
index 05b1ebb93..eb7fd692f 100644
--- a/sources/leddevice/schemas/schema-lpd6803.json
+++ b/sources/leddevice/schemas/schema-lpd6803.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-lpd8806.json b/sources/leddevice/schemas/schema-lpd8806.json
index 05b1ebb93..eb7fd692f 100644
--- a/sources/leddevice/schemas/schema-lpd8806.json
+++ b/sources/leddevice/schemas/schema-lpd8806.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-p9813.json b/sources/leddevice/schemas/schema-p9813.json
index 05b1ebb93..eb7fd692f 100644
--- a/sources/leddevice/schemas/schema-p9813.json
+++ b/sources/leddevice/schemas/schema-p9813.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-sk6812spi.json b/sources/leddevice/schemas/schema-sk6812spi.json
index 769a90345..df9832bed 100644
--- a/sources/leddevice/schemas/schema-sk6812spi.json
+++ b/sources/leddevice/schemas/schema-sk6812spi.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-sk6822spi.json b/sources/leddevice/schemas/schema-sk6822spi.json
index 874e5cc73..61cf08f72 100644
--- a/sources/leddevice/schemas/schema-sk6822spi.json
+++ b/sources/leddevice/schemas/schema-sk6822spi.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-sk9822.json b/sources/leddevice/schemas/schema-sk9822.json
index ddf83c0ad..9cc51a34e 100644
--- a/sources/leddevice/schemas/schema-sk9822.json
+++ b/sources/leddevice/schemas/schema-sk9822.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-ws2801.json b/sources/leddevice/schemas/schema-ws2801.json
index 05b1ebb93..eb7fd692f 100644
--- a/sources/leddevice/schemas/schema-ws2801.json
+++ b/sources/leddevice/schemas/schema-ws2801.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1
diff --git a/sources/leddevice/schemas/schema-ws2812spi.json b/sources/leddevice/schemas/schema-ws2812spi.json
index 374084a55..30785064c 100644
--- a/sources/leddevice/schemas/schema-ws2812spi.json
+++ b/sources/leddevice/schemas/schema-ws2812spi.json
@@ -5,10 +5,6 @@
 		"output": {
 			"type": "string",
 			"title":"edt_dev_spec_spipath_title",
-			"enum" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"],
-			"options" : {
-				"enum_titles" : ["/dev/spidev0.0","/dev/spidev0.1","/dev/spidev1.0","/dev/spidev1.1"]
-			},
 			"default" : "/dev/spidev0.0",
 			"required" : true,
 			"propertyOrder" : 1

From 84b5ceb171ba1cab4a62e9a8812f1963ea2a6b55 Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Mon, 12 Sep 2022 22:00:51 +0200
Subject: [PATCH 02/10] Only system files for SPI devices filter

---
 sources/leddevice/dev_spi/ProviderSpi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/leddevice/dev_spi/ProviderSpi.cpp b/sources/leddevice/dev_spi/ProviderSpi.cpp
index 4f4ab0470..36c4870cb 100644
--- a/sources/leddevice/dev_spi/ProviderSpi.cpp
+++ b/sources/leddevice/dev_spi/ProviderSpi.cpp
@@ -233,7 +233,7 @@ QJsonObject ProviderSpi::discover(const QJsonObject& /*params*/)
 
 	QStringList filter;
 	filter << "spidev*";
-	QDirIterator it("/dev", filter, QDir::Files);
+	QDirIterator it("/dev", filter, QDir::System);
 	QStringList files;
 	while (it.hasNext())
 		files << it.next();

From 89de4bc9196be521f3b20cdd4112a4204fdfeb8b Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Tue, 13 Sep 2022 13:52:27 +0200
Subject: [PATCH 03/10] Code clean-up

---
 assets/webconfig/js/light_source.js           | 133 ++++++------------
 sources/api/JsonAPI.cpp                       |  13 --
 .../leddevice/dev_serial/ProviderRs232.cpp    |  31 ++--
 sources/leddevice/dev_spi/ProviderSpi.cpp     |  23 ++-
 4 files changed, 62 insertions(+), 138 deletions(-)

diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index 236aaf40a..20bd2d150 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -559,6 +559,33 @@ $(document).ready(function()
 			$('#ip_ma_' + key).val(slConfig.matrix[key]);
 	}
 
+	async function deviceListRefresh(ledTypeTarget, discoveryResult, targetDiscoveryEditor, targetDiscoveryFirstLabel, targetDiscoverySecondLabel = 'main_menu_update_token')
+	{
+		let receiver = $("#deviceListInstances");
+		receiver.off();
+		receiver.empty();
+
+		$("<option />", {value: "", text: $.i18n(targetDiscoveryFirstLabel)}).appendTo(receiver);
+
+		if (discoveryResult.info != null && discoveryResult.info.devices != null)
+		{					
+			(discoveryResult.info.devices).forEach(function (val) {
+				$("<option />", {value: val.value, text: val.name}).appendTo(receiver);
+			});
+		}
+		
+		$("<option />", {value: -1, text: $.i18n(targetDiscoverySecondLabel)}).appendTo(receiver);
+
+		receiver.on('change', function ()
+		{
+			let selVal = $("#deviceListInstances").val();
+			if (selVal == -1)			
+				requestLedDeviceDiscovery(ledTypeTarget).then( (newResult) => deviceListRefresh(ledTypeTarget, newResult, targetDiscoveryEditor, targetDiscoveryFirstLabel, targetDiscoverySecondLabel));
+			else if (selVal != "")
+				conf_editor.getEditor(targetDiscoveryEditor).setValue(selVal);
+		});			
+	}
+
 	function saveValues()
 	{
 		var ledConfig = {
@@ -802,14 +829,6 @@ $(document).ready(function()
 			});
 			$("input[name='root[specificOptions][useEntertainmentAPI]']").trigger("change");
 		}
-		/*
-		    else if(ledType == "wled") {
-		    	    var ledWizardType = (this.checked) ? "wled" : ledType;
-		    	    var data = { type: ledWizardType };
-		    	    var wled_title = 'wiz_wled_title';
-		    	    changeWizard(data, wled_title, startWizardWLED);
-			}
-		*/
 		else if (ledType == "atmoorb")
 		{
 			var ledWizardType = (this.checked) ? "atmoorb" : ledType;
@@ -836,96 +855,26 @@ $(document).ready(function()
 			};
 			var yeelight_title = 'wiz_yeelight_title';
 			changeWizard(data, yeelight_title, startWizardYeelight);
-		}
-		else if (ledType == "adalight")
-		{					
-			if (!(window.serverInfo.serialPorts == null || window.serverInfo.serialPorts.length == 0 || $("#selectPortSerial").length > 0))
-			{
-				let sPort = $("<select id=\"selectPortSerial\" />");				
-				sPort.addClass("form-select bg-warning").css('width', String(40)+'%');
-				
-				$("<option />", {value: "auto", text: $.i18n("edt_dev_spec_outputPath_title")}).appendTo(sPort);
-				(window.serverInfo.serialPorts).forEach(function (val) {
-					$("<option />", {value: val.port, text: val.desc}).appendTo(sPort);
-				});
-				
-				$("input[name='root[specificOptions][output]']")[0].style.width = String(58) + "%";
-				$("input[name='root[specificOptions][output]']")[0].parentElement.appendChild(sPort[0]);
-				
-				sPort.off().on('change', function () {
-					conf_editor.getEditor('root.specificOptions.output').setValue(sPort.val());
-				});				
-			}
-		}
-		else if (ledType == "wled")
+		}		
+		else if (["apa102", "apa104", "awa_spi", "lpd6803", "lpd8806", "p9813", "sk6812spi", "sk6822spi", "sk9822", "ws2801", "ws2812spi", "wled", "adalight", "atmo", "dmx", "karate", "sedu", "tpm2"].includes(ledType))
 		{					
-			async function wledRefresh(result)
-			{
-				let receiver = $("#selectWledInstances");
-				receiver.off();
-				receiver.empty();
-
-				$("<option />", {value: "", text: $.i18n("select_wled_intro")}).appendTo(receiver);
-
-				if (result.info != null && result.info.devices != null)
-				{					
-					(result.info.devices).forEach(function (val) {
-						$("<option />", {value: val.value, text: val.name}).appendTo(receiver);
-					});
-				}
-
-				$("<option />", {value: -1, text: $.i18n("select_wled_rescan")}).appendTo(receiver);
+			let selectorControl = $("<select id=\"deviceListInstances\" />");
+			let targetControl = 'output';
 
-				receiver.on('change', function ()
-				{
-					let selVal = $("#selectWledInstances").val();
-					if (selVal == -1)
-						requestLedDeviceDiscovery('wled').then( (result) => wledRefresh(result));
-					else if (selVal != "")
-						conf_editor.getEditor('root.specificOptions.host').setValue(selVal);
-				});			
-			}
-
-			let sPort = $("<select id=\"selectWledInstances\" />");				
-			sPort.addClass("form-select bg-warning").css('width', String(40)+'%');
+			selectorControl.addClass("form-select bg-warning").css('width', String(40)+'%');
 
-			requestLedDeviceDiscovery('wled').then( (result) => wledRefresh(result));
-				
-			$("input[name='root[specificOptions][host]']")[0].style.width = String(58) + "%";
-			$("input[name='root[specificOptions][host]']")[0].parentElement.appendChild(sPort[0]);			
-		}
-		else if (["apa102", "apa104", "awa_spi", "lpd6803", "lpd8806", "p9813", "sk6812spi", "sk6822spi", "sk9822", "ws2801", "ws2812spi"].includes(ledType))
-		{					
-			async function spiDevRefresh(result)
+			if (ledType == "wled")
 			{
-				let receiver = $("#selectSpiOutput");
-				receiver.off();
-				receiver.empty();
-
-				$("<option />", {value: "", text: $.i18n("edt_dev_spec_spipath_title")}).appendTo(receiver);
-
-				if (result.info != null && result.info.devices != null)
-				{					
-					(result.info.devices).forEach(function (val) {
-						$("<option />", {value: val.value, text: val.name}).appendTo(receiver);
-					});
-				}
-
-				receiver.on('change', function ()
-				{
-					let selVal = $("#selectSpiOutput").val();
-					if (selVal != "")
-						conf_editor.getEditor('root.specificOptions.output').setValue(selVal);
-				});			
+				requestLedDeviceDiscovery(ledType).then( (result) => deviceListRefresh(ledType, result, 'root.specificOptions.host','select_wled_intro','select_wled_rescan'));
+				targetControl = 'host';
 			}
-
-			let sPort = $("<select id=\"selectSpiOutput\" />");				
-			sPort.addClass("form-select bg-warning").css('width', String(40)+'%');
-
-			requestLedDeviceDiscovery(ledType).then( (result) => spiDevRefresh(result));
+			else if (["adalight", "atmo", "dmx", "karate", "sedu", "tpm2"].includes(ledType))
+				requestLedDeviceDiscovery(ledType).then( (result) => deviceListRefresh(ledType, result, 'root.specificOptions.output','edt_dev_spec_outputPath_title'));
+			else
+				requestLedDeviceDiscovery(ledType).then( (result) => deviceListRefresh(ledType, result, 'root.specificOptions.output', 'edt_dev_spec_spipath_title'));
 				
-			$("input[name='root[specificOptions][output]']")[0].style.width = String(58) + "%";
-			$("input[name='root[specificOptions][output]']")[0].parentElement.appendChild(sPort[0]);			
+			$(`input[name='root[specificOptions][${targetControl}]']`)[0].style.width = String(58) + "%";
+			$(`input[name='root[specificOptions][${targetControl}]']`)[0].parentElement.appendChild(selectorControl[0]);			
 		}
 		
 		function changeWizard(data, hint, fn)
diff --git a/sources/api/JsonAPI.cpp b/sources/api/JsonAPI.cpp
index 8e60089ad..517ffb85b 100644
--- a/sources/api/JsonAPI.cpp
+++ b/sources/api/JsonAPI.cpp
@@ -17,7 +17,6 @@
 #include <QHostAddress>
 #include <QHostInfo>
 #include <QMultiMap>
-#include <QSerialPortInfo>
 
 #include <leddevice/LedDeviceWrapper.h>
 #include <leddevice/LedDevice.h>
@@ -530,18 +529,6 @@ void JsonAPI::handleServerInfoCommand(const QJsonObject& message, const QString&
 		ledDevices["available"] = availableLedDevices;
 		info["ledDevices"] = ledDevices;
 
-		// serial port
-		QJsonArray availableSerialPorts;
-		const auto infoSerial = QSerialPortInfo::availablePorts();
-		for (const QSerialPortInfo& info : infoSerial) {
-			QJsonObject serialPort;
-			serialPort["port"] = info.portName();
-			serialPort["desc"] = QString("%2 (%1)").arg(info.systemLocation()).arg(info.description());
-			availableSerialPorts.append(serialPort);
-		}
-		info["serialPorts"] = availableSerialPorts;
-
-
 	#if defined(ENABLE_SOUNDCAPLINUX) || defined(ENABLE_SOUNDCAPWINDOWS) || defined(ENABLE_SOUNDCAPMACOS)
 		if (SoundCapture::getInstance() != NULL)
 		{
diff --git a/sources/leddevice/dev_serial/ProviderRs232.cpp b/sources/leddevice/dev_serial/ProviderRs232.cpp
index b0867c68f..f87be2f7b 100644
--- a/sources/leddevice/dev_serial/ProviderRs232.cpp
+++ b/sources/leddevice/dev_serial/ProviderRs232.cpp
@@ -271,28 +271,21 @@ QString ProviderRs232::discoverFirst()
 QJsonObject ProviderRs232::discover(const QJsonObject& /*params*/)
 {
 	QJsonObject devicesDiscovered;
-	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);
-
 	QJsonArray deviceList;
 
-	// Discover serial Devices
-	for (auto& port : QSerialPortInfo::availablePorts())
-	{
-		if (!port.isNull())
-		{
-			QJsonObject portInfo;
-			portInfo.insert("description", port.description());
-			portInfo.insert("manufacturer", port.manufacturer());
-			portInfo.insert("portName", port.portName());
-			portInfo.insert("productIdentifier", QString("0x%1").arg(port.productIdentifier(), 0, 16));
-			portInfo.insert("serialNumber", port.serialNumber());
-			portInfo.insert("systemLocation", port.systemLocation());
-			portInfo.insert("vendorIdentifier", QString("0x%1").arg(port.vendorIdentifier(), 0, 16));
-
-			deviceList.append(portInfo);
-		}
-	}
+	deviceList.push_back(QJsonObject{
+			{"value", "auto"},
+			{ "name", "Auto"} });
+
+	for (const QSerialPortInfo& info : QSerialPortInfo::availablePorts())
+		deviceList.push_back(QJsonObject{
+			{"value", info.portName()},
+			{ "name", QString("%2 (%1)").arg(info.systemLocation()).arg(info.description()) } });
 
+	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);
 	devicesDiscovered.insert("devices", deviceList);
+
+	Debug(_log, "Serial devices discovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());
+
 	return devicesDiscovered;
 }
diff --git a/sources/leddevice/dev_spi/ProviderSpi.cpp b/sources/leddevice/dev_spi/ProviderSpi.cpp
index 36c4870cb..f56ed6c98 100644
--- a/sources/leddevice/dev_spi/ProviderSpi.cpp
+++ b/sources/leddevice/dev_spi/ProviderSpi.cpp
@@ -229,26 +229,21 @@ QJsonObject ProviderSpi::discover(const QJsonObject& /*params*/)
 {
 	QJsonObject devicesDiscovered;
 	QJsonArray deviceList;
-	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);
-
-	QStringList filter;
-	filter << "spidev*";
-	QDirIterator it("/dev", filter, QDir::System);
-	QStringList files;
+	QStringList files;	
+	QDirIterator it("/dev", QStringList() << "spidev*", QDir::System);
+	
 	while (it.hasNext())
 		files << it.next();
 	files.sort();
 
-	for (const auto& s : files)
-	{
-		QJsonObject newSPI;
-		QString path = QString("%1").arg(s);
-		newSPI["value"] = path;
-		newSPI["name"] = path;
-		deviceList.push_back(newSPI);
-	}
+	for (const auto& path : files)
+		deviceList.push_back(QJsonObject{
+			{"value", path},
+			{ "name", path } });
 
+	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);
 	devicesDiscovered.insert("devices", deviceList);
+
 	Debug(_log, "SPI devices discovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());
 
 	return devicesDiscovered;

From a66b058955aac5e591b56295360b026b2b5763ab Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Sun, 9 Oct 2022 12:53:21 +0200
Subject: [PATCH 04/10] Devices specialized option

---
 sources/base/HyperHdrInstance.cpp               |  6 +++---
 sources/base/schema/schema-device.json          | 12 +-----------
 sources/leddevice/schemas/schema-cololight.json | 11 ++++++++++-
 sources/leddevice/schemas/schema-nanoleaf.json  | 11 ++++++++++-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/sources/base/HyperHdrInstance.cpp b/sources/base/HyperHdrInstance.cpp
index 0d611c89f..2bbd9e32e 100644
--- a/sources/base/HyperHdrInstance.cpp
+++ b/sources/base/HyperHdrInstance.cpp
@@ -125,7 +125,7 @@ void HyperHdrInstance::start()
 	}
 
 	// handle hwLedCount
-	_hwLedCount = qMax(getSetting(settings::type::DEVICE).object()["hardwareLedCount"].toInt(getLedCount()), getLedCount());
+	_hwLedCount = qMax(getSetting(settings::type::DEVICE).object()["hardwareLedCount"].toInt(1), getLedCount());
 
 	connect(&_muxer, &PriorityMuxer::visiblePriorityChanged, this, &HyperHdrInstance::update);
 	connect(&_muxer, &PriorityMuxer::visiblePriorityChanged, this, &HyperHdrInstance::handlePriorityChangedLedDevice);
@@ -259,7 +259,7 @@ void HyperHdrInstance::handleSettingsUpdate(settings::type type, const QJsonDocu
 		_globalLedBuffer = color;
 
 		// handle hwLedCount update
-		_hwLedCount = qMax(getSetting(settings::type::DEVICE).object()["hardwareLedCount"].toInt(getLedCount()), getLedCount());
+		_hwLedCount = qMax(getSetting(settings::type::DEVICE).object()["hardwareLedCount"].toInt(1), getLedCount());
 
 		// change in leds are also reflected in adjustment
 		delete _raw2ledAdjustment;
@@ -273,7 +273,7 @@ void HyperHdrInstance::handleSettingsUpdate(settings::type type, const QJsonDocu
 		QJsonObject dev = config.object();
 
 		// handle hwLedCount update
-		_hwLedCount = qMax(dev["hardwareLedCount"].toInt(getLedCount()), getLedCount());
+		_hwLedCount = qMax(dev["hardwareLedCount"].toInt(1), getLedCount());
 
 		// force ledString update, if device ByteOrder changed
 		if (_ledString.colorOrder != stringToColorOrder(dev["colorOrder"].toString("rgb")))
diff --git a/sources/base/schema/schema-device.json b/sources/base/schema/schema-device.json
index 5a271961a..1c0e5badc 100644
--- a/sources/base/schema/schema-device.json
+++ b/sources/base/schema/schema-device.json
@@ -2,7 +2,7 @@
 	"type" : "object",
 	"title" : "edt_dev_general_heading_title",
 	"required" : true,
-	"defaultProperties": ["hardwareLedCount", "colorOrder", "refreshTime"],
+	"defaultProperties": ["colorOrder", "refreshTime"],
 	"properties" :
 	{
 		"type" :
@@ -12,16 +12,6 @@
 			"required" : true,
 			"propertyOrder" : 0
 		},
-		"hardwareLedCount" :
-		{
-			"type" : "integer",
-			"title" : "edt_dev_general_hardwareLedCount_title",
-			"minimum" : 1,
-			"default" : 1,
-			"access" : "expert",
-			"required" : true,
-			"propertyOrder" : 1
-		},
 		"colorOrder" :
 		{
 			"type" : "string",
diff --git a/sources/leddevice/schemas/schema-cololight.json b/sources/leddevice/schemas/schema-cololight.json
index b7468e7c8..ee66131a2 100644
--- a/sources/leddevice/schemas/schema-cololight.json
+++ b/sources/leddevice/schemas/schema-cololight.json
@@ -1,7 +1,16 @@
 {
 	"type":"object",
 	"required":true,
-    "properties": {
+	"properties": {
+		"hardwareLedCount" : {
+			"type" : "integer",
+			"title" : "edt_dev_general_hardwareLedCount_title",
+			"minimum" : 1,
+			"default" : 1,
+			"access" : "expert",
+			"required" : true,
+			"propertyOrder" : 1
+		},
 		"host" : {
 			"type": "string",
 			"title":"edt_dev_spec_targetIpHost_title",
diff --git a/sources/leddevice/schemas/schema-nanoleaf.json b/sources/leddevice/schemas/schema-nanoleaf.json
index 97fac11f2..3ecc25ef6 100644
--- a/sources/leddevice/schemas/schema-nanoleaf.json
+++ b/sources/leddevice/schemas/schema-nanoleaf.json
@@ -1,7 +1,16 @@
 {
 	"type":"object",
 	"required":true,
-	"properties":{
+	"properties": {
+		"hardwareLedCount": {
+			"type" : "integer",
+			"title" : "edt_dev_general_hardwareLedCount_title",
+			"minimum" : 1,
+			"default" : 1,
+			"access" : "expert",
+			"required" : true,
+			"propertyOrder" : 1
+		},
 		"host": {
 			"type": "string",
 			"title":"edt_dev_spec_targetIpHost_title",

From 4acdd22ab67d2947432a394a37cbae5b4be18eab Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Mon, 10 Oct 2022 00:58:35 +0200
Subject: [PATCH 05/10] LED context editor

---
 assets/webconfig/content/light_source.html |  83 +++++++-
 assets/webconfig/i18n/en.json              |   9 +-
 assets/webconfig/js/light_source.js        | 220 +++++++++++++++++++--
 include/base/ImageToLedsMap.h              |   2 +
 include/base/LedString.h                   |   2 +
 sources/base/ImageToLedsMap.cpp            |  26 ++-
 sources/base/LedString.cpp                 |   2 +
 sources/base/schema/schema-leds.json       |   4 +
 8 files changed, 326 insertions(+), 22 deletions(-)

diff --git a/assets/webconfig/content/light_source.html b/assets/webconfig/content/light_source.html
index 7e5305a65..3309ce052 100644
--- a/assets/webconfig/content/light_source.html
+++ b/assets/webconfig/content/light_source.html
@@ -572,7 +572,7 @@ <h4 class="card-title">
 						<div class="card-header" id="instTarget2">
 							<h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_leds_layout_peview">LED Layout preview</span></h4>
 						</div>
-						<div class="card-body">
+						<div class="card-body" id="visualCreatorPanel">
 							<p id="previewcreator" style="font-weight: bold;"></p>
 							<p id="previewledcount" style="font-weight: bold;"></p>
 							<p id="previewledpower" style="font-weight: bold;"></p>
@@ -591,7 +591,86 @@ <h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_l
 		</div>
 	</div>
 </div>
-
+<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_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>
+<!-- Modal -->
+<div class="modal fade" id="ledPropertiesForm" tabindex="-1" aria-labelledby="ledPropertiesLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content p-0">
+			<div class="card card-default modal-body" style="margin: 0px !important; padding: 0px !important;">
+				<div class="card-header">
+					<h4 class="modal-title"><b><span id="ledPropertiesFormLabel"></span></b></h4>				
+				</div>
+				<div class="card-body">
+					<div class="container">
+						<div class="form-group row">
+							<div class="col-12 col-md-6">
+								<div class="form-group row">
+									<div class="col-form-label mb-3 col-3">
+										<label class="required" data-i18n="conf_leds_layout_cl_left"></label>
+									</div>
+									<div class="mb-3 col-9">
+										<div class="input-group">
+											<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogLeft" />
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
+										</div>
+									</div>
+								</div>
+								<div class="form-group row">
+									<div class="col-form-label mb-3 col-3">
+										<label class="required" data-i18n="conf_leds_layout_cl_right"></label>
+									</div>
+									<div class="mb-3 col-9">
+										<div class="input-group">
+											<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogRight" />
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="col-12 col-md-6">								
+								<div class="form-group row">
+									<div class="col-form-label mb-3 col-3">
+										<label class="required" data-i18n="conf_leds_layout_cl_top"></label>
+									</div>
+									<div class="mb-3 col-9">
+										<div class="input-group">
+											<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogTop" />
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
+										</div>
+									</div>
+								</div>
+								<div class="form-group row">
+									<div class="col-form-label mb-3 col-3">
+										<label class="required" data-i18n="conf_leds_layout_cl_bottom"></label>
+									</div>
+									<div class="mb-3 col-9">
+										<div class="input-group">
+											<input type="number" class="form-control" data-schemaformat="stepper" min="0" max="1" step="0.001" id="ledPropertiesDialogBottom" />
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-down">-</button></div>
+											<div class="input-group-append"><button type="button" class="btn btn-secondary stepper-up">+</button></div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="card-footer">					
+					<button type="button" class="btn btn-danger float-end" data-bs-dismiss="modal"><span data-i18n="general_btn_exit">Exit</span></button>					
+					<button type="button" id="ready_to_set_single_led" class="btn btn-primary float-end me-2"><span data-i18n="general_btn_save">Save</span></button>
+				</div>				
+			</div>
+		</div>
+	</div>
+</div>
 <link href="css/jsonaceeditor.min.css" rel="stylesheet" type="text/css" />
 <script src='js/lib/jsonaceeditor.min.js'></script>
 
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 9eb7664c1..e59a76b76 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -1177,5 +1177,12 @@
   "edt_conf_mqtt_ssl_ignore_errors_title" : "Ignore SSL errors",
   "edt_conf_mqtt_ssl_ignore_errors_expl" : "Ignore all SSL errors such as self-signed certificates etc. Use with caution.",
   "json_api_flatbuffers_user_lut" : "Flatbuffers LUT filename",
-  "json_api_hdr_expl" : "Turn on/off HDR tone mapping. You can also pass the name of the user LUT file in the user HyperHDR home folder to be used for Flatbuffers tone mapping."
+  "json_api_hdr_expl" : "Turn on/off HDR tone mapping. You can also pass the name of the user LUT file in the user HyperHDR home folder to be used for Flatbuffers tone mapping.",
+  "led_editor_context_move": "Move",
+  "led_editor_context_properties": "Properties",
+  "led_editor_context_delete": "Delete",
+  "led_editor_context_enable": "Enable",
+  "led_editor_context_disable": "Disable",
+  "led_editor_context_moving": "Left click the mouse to accept the position",
+  "conf_leds_disabled_notification" : "Some LEDs are disabled by the user!"
 } 
diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index 20bd2d150..fd8c31978 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -63,6 +63,7 @@ function createLedPreview(leds, origin)
 	var leds_html = "";
 	var hashTable = {};
 	var groups = false;
+	var disabledLed = false;
 	
 	for (var idx = 0; idx < leds.length; idx++)
 	{		
@@ -70,13 +71,18 @@ function createLedPreview(leds, origin)
 		var led_id = 'ledc_' + [idx];
 		var bgcolor = "hsla(" + (idx * 360 / leds.length) + ",100%,50%,0.75)";
 		var optGroup = "";
-		
-		if (led.group !== undefined && led.group != 0)
+
+		if (led.disabled !== undefined && led.disabled)
 		{
-			if (led.group in hashTable)
-			{
-				bgcolor = hashTable[led.group];
-			}
+			bgcolor = "hsla(0,5%,5%,0.1)";
+			disabledLed = true;
+		}
+		else if (led.group !== undefined && led.group != 0)
+		{
+			if (led.group in hashTable)			
+				bgcolor = hashTable[led.group];			
+			else
+				hashTable[led.group] = bgcolor;
 			
 			optGroup = ", group: " + led.group;
 			
@@ -88,25 +94,32 @@ function createLedPreview(leds, origin)
 			"width:" + ((led.hmax - led.hmin) * (canvas_width - 1)) + "px;" +
 			"height:" + ((led.vmax - led.vmin) * (canvas_height - 1)) + "px;";
 		leds_html += '<div id="' + led_id + '" group="'+led.group+'" class="led" style="background-color: ' + bgcolor + ';' + pos + '" title="' + idx + optGroup + '"><span id="' + led_id + '_num" class="led_prev_num">' + ((led.name) ? led.name : idx) + '</span></div>';
-		
-		hashTable[led.group] = bgcolor;
+
 	}
-	
+
+	if ($._data(document.getElementById('visualCreatorPanel'), "events") != null)
+		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.3 * canvas_width) + 'px; top: ' + (0.35 * canvas_height) + 'px; width: ' + (0.4 * canvas_width) + 'px;">'+$.i18n('led_editor_context_moving')+'</div>';
 	if (groups)
 		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.3 * canvas_width) + 'px; top: ' + (0.45 * canvas_height) + 'px; width: ' + (0.4 * canvas_width) + 'px;">'+$.i18n('conf_leds_grouping_notification')+'</div>';
+	if (disabledLed)
+		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.3 * canvas_width) + 'px; top: ' + (0.55 * canvas_height) + 'px; width: ' + (0.4 * canvas_width) + 'px;">'+$.i18n('conf_leds_disabled_notification')+'</div>';
 	
 	$('#leds_preview').html(leds_html);
 	
 	var colors = ["black", "grey", "#A9A9A9"];
+	var dcolors = ["A9A9A9", "C9C9C9", "#E9E9E9"];
 
 	for (var i = 0; i < 3 && i < leds.length; i++)
 	{		
 		var led = leds[i];
 		var hColor = "-webkit-linear-gradient(30deg, rgba(255,255,255,0.0) 50%, "+colors[i]+" 50%)";
+		var dColor = "-webkit-linear-gradient(90deg, rgba(255,255,255,0.0) 50%, "+colors[i]+" 50%)";
 		var zIndex = 12-i;
-		
-		if (led.group != 0)
-			$('#ledc_'+i).css({ "background-image": hColor, "z-index": zIndex });
+
+		if (led.disabled !== undefined && led.disabled)
+			$('#ledc_'+i).css({ "background-image": dColor, "z-index": zIndex });
+		else if (led.group !== undefined && led.group != 0)
+			$('#ledc_'+i).css({ "background-image": hColor, "z-index": zIndex });			
 		else
 			$('#ledc_'+i).css({ "background-color": colors[i], "z-index": zIndex });
 	}
@@ -994,6 +1007,189 @@ $(document).ready(function()
 		}
 	});
 
+	// context LED editor
+	let selectedObject = null;
+
+	function cancelAllContext(){
+		selectedObject = null;
+		$("#leds_preview").off("mousemove");
+		$("#leds_preview").off("click");
+		$('#visualCreatorPanel').off("mousedown");
+		finalLedArray.forEach(resLed => {
+			if ("backup_hmin" in resLed && "backup_vmin" in resLed &&
+				"backup_hmax" in resLed && "backup_vmax" in resLed)
+			{
+				resLed.hmin = resLed.backup_hmin;
+				resLed.vmin = resLed.backup_vmin;
+				resLed.hmax = resLed.backup_hmax;
+				resLed.vmax = resLed.backup_vmax;
+				delete resLed.backup_hmin;
+				delete resLed.backup_vmin;
+				delete resLed.backup_hmax;
+				delete resLed.backup_vmax;				
+			}
+		});
+		document.removeEventListener("keyup", cancelAllContext, false);	
+		document.getElementById("creator-context-menu").style.visibility = "hidden";
+		createLedPreview(finalLedArray, _lastOrigin);
+	}	
+
+	$('.st_helper').on('contextmenu', function(e) {
+		const meTop = (e.clientY + $(window).scrollTop()) + "px";
+		const meLeft = (e.clientX + $(window).scrollLeft()) + "px";		
+		const el = document.elementFromPoint(e.clientX, e.clientY);
+
+		if (el != null && el.classList.contains("led"))
+		{
+			selectedObject = el;
+
+			const idTxtS = selectedObject.id.split("_");
+			if (idTxtS.length == 2)
+			{
+				const parsedIndexS = parseInt(idTxtS[1]);
+				if (finalLedArray[parsedIndexS].disabled === true)
+					$('#cmd_dis_enable_text').html($.i18n('led_editor_context_enable'));
+				else
+					$('#cmd_dis_enable_text').html($.i18n('led_editor_context_disable'));
+			}
+
+			$("#creator-context-menu").css({
+				display: "block",
+				top: meTop,
+				left: meLeft
+			}).addClass("showContextMenu");
+
+			$('.st_helper').on("click", cancelAllContext);
+
+			document.getElementById("creator-context-menu").style.visibility = "visible";
+		}
+		return false;
+	});
+
+	$("#creator-context-menu a").on("click", function() {
+		const idTxt = selectedObject.id.split("_");
+
+		$('.st_helper').off("click");
+
+		document.getElementById("creator-context-menu").style.visibility = "hidden";
+		
+		if (idTxt.length == 2)
+		{
+			const parsedIndex = parseInt(idTxt[1]);
+
+			if (!isNaN(parsedIndex))
+			{
+				if (this.id == "CMD_ENABLE")
+				{
+					if ("disabled" in finalLedArray[parsedIndex])
+						delete finalLedArray[parsedIndex].disabled;
+					else
+						finalLedArray[parsedIndex].disabled = true;
+
+					requestWriteConfig({ "leds": finalLedArray });
+
+					createLedPreview(finalLedArray, _lastOrigin);
+
+					selectedObject = null;
+				}
+				else if (this.id == "CMD_DELETE")
+				{
+					finalLedArray[parsedIndex] = undefined;
+
+					finalLedArray = finalLedArray.filter(function(item) {
+						return item !== undefined;
+					});
+
+					requestWriteConfig({ "leds": finalLedArray });
+
+					createLedPreview(finalLedArray, _lastOrigin);
+
+					selectedObject = null;
+				}
+				else if (this.id == "CMD_PROPERTIES")
+				{
+					$('#ledPropertiesFormLabel').html($.i18n('edt_conf_color_leds_title') + ": " + parsedIndex);
+					$('#ledPropertiesDialogLeft').val(finalLedArray[parsedIndex].hmin);
+					$('#ledPropertiesDialogTop').val(finalLedArray[parsedIndex].vmin);
+					$('#ledPropertiesDialogRight').val(finalLedArray[parsedIndex].hmax);
+					$('#ledPropertiesDialogBottom').val(finalLedArray[parsedIndex].vmax);
+
+					$("#ready_to_set_single_led").off("click").on("click", function() {
+						const _hmin = Number($('#ledPropertiesDialogLeft').val());
+						const _vmin = Number($('#ledPropertiesDialogTop').val());
+						const _hmax = Number($('#ledPropertiesDialogRight').val());
+						const _vmax = Number($('#ledPropertiesDialogBottom').val());
+
+						if (_hmin < _hmax && _vmin < _vmax && _hmin >= 0 && _vmin >= 0 && _hmax <= 1 && _vmax <= 1)
+						{
+							finalLedArray[parsedIndex].hmin = _hmin;
+							finalLedArray[parsedIndex].vmin = _vmin;
+							finalLedArray[parsedIndex].hmax = _hmax;
+							finalLedArray[parsedIndex].vmax = _vmax;
+
+							requestWriteConfig({ "leds": finalLedArray });
+
+							cancelAllContext();
+
+							$('#ledPropertiesForm').modal('hide');
+						}
+					});
+
+					$('#ledPropertiesForm').modal('show');
+				}
+				else if (this.id == "CMD_MOVE")
+				{					
+					finalLedArray[parsedIndex].backup_hmin = finalLedArray[parsedIndex].hmin;
+					finalLedArray[parsedIndex].backup_vmin = finalLedArray[parsedIndex].vmin;
+					finalLedArray[parsedIndex].backup_hmax = finalLedArray[parsedIndex].hmax;
+					finalLedArray[parsedIndex].backup_vmax = finalLedArray[parsedIndex].vmax;
+
+					$("#leds_preview").off("mousemove").mousemove(function( event ) {
+						const bounds = $("#leds_preview").get(0).getBoundingClientRect();
+						let x = (event.clientX - bounds.left)/(bounds.right - bounds.left);
+						let y = (event.clientY - bounds.top)/(bounds.bottom - bounds.top);
+						const w = (finalLedArray[parsedIndex].hmax - finalLedArray[parsedIndex].hmin);
+						const h = (finalLedArray[parsedIndex].vmax - finalLedArray[parsedIndex].vmin);
+						const deltaZ = 0.004;
+
+						if (x < deltaZ) x = 0;
+						if (y < deltaZ) y = 0;
+						if (x > (1- deltaZ)) x = 1;
+						if (y > (1- deltaZ)) y = 1;
+						if (x + w > (1- deltaZ)) x = 1 - w;
+						if (y + h > (1- deltaZ)) y = 1 - h;
+
+						finalLedArray[parsedIndex].hmin = x;
+						finalLedArray[parsedIndex].vmin = y;
+						finalLedArray[parsedIndex].hmax = x + w;
+						finalLedArray[parsedIndex].vmax = y + h;
+
+						createLedPreview(finalLedArray, _lastOrigin);
+					});
+
+					$('#visualCreatorPanel').off("mousedown").mousedown(function(event) {
+						if (event.which != 1)
+						{
+							cancelAllContext();
+							return;
+						}
+
+						delete finalLedArray[parsedIndex].backup_hmin;
+						delete finalLedArray[parsedIndex].backup_vmin;
+						delete finalLedArray[parsedIndex].backup_hmax;
+						delete finalLedArray[parsedIndex].backup_vmax;
+
+						requestWriteConfig({ "leds": finalLedArray });
+
+						cancelAllContext();
+					});
+
+					document.addEventListener("keyup", cancelAllContext, false);		
+				}
+			}
+		}
+	});
+
 	// save led device config
 	$("#btn_submit_controller").off().on("click", function(event)
 	{
diff --git a/include/base/ImageToLedsMap.h b/include/base/ImageToLedsMap.h
index 35652ce72..234802910 100644
--- a/include/base/ImageToLedsMap.h
+++ b/include/base/ImageToLedsMap.h
@@ -88,10 +88,12 @@ namespace hyperhdr
 
 		/// The absolute indices into the image for each led
 		std::vector<std::vector<int32_t>> _colorsMap;
+		std::vector<bool> _colorsDisabled;
 		std::vector<int> _colorsGroups;
 
 		int _groupMin;
 		int _groupMax;
+		bool _haveDisabled;
 
 		ColorRgb calcMeanColor(const Image<ColorRgb>& image, const std::vector<int32_t>& colors) const;
 
diff --git a/include/base/LedString.h b/include/base/LedString.h
index aae35c4e1..5c068e269 100644
--- a/include/base/LedString.h
+++ b/include/base/LedString.h
@@ -101,6 +101,8 @@ struct Led
 	///  The maximum horizontal scan line included for this leds color
 	double maxY_frac;
 
+	bool disabled;
+
 	int group;
 };
 
diff --git a/sources/base/ImageToLedsMap.cpp b/sources/base/ImageToLedsMap.cpp
index 87adea22d..58fd7304a 100644
--- a/sources/base/ImageToLedsMap.cpp
+++ b/sources/base/ImageToLedsMap.cpp
@@ -20,9 +20,11 @@ ImageToLedsMap::ImageToLedsMap(
 	, _horizontalBorder(horizontalBorder)
 	, _verticalBorder(verticalBorder)
 	, _colorsMap()
+	, _colorsDisabled()
 	, _colorsGroups()
 	, _groupMin(-1)
 	, _groupMax(-1)
+	, _haveDisabled(false)
 {
 	// Sanity check of the size of the borders (and width and height)
 	Q_ASSERT(_width > 2 * _verticalBorder);
@@ -172,8 +174,9 @@ ImageToLedsMap::ImageToLedsMap(
 		}
 
 		// Add the constructed vector to the map
+		_haveDisabled |= led.disabled;
 		_colorsMap.push_back(ledColor);
-
+		_colorsDisabled.push_back(led.disabled);
 		_colorsGroups.push_back(led.group);
 		if (_groupMin == -1 || led.group < _groupMin)
 			_groupMin = led.group;
@@ -207,16 +210,17 @@ unsigned ImageToLedsMap::verticalBorder() const {
 	return _verticalBorder;
 }
 
-std::vector<ColorRgb> ImageToLedsMap::Process(const Image<ColorRgb>& image, uint16_t* advanced) {
+std::vector<ColorRgb> ImageToLedsMap::Process(const Image<ColorRgb>& image, uint16_t* advanced)
+{
 	std::vector<ColorRgb> colors;
 	switch (_mappingType)
 	{
-	case 3:
-	case 2: colors = getMeanAdvLedColor(image, advanced); break;
-	case 1: colors = getUniLedColor(image); break;
-	default: colors = getMeanLedColor(image);
+		case 3:
+		case 2: colors = getMeanAdvLedColor(image, advanced); break;
+		case 1: colors = getUniLedColor(image); break;
+		default: colors = getMeanLedColor(image);
 	}
-
+	
 	if (_groupMax > 0 && _mappingType != 1)
 	{
 		for (int i = std::max(_groupMin, 1); i <= _groupMax; i++)
@@ -251,6 +255,14 @@ std::vector<ColorRgb> ImageToLedsMap::Process(const Image<ColorRgb>& image, uint
 		}
 	}
 
+	for (size_t i = 0; _haveDisabled && i < qMin(_colorsDisabled.size(), colors.size()); i++)
+		if (_colorsDisabled[i])
+		{
+			colors[i].red = 0;
+			colors[i].green = 0;
+			colors[i].blue = 0;
+		}
+
 	return colors;
 }
 
diff --git a/sources/base/LedString.cpp b/sources/base/LedString.cpp
index bbb83a12a..b99b85f03 100644
--- a/sources/base/LedString.cpp
+++ b/sources/base/LedString.cpp
@@ -35,6 +35,8 @@ LedString LedString::createLedString(const QJsonArray& ledConfigArray, const Col
 		led.minY_frac = qMax(0.0, qMin(1.0, ledConfig["vmin"].toDouble()));
 		led.maxY_frac = qMax(0.0, qMin(1.0, ledConfig["vmax"].toDouble()));
 		led.group = ledConfig["group"].toInt(0);
+		led.disabled = ledConfig["disabled"].toBool(false);
+
 		// Fix if the user swapped min and max
 		if (led.minX_frac > led.maxX_frac)
 		{
diff --git a/sources/base/schema/schema-leds.json b/sources/base/schema/schema-leds.json
index e0fdae66d..91a6050af 100644
--- a/sources/base/schema/schema-leds.json
+++ b/sources/base/schema/schema-leds.json
@@ -40,6 +40,10 @@
 				"required": true,
 				"default": 0
 			},
+			"disabled": {
+				"type": "boolean",
+				"default": false
+			},
 			"colorOrder": {
 				"type": "string",
 				"enum": [

From cf068d964d1db1baf57584b4778bd6bcb5d0767a Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Thu, 13 Oct 2022 00:49:23 +0200
Subject: [PATCH 06/10] Critical bug for unicolor color averaging. Zoom button
 for designer.

---
 assets/webconfig/content/light_source.html |  7 +-
 assets/webconfig/css/hyperhdr.css          | 34 ++++++++-
 assets/webconfig/i18n/en.json              |  4 +-
 assets/webconfig/js/light_source.js        | 84 +++++++++++++++-------
 sources/base/ImageToLedsMap.cpp            |  6 +-
 5 files changed, 100 insertions(+), 35 deletions(-)

diff --git a/assets/webconfig/content/light_source.html b/assets/webconfig/content/light_source.html
index 3309ce052..a4f84d049 100644
--- a/assets/webconfig/content/light_source.html
+++ b/assets/webconfig/content/light_source.html
@@ -39,7 +39,7 @@ <h3 class="page-header"><i class="fa fa-lightbulb-o fa-fw"></i><span data-i18n="
 		<div id="menu_gencfg" class="tab-pane fade" style="padding-top: 10px;" aria-labelledby="menugencfg">
 			<div class="row">
 				<div class="col-lg-12" id="layout_intro"></div>
-				<div class="col-lg-6 col-md-12">
+				<div class="col-lg-6 col-md-12" id="led_main_panel">
 					<div class="accordion" id="accordion">
 						<div class="accordion-item">
 							<div class="accordion-header card card-default" id="headingOne">
@@ -567,16 +567,16 @@ <h4 class="card-title">
 					</div>
 				</div>
 				<!-- accordion -->
-				<div class="col-lg-6 col-md-12">
+				<div class="col-lg-6 col-md-12" id="led_zoom_panel">
 					<div class="card card-default">
 						<div class="card-header" id="instTarget2">
 							<h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_leds_layout_peview">LED Layout preview</span></h4>
 						</div>
 						<div class="card-body" id="visualCreatorPanel">
-							<p id="previewcreator" style="font-weight: bold;"></p>
 							<p id="previewledcount" style="font-weight: bold;"></p>
 							<p id="previewledpower" style="font-weight: bold;"></p>
 							<div id="led_vis_help"></div>
+							<p data-i18n="conf_leds_layout_context" style="font-weight: bold;"></p>
 							<div class="col-lg-12 st_helper" style="padding-left: 0px; padding-right: 0px;">
 								<div id="leds_preview"></div>
 							</div>
@@ -584,6 +584,7 @@ <h4 class="card-title"><i class="fa fa-search fa-fw"></i><span data-i18n="conf_l
 						<div class="card-footer">
 							<button type="button" class="btn btn-danger" id="leds_prev_toggle_num"><i class="fa fa-info fa-fw"></i><span data-i18n="main_ledsim_btn_togglelednumber">toggle led numbers</span></button>
 							<button type="button" class="btn btn-primary" id="leds_prev_checklist"><i class="fa fa-info-circle fa-fw"></i><span data-i18n="conf_leds_layout_btn_checklist">toggle led numbers</span></button>
+							<button type="button" class="btn btn-warning" id="leds_prev_zoom"><i class="fa fa-arrows-alt fa-fw"></i><span data-i18n="conf_leds_layout_btn_zoom">zoom</span></button>
 						</div>
 					</div>
 				</div>
diff --git a/assets/webconfig/css/hyperhdr.css b/assets/webconfig/css/hyperhdr.css
index 2a0bdaaa7..3b2ebfbb6 100644
--- a/assets/webconfig/css/hyperhdr.css
+++ b/assets/webconfig/css/hyperhdr.css
@@ -788,4 +788,36 @@ body:not(.dark-mode) .alert-yellow{
 	color: #212529;
 	background-color: #f39c12;
 	border-color: #e08e0b;
-}
\ No newline at end of file
+}
+
+.crosslineDark {
+     background: 
+         linear-gradient(to top left,
+             rgba(0,0,0,0) 0%,
+             rgba(0,0,0,0) calc(50% - 1px),
+             rgba(0,0,0,1) 50%,
+             rgba(0,0,0,0) calc(50% + 1px),
+             rgba(0,0,0,0) 100%),
+         linear-gradient(to top right,
+             rgba(0,0,0,0) 0%,
+             rgba(0,0,0,0) calc(50% - 1px),
+             rgba(0,0,0,1) 50%,
+             rgba(0,0,0,0) calc(50% + 1px),
+             rgba(0,0,0,0) 100%);
+}
+
+.crosslineWhite {
+     background: 
+         linear-gradient(to top left,
+             rgba(0,0,0,0) 0%,
+             rgba(0,0,0,0) calc(50% - 1.5px),
+             rgba(255,255,255,1) 50%,
+             rgba(0,0,0,0) calc(50% + 1.5px),
+             rgba(0,0,0,0) 100%),
+         linear-gradient(to top right,
+             rgba(0,0,0,0) 0%,
+             rgba(0,0,0,0) calc(50% - 1.5px),
+             rgba(255,255,255,1) 50%,
+             rgba(0,0,0,0) calc(50% + 1.5px),
+             rgba(0,0,0,0) 100%);
+}
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index e59a76b76..ead7a825c 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -1184,5 +1184,7 @@
   "led_editor_context_enable": "Enable",
   "led_editor_context_disable": "Disable",
   "led_editor_context_moving": "Left click the mouse to accept the position",
-  "conf_leds_disabled_notification" : "Some LEDs are disabled by the user!"
+  "conf_leds_disabled_notification" : "Some LEDs are disabled by the user!",
+  "conf_leds_layout_context" : "Right click on the LED to display the context menu",
+  "conf_leds_layout_btn_zoom" : "zoom"
 } 
diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index fd8c31978..8448845ed 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -27,7 +27,7 @@ if (typeof ResizeObserver === "function" && _resizeObserver === null)
 }
 
 function createLedPreview(leds, origin)
-{	
+{
 	_lastLeds = leds;
 	_lastOrigin = origin;
 	
@@ -36,24 +36,20 @@ function createLedPreview(leds, origin)
 	
 	if (origin == "classic")
 	{		
-		$('#previewcreator').html($.i18n('conf_leds_layout_preview_originCL'));
 		$('#leds_preview').css("padding-top", "56.25%").css("position","relative");
 	}
 	else if (origin == "text")
-	{				
-		$('#previewcreator').html($.i18n('conf_leds_layout_preview_originTEXT'));
+	{
 		$('#leds_preview').css("padding-top", "56.25%").css("position","relative");
 	}
 	else if (origin == "matrix")
 	{		
-		$('#previewcreator').html($.i18n('conf_leds_layout_preview_originMA'));
 		$('#leds_preview').css("padding-top", "100%").css("position","relative");
 	}
 	
 	ledStarter = true;
 
-	$('#previewledcount').html($.i18n('conf_leds_layout_preview_totalleds', leds.length));
-	$('#previewledpower').html($.i18n('conf_leds_layout_preview_ledpower', ((leds.length * 0.06) * 1.1).toFixed(1)));
+	$('#previewledcount').html(`${$.i18n('conf_leds_layout_preview_totalleds', leds.length)} (${$.i18n('conf_leds_layout_preview_ledpower', ((leds.length * 0.06) * 1.1).toFixed(1))})`);
 
 	$('.st_helper').css("border", "8px solid grey");
 
@@ -72,9 +68,9 @@ function createLedPreview(leds, origin)
 		var bgcolor = "hsla(" + (idx * 360 / leds.length) + ",100%,50%,0.75)";
 		var optGroup = "";
 
-		if (led.disabled !== undefined && led.disabled)
+		if (led.disabled === true)
 		{
-			bgcolor = "hsla(0,5%,5%,0.1)";
+			bgcolor = "rgba(255, 255, 255, 0.75)";
 			disabledLed = true;
 		}
 		else if (led.group !== undefined && led.group != 0)
@@ -89,41 +85,45 @@ function createLedPreview(leds, origin)
 			groups = true;
 		}
 		
-		var pos = "left:" + (led.hmin * canvas_width) + "px;" +
-			"top:" + (led.vmin * canvas_height) + "px;" +
-			"width:" + ((led.hmax - led.hmin) * (canvas_width - 1)) + "px;" +
-			"height:" + ((led.vmax - led.vmin) * (canvas_height - 1)) + "px;";
+		var pos = "left:" + Math.round(led.hmin * canvas_width) + "px;" +
+			"top:" + Math.round(led.vmin * canvas_height) + "px;" +
+			"width:" + Math.min((led.hmax - led.hmin) * canvas_width + 1, (canvas_width - 1)) + "px;" +
+			"height:" + Math.min((led.vmax - led.vmin) * canvas_height + 1, (canvas_height - 1)) + "px;";
 		leds_html += '<div id="' + led_id + '" group="'+led.group+'" class="led" style="background-color: ' + bgcolor + ';' + pos + '" title="' + idx + optGroup + '"><span id="' + led_id + '_num" class="led_prev_num">' + ((led.name) ? led.name : idx) + '</span></div>';
 
 	}
 
 	if ($._data(document.getElementById('visualCreatorPanel'), "events") != null)
-		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.3 * canvas_width) + 'px; top: ' + (0.35 * canvas_height) + 'px; width: ' + (0.4 * canvas_width) + 'px;">'+$.i18n('led_editor_context_moving')+'</div>';
+		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.2 * canvas_width) + 'px; top: ' + (0.35 * canvas_height) + 'px; width: ' + (0.6 * canvas_width) + 'px;">'+$.i18n('led_editor_context_moving')+'</div>';
 	if (groups)
-		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.3 * canvas_width) + 'px; top: ' + (0.45 * canvas_height) + 'px; width: ' + (0.4 * canvas_width) + 'px;">'+$.i18n('conf_leds_grouping_notification')+'</div>';
+		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.2 * canvas_width) + 'px; top: ' + (0.45 * canvas_height) + 'px; width: ' + (0.6 * canvas_width) + 'px;">'+$.i18n('conf_leds_grouping_notification')+'</div>';
 	if (disabledLed)
-		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.3 * canvas_width) + 'px; top: ' + (0.55 * canvas_height) + 'px; width: ' + (0.4 * canvas_width) + 'px;">'+$.i18n('conf_leds_disabled_notification')+'</div>';
+		leds_html += '<div data-i18n="conf_leds_layout_frame" style="position: absolute; text-align: center; left: ' + (0.2 * canvas_width) + 'px; top: ' + (0.55 * canvas_height) + 'px; width: ' + (0.6 * canvas_width) + 'px;">'+$.i18n('conf_leds_disabled_notification')+'</div>';
 	
 	$('#leds_preview').html(leds_html);
-	
-	var colors = ["black", "grey", "#A9A9A9"];
-	var dcolors = ["A9A9A9", "C9C9C9", "#E9E9E9"];
 
-	for (var i = 0; i < 3 && i < leds.length; i++)
+	//first LEDs
+	var colors = ["rgba(0,0,0,0.8)", "rgba(128,128,128,0.8)", "rgba(169,169,169,0.8)"];
+	for (var i = 0; i < 3 && i < leds.length; i++)		
 	{		
 		var led = leds[i];
-		var hColor = "-webkit-linear-gradient(30deg, rgba(255,255,255,0.0) 50%, "+colors[i]+" 50%)";
-		var dColor = "-webkit-linear-gradient(90deg, rgba(255,255,255,0.0) 50%, "+colors[i]+" 50%)";
+		var angle = Math.round(90 - Math.atan((led.vmax - led.vmin) * canvas_height / (Math.max(led.hmax - led.hmin, 0.0000001) * canvas_width)) * (180 / Math.PI));
+		var hColor = `-webkit-linear-gradient(${angle}deg, rgba(255,255,255,0.0) 50%, ${colors[i]} 50%)`;
 		var zIndex = 12-i;
 
-		if (led.disabled !== undefined && led.disabled)
-			$('#ledc_'+i).css({ "background-image": dColor, "z-index": zIndex });
-		else if (led.group !== undefined && led.group != 0)
-			$('#ledc_'+i).css({ "background-image": hColor, "z-index": zIndex });			
+		if (led.group !== undefined && led.group != 0 && !(leds[i].disabled === true))
+			$('#ledc_'+i).css({ "background-image": hColor, "z-index": zIndex });
 		else
 			$('#ledc_'+i).css({ "background-color": colors[i], "z-index": zIndex });
 	}
 
+	// disabled LEDs
+	for (var i = 0; i < leds.length; i++)
+		if (leds[i].disabled === true)
+		{		
+			$('#ledc_'+i).addClass((i>=3) ? "crosslineDark" : "crosslineWhite");			
+		}
+
 	if ($('#leds_prev_toggle_num').hasClass('btn-success'))
 		$('.led_prev_num').css("display", "inline");
 
@@ -637,7 +637,6 @@ $(document).ready(function()
 	if (storedAccess == "default")
 	{
 		$('#texfield_panel').toggle(false);
-		$('#previewcreator').toggle(false);
 	}
 	
 	// bind change event to all inputs
@@ -974,6 +973,37 @@ $(document).ready(function()
 		toggleClass('#leds_prev_toggle_num', "btn-danger", "btn-success");
 	});
 
+	$('#leds_prev_zoom').off().on("click", function()
+	{
+		if ($('#led_zoom_panel').hasClass("col-lg-6"))
+		{
+			$('#led_zoom_panel').removeClass("col-lg-6");
+			$('#led_zoom_panel').addClass("col-lg-9");
+			$('#led_zoom_panel').addClass("order-1");
+			$('#hyper-subpage').children('h3').addClass("d-none");
+			$('#leds_cfg_nav').addClass("d-none");
+			$('#layout_intro').addClass("d-none");
+			$('#previewledcount').addClass("d-none");
+			$('#previewledpower').addClass("d-none");
+			$('#led_vis_help').addClass("d-none");
+			$('#led_main_panel').addClass("order-2");
+			window.scrollTo(0, 0);
+		}
+		else
+		{
+			$('#led_zoom_panel').addClass("col-lg-6");
+			$('#led_zoom_panel').removeClass("col-lg-9");
+			$('#led_zoom_panel').removeClass("order-1");
+			$('#hyper-subpage').children('h3').removeClass("d-none");
+			$('#leds_cfg_nav').removeClass("d-none");
+			$('#layout_intro').removeClass("d-none");
+			$('#previewledcount').removeClass("d-none");
+			$('#previewledpower').removeClass("d-none");
+			$('#led_vis_help').removeClass("d-none");
+			$('#led_main_panel').removeClass("order-2");
+		}
+	});
+
 	// open checklist
 	$('#leds_prev_checklist').off().on("click", function()
 	{
diff --git a/sources/base/ImageToLedsMap.cpp b/sources/base/ImageToLedsMap.cpp
index 58fd7304a..f3eea6e68 100644
--- a/sources/base/ImageToLedsMap.cpp
+++ b/sources/base/ImageToLedsMap.cpp
@@ -438,9 +438,9 @@ ColorRgb ImageToLedsMap::calcMeanColor(const Image<ColorRgb>& image) const
 	}
 
 	// Compute the average of each color channel
-	const uint8_t avgRed = uint8_t(sumRed / imageSize);
-	const uint8_t avgGreen = uint8_t(sumGreen / imageSize);
-	const uint8_t avgBlue = uint8_t(sumBlue / imageSize);
+	const uint8_t avgRed = uint8_t(sumRed / (imageSize/3));
+	const uint8_t avgGreen = uint8_t(sumGreen / (imageSize/3));
+	const uint8_t avgBlue = uint8_t(sumBlue / (imageSize/3));
 
 	// Return the computed color
 	return { avgRed, avgGreen, avgBlue };

From 8e0eff0c47b80f2c447b34cd08ca06314af4f5b3 Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Thu, 13 Oct 2022 22:51:07 +0200
Subject: [PATCH 07/10] Better scaling Zoom for LED Layout Preview creator.
 Live updates when LED properties dialog values are changing.

---
 assets/webconfig/content/light_source.html |  2 +-
 assets/webconfig/i18n/en.json              |  2 +-
 assets/webconfig/js/light_source.js        | 69 ++++++++++++++++++----
 3 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/assets/webconfig/content/light_source.html b/assets/webconfig/content/light_source.html
index a4f84d049..d0ab6788e 100644
--- a/assets/webconfig/content/light_source.html
+++ b/assets/webconfig/content/light_source.html
@@ -665,7 +665,7 @@ <h4 class="modal-title"><b><span id="ledPropertiesFormLabel"></span></b></h4>
 					</div>
 				</div>
 				<div class="card-footer">					
-					<button type="button" class="btn btn-danger float-end" data-bs-dismiss="modal"><span data-i18n="general_btn_exit">Exit</span></button>					
+					<button type="button" id="ready_to_set_single_abort" class="btn btn-danger float-end"><span data-i18n="general_btn_exit">Exit</span></button>					
 					<button type="button" id="ready_to_set_single_led" class="btn btn-primary float-end me-2"><span data-i18n="general_btn_save">Save</span></button>
 				</div>				
 			</div>
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index ead7a825c..2d4fb33c0 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -1186,5 +1186,5 @@
   "led_editor_context_moving": "Left click the mouse to accept the position",
   "conf_leds_disabled_notification" : "Some LEDs are disabled by the user!",
   "conf_leds_layout_context" : "Right click on the LED to display the context menu",
-  "conf_leds_layout_btn_zoom" : "zoom"
+  "conf_leds_layout_btn_zoom" : "Zoom"
 } 
diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index 8448845ed..93b8818e1 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -46,6 +46,10 @@ function createLedPreview(leds, origin)
 	{		
 		$('#leds_preview').css("padding-top", "100%").css("position","relative");
 	}
+	else if (origin == "zoom")
+	{		
+		$('#leds_preview').css("padding-top", "44%").css("position","relative");
+	}
 	
 	ledStarter = true;
 
@@ -973,12 +977,17 @@ $(document).ready(function()
 		toggleClass('#leds_prev_toggle_num', "btn-danger", "btn-success");
 	});
 
+	var _backupLastOrigin;
+
 	$('#leds_prev_zoom').off().on("click", function()
 	{
 		if ($('#led_zoom_panel').hasClass("col-lg-6"))
 		{
+			_backupLastOrigin = _lastOrigin;
+			_lastOrigin = "zoom";
+			 $('#ledPropertiesForm > .modal-dialog').addClass("modal-dialog-centered");
 			$('#led_zoom_panel').removeClass("col-lg-6");
-			$('#led_zoom_panel').addClass("col-lg-9");
+			$('#led_zoom_panel').addClass("col-lg-12");
 			$('#led_zoom_panel').addClass("order-1");
 			$('#hyper-subpage').children('h3').addClass("d-none");
 			$('#leds_cfg_nav').addClass("d-none");
@@ -991,8 +1000,10 @@ $(document).ready(function()
 		}
 		else
 		{
+			_lastOrigin = _backupLastOrigin;
+			$('#ledPropertiesForm > .modal-dialog').removeClass("modal-dialog-centered");
 			$('#led_zoom_panel').addClass("col-lg-6");
-			$('#led_zoom_panel').removeClass("col-lg-9");
+			$('#led_zoom_panel').removeClass("col-lg-12");
 			$('#led_zoom_panel').removeClass("order-1");
 			$('#hyper-subpage').children('h3').removeClass("d-none");
 			$('#leds_cfg_nav').removeClass("d-none");
@@ -1144,25 +1155,59 @@ $(document).ready(function()
 					$('#ledPropertiesDialogRight').val(finalLedArray[parsedIndex].hmax);
 					$('#ledPropertiesDialogBottom').val(finalLedArray[parsedIndex].vmax);
 
+					finalLedArray[parsedIndex].backup_hmin = finalLedArray[parsedIndex].hmin;
+					finalLedArray[parsedIndex].backup_vmin = finalLedArray[parsedIndex].vmin;
+					finalLedArray[parsedIndex].backup_hmax = finalLedArray[parsedIndex].hmax;
+					finalLedArray[parsedIndex].backup_vmax = finalLedArray[parsedIndex].vmax;
+
+					$('#ledPropertiesDialogLeft, #ledPropertiesDialogTop, #ledPropertiesDialogRight, #ledPropertiesDialogBottom').off("change").on("change", function() {
+						const _hmin = Number($('#ledPropertiesDialogLeft').val());
+						const _vmin = Number($('#ledPropertiesDialogTop').val());
+						const _hmax = Number($('#ledPropertiesDialogRight').val());
+						const _vmax = Number($('#ledPropertiesDialogBottom').val());
+
+						if (!isNaN(_hmin) && !isNaN(_vmin) && !isNaN(_hmax) && !isNaN(_vmax))
+							if (_hmin < _hmax && _vmin < _vmax && _hmin >= 0 && _vmin >= 0 && _hmax <= 1 && _vmax <= 1)
+							{
+								finalLedArray[parsedIndex].hmin = _hmin;
+								finalLedArray[parsedIndex].vmin = _vmin;
+								finalLedArray[parsedIndex].hmax = _hmax;
+								finalLedArray[parsedIndex].vmax = _vmax;
+
+								createLedPreview(finalLedArray, _lastOrigin);
+							}
+					});
+
+					$("#ready_to_set_single_abort").off("click").on("click", function() {
+						cancelAllContext();
+						$('#ledPropertiesForm').modal('hide');
+					});
+
 					$("#ready_to_set_single_led").off("click").on("click", function() {
 						const _hmin = Number($('#ledPropertiesDialogLeft').val());
 						const _vmin = Number($('#ledPropertiesDialogTop').val());
 						const _hmax = Number($('#ledPropertiesDialogRight').val());
 						const _vmax = Number($('#ledPropertiesDialogBottom').val());
 
-						if (_hmin < _hmax && _vmin < _vmax && _hmin >= 0 && _vmin >= 0 && _hmax <= 1 && _vmax <= 1)
-						{
-							finalLedArray[parsedIndex].hmin = _hmin;
-							finalLedArray[parsedIndex].vmin = _vmin;
-							finalLedArray[parsedIndex].hmax = _hmax;
-							finalLedArray[parsedIndex].vmax = _vmax;
+						if (!isNaN(_hmin) && !isNaN(_vmin) && !isNaN(_hmax) && !isNaN(_vmax))
+							if (_hmin < _hmax && _vmin < _vmax && _hmin >= 0 && _vmin >= 0 && _hmax <= 1 && _vmax <= 1)
+							{
+								finalLedArray[parsedIndex].hmin = _hmin;
+								finalLedArray[parsedIndex].vmin = _vmin;
+								finalLedArray[parsedIndex].hmax = _hmax;
+								finalLedArray[parsedIndex].vmax = _vmax;
 
-							requestWriteConfig({ "leds": finalLedArray });
+								delete finalLedArray[parsedIndex].backup_hmin;
+								delete finalLedArray[parsedIndex].backup_vmin;
+								delete finalLedArray[parsedIndex].backup_hmax;
+								delete finalLedArray[parsedIndex].backup_vmax;
 
-							cancelAllContext();
+								requestWriteConfig({ "leds": finalLedArray });
 
-							$('#ledPropertiesForm').modal('hide');
-						}
+								cancelAllContext();
+
+								$('#ledPropertiesForm').modal('hide');
+							}
 					});
 
 					$('#ledPropertiesForm').modal('show');

From 471e0c429375bff25faa447bfbbf49e3decee9ca Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Thu, 13 Oct 2022 23:16:49 +0200
Subject: [PATCH 08/10] CTRL allows now to select the object below

---
 assets/webconfig/i18n/en.json       |  2 +-
 assets/webconfig/js/light_source.js | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 2d4fb33c0..036c5d576 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -1185,6 +1185,6 @@
   "led_editor_context_disable": "Disable",
   "led_editor_context_moving": "Left click the mouse to accept the position",
   "conf_leds_disabled_notification" : "Some LEDs are disabled by the user!",
-  "conf_leds_layout_context" : "Right click on the LED to display the context menu",
+  "conf_leds_layout_context" : "Right click on the LED to display the context menu. With the CTRL key selects the object below.",
   "conf_leds_layout_btn_zoom" : "Zoom"
 } 
diff --git a/assets/webconfig/js/light_source.js b/assets/webconfig/js/light_source.js
index 93b8818e1..8848dc34c 100644
--- a/assets/webconfig/js/light_source.js
+++ b/assets/webconfig/js/light_source.js
@@ -1075,10 +1075,22 @@ $(document).ready(function()
 		createLedPreview(finalLedArray, _lastOrigin);
 	}	
 
+	let ctrlKey = false;
+	$(document).on('keyup keydown', function(e){ctrlKey = e.ctrlKey} );
+
 	$('.st_helper').on('contextmenu', function(e) {
 		const meTop = (e.clientY + $(window).scrollTop()) + "px";
 		const meLeft = (e.clientX + $(window).scrollLeft()) + "px";		
-		const el = document.elementFromPoint(e.clientX, e.clientY);
+		let el = document.elementFromPoint(e.clientX, e.clientY);
+
+		if (ctrlKey === true && el != null && el.classList.contains("led"))
+		{
+			el.classList.add("d-none");
+			const newEl = document.elementFromPoint(e.clientX, e.clientY);
+			el.classList.remove("d-none");
+			if (newEl != null  && newEl.classList.contains("led"))
+				el = newEl;
+		}
 
 		if (el != null && el.classList.contains("led"))
 		{

From f68448ca868169c140dae400790f60a2533120f9 Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Sun, 6 Nov 2022 15:29:29 +0100
Subject: [PATCH 09/10] Update

---
 include/base/LinearSmoothing.h                |  15 +-
 sources/base/LinearSmoothing.cpp              | 344 +++++++++---------
 .../leddevice/dev_serial/ProviderRs232.cpp    |   2 +-
 .../leddevice/schemas/schema-adalight.json    |   5 +
 4 files changed, 190 insertions(+), 176 deletions(-)

diff --git a/include/base/LinearSmoothing.h b/include/base/LinearSmoothing.h
index 496ed5823..b402bfae7 100644
--- a/include/base/LinearSmoothing.h
+++ b/include/base/LinearSmoothing.h
@@ -181,11 +181,12 @@ public slots:
 	/// smooth config list
 	QVector<SmoothingCfg> _cfgList;
 
-	unsigned	  _currentConfigId;
-	bool		  _enabled;
-	bool		  _directMode;
-	SmoothingType _smoothingType;
-	bool		  _infoUpdate;
-	bool		  _infoInput;
-	int			  debugCounter;
+	unsigned		_currentConfigId;
+	bool			_enabled;
+	bool			_directMode;
+	SmoothingType	_smoothingType;
+	bool			_infoUpdate;
+	bool			_infoInput;
+	int				_coolDown;
+	int				_debugCounter;
 };
diff --git a/sources/base/LinearSmoothing.cpp b/sources/base/LinearSmoothing.cpp
index bfb60407e..715c6c089 100644
--- a/sources/base/LinearSmoothing.cpp
+++ b/sources/base/LinearSmoothing.cpp
@@ -18,27 +18,28 @@ const double   MINIMAL_UPDATEFREQUENCY = 20;
 
 
 LinearSmoothing::LinearSmoothing(const QJsonDocument& config, HyperHdrInstance* hyperhdr)
-	: QObject(hyperhdr)
-	, _log(Logger::getInstance(QString("SMOOTHING%1").arg(hyperhdr->getInstanceIndex())))
-	, _hyperhdr(hyperhdr)
-	, _updateInterval(static_cast<int64_t>(1000 / DEFAUL_UPDATEFREQUENCY))
-	, _settlingTime(DEFAUL_SETTLINGTIME)
-	, _timer(nullptr)
-	, _continuousOutput(false)
-	, _antiFlickeringTreshold(0)
-	, _antiFlickeringStep(0)
-	, _antiFlickeringTimeout(0)
-	, _flushFrame(false)
-	, _targetTime(0)
-	, _previousTime(0)
-	, _pause(false)
-	, _currentConfigId(0)
-	, _enabled(false)
-	, _directMode(false)
-	, _smoothingType(SmoothingType::Linear)
-	, _infoUpdate(true)
-	, _infoInput(true)
-	, debugCounter(0)
+	: QObject(hyperhdr),
+	_log(Logger::getInstance(QString("SMOOTHING%1").arg(hyperhdr->getInstanceIndex()))),
+	_hyperhdr(hyperhdr),
+	_updateInterval(static_cast<int64_t>(1000 / DEFAUL_UPDATEFREQUENCY)),
+	_settlingTime(DEFAUL_SETTLINGTIME),
+	_timer(nullptr),
+	_continuousOutput(false),
+	_antiFlickeringTreshold(0),
+	_antiFlickeringStep(0),
+	_antiFlickeringTimeout(0),
+	_flushFrame(false),
+	_targetTime(0),
+	_previousTime(0),
+	_pause(false),
+	_currentConfigId(0),
+	_enabled(false),
+	_directMode(false),
+	_smoothingType(SmoothingType::Linear),
+	_infoUpdate(true),
+	_infoInput(true),
+	_coolDown(0),
+	_debugCounter(0)
 {
 	// timer
 	_timer = new QTimer(this);
@@ -68,6 +69,43 @@ inline uint8_t LinearSmoothing::clamp(int x)
 	return (x < 0) ? 0 : ((x > 255) ? 255 : uint8_t(x));
 }
 
+void LinearSmoothing::clearQueuedColors(bool deviceEnabled, bool restarting)
+{
+	try
+	{
+		Info(_log, "Clearing queued colors before: %s%s",
+			(deviceEnabled) ? "enabling" : "disabling",
+			(restarting) ? ". Smoothing configuration changed: restarting timer." : "");
+
+		if (!deviceEnabled || restarting)
+		{
+			_timer->stop();
+		}
+
+		_timer->setInterval(_updateInterval);
+		_previousValues.clear();
+		_previousTimeouts.clear();
+		_previousTime = 0;
+		_targetValues.clear();
+		_targetTime = 0;
+		_flushFrame = false;
+		_infoUpdate = true;
+		_infoInput = true;
+		_coolDown = 0;
+
+		if (deviceEnabled)
+		{
+			_timer->start();
+		}
+
+		Info(_log, "Smoothing queue is cleared");
+	}
+	catch (...)
+	{
+		Debug(_log, "Smoothing error detected");
+	}
+}
+
 void LinearSmoothing::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
 {
 	if (type == settings::type::SMOOTHING)
@@ -114,42 +152,6 @@ void LinearSmoothing::handleSettingsUpdate(settings::type type, const QJsonDocum
 	}
 }
 
-void LinearSmoothing::updateLedValues(const std::vector<ColorRgb>& ledValues)
-{
-	if (!_enabled)
-		return;
-
-	if (_directMode)
-	{
-		if (_timer->remainingTime() >= 0)
-			clearQueuedColors();
-
-		if (_pause || ledValues.size() == 0)
-			return;
-
-		emit _hyperhdr->ledDeviceData(ledValues);
-
-		return;
-	}
-
-	try
-	{
-		if (_infoInput)
-			Info(_log, "Using %s smoothing input (%i)", ((_smoothingType == SmoothingType::Alternative) ? "alternative" : "linear"), _currentConfigId);
-
-		_infoInput = false;
-		LinearSetup(ledValues);		
-	}
-	catch (...)
-	{
-		Debug(_log, "Smoothing error detected");
-	}
-
-	return;
-}
-
-
-
 void LinearSmoothing::Antiflickering()
 {
 	if (_antiFlickeringTreshold > 0 && _antiFlickeringStep > 0 && _previousValues.size() == _targetValues.size() && _previousValues.size() == _previousTimeouts.size())
@@ -191,6 +193,42 @@ void LinearSmoothing::Antiflickering()
 	}
 }
 
+void LinearSmoothing::updateLedValues(const std::vector<ColorRgb>& ledValues)
+{
+	if (!_enabled)
+		return;
+
+	_coolDown = 1;
+
+	if (_directMode)
+	{
+		if (_timer->remainingTime() >= 0)
+			clearQueuedColors();
+
+		if (_pause || ledValues.size() == 0)
+			return;
+
+		emit _hyperhdr->ledDeviceData(ledValues);
+
+		return;
+	}
+
+	try
+	{
+		if (_infoInput)
+			Info(_log, "Using %s smoothing input (%i)", ((_smoothingType == SmoothingType::Alternative) ? "alternative" : "linear"), _currentConfigId);
+
+		_infoInput = false;
+		LinearSetup(ledValues);
+	}
+	catch (...)
+	{
+		Debug(_log, "Smoothing error detected");
+	}
+
+	return;
+}
+
 void LinearSmoothing::LinearSetup(const std::vector<ColorRgb>& ledValues)
 {
 	_targetTime = InternalClock::nowPrecise() + _settlingTime;
@@ -247,74 +285,6 @@ inline uint8_t LinearSmoothing::computeAdvColor(int limitMin, int limitAverage,
 		return std::ceil(kMin * val);
 }
 
-void LinearSmoothing::LinearSmoothingProcessing(bool correction)
-{
-	float kOrg, kMin, kMid, kAbove, kMax;
-	int64_t now = InternalClock::nowPrecise();
-	int64_t deltaTime = _targetTime - now;
-	int64_t k;
-
-	int aspectLow = 16;
-	int aspectMid = 32;
-	int aspectHigh = 60;
-
-
-	if (deltaTime <= 0 || _targetTime <= _previousTime)
-	{
-		_previousValues = _targetValues;
-		_previousTimeouts.clear();
-		_previousTimeouts.resize(_previousValues.size(), now);
-
-		_previousTime = now;
-
-		if (_flushFrame)
-			queueColors(_previousValues);
-
-		_flushFrame = _continuousOutput;
-	}
-	else
-	{
-		_flushFrame = true;
-
-		if (correction)
-			setupAdvColor(deltaTime, kOrg, kMin, kMid, kAbove, kMax);
-		else
-			k = std::max((1 << 8) - (deltaTime << 8) / (_targetTime - _previousTime), static_cast<int64_t>(1));
-
-		int redDiff = 0, greenDiff = 0, blueDiff = 0;
-
-		if (_previousValues.size() != _targetValues.size())
-		{
-			Error(_log, "Detect abnormal state. Previuos value: %d, new value: %d", _previousValues.size(), _targetValues.size());
-		}
-		else
-		{
-			for (size_t i = 0; i < _previousValues.size(); i++)
-			{
-				ColorRgb& prev = _previousValues[i];
-				ColorRgb& target = _targetValues[i];
-
-				redDiff = target.red - prev.red;
-				greenDiff = target.green - prev.green;
-				blueDiff = target.blue - prev.blue;
-
-				if (redDiff != 0)
-					prev.red += (redDiff < 0 ? -1 : 1) *
-								((correction) ? computeAdvColor(aspectLow, aspectMid, aspectHigh, kMin, kMid, kAbove, kMax, redDiff) : computeColor(k, redDiff));
-				if (greenDiff != 0)
-					prev.green += (greenDiff < 0 ? -1 : 1) *
-								((correction) ? computeAdvColor(aspectLow, aspectMid, aspectHigh, kMin, kMid, kAbove, kMax, greenDiff) : computeColor(k, greenDiff));
-				if (blueDiff != 0)
-					prev.blue += (blueDiff < 0 ? -1 : 1) *
-								((correction) ? computeAdvColor(aspectLow, aspectMid, aspectHigh, kMin, kMid, kAbove, kMax, blueDiff) : computeColor(k, blueDiff));
-			}
-		}
-		_previousTime = now;
-
-		queueColors(_previousValues);
-	}
-}
-
 void LinearSmoothing::updateLeds()
 {
 	try
@@ -350,42 +320,6 @@ void LinearSmoothing::queueColors(const std::vector<ColorRgb>& ledColors)
 	}
 }
 
-void LinearSmoothing::clearQueuedColors(bool deviceEnabled, bool restarting)
-{
-	try
-	{
-		Info(_log, "Clearing queued colors before: %s%s",
-			(deviceEnabled) ? "enabling" : "disabling",
-			(restarting) ? ". Smoothing configuration changed: restarting timer." : "");
-
-		if (!deviceEnabled || restarting)
-		{
-			_timer->stop();
-		}
-
-		_timer->setInterval(_updateInterval);
-		_previousValues.clear();
-		_previousTimeouts.clear();
-		_previousTime = 0;
-		_targetValues.clear();
-		_targetTime = 0;
-		_flushFrame = false;
-		_infoUpdate = true;
-		_infoInput = true;
-
-		if (deviceEnabled)
-		{
-			_timer->start();
-		}
-
-		Info(_log, "Smoothing queue is cleared");
-	}
-	catch (...)
-	{
-		Debug(_log, "Smoothing error detected");
-	}
-}
-
 void LinearSmoothing::componentStateChange(hyperhdr::Components component, bool state)
 {
 	_flushFrame = state;
@@ -520,36 +454,110 @@ QString LinearSmoothing::SmoothingCfg::EnumToString(SmoothingType type)
 	return QString("Unknown");
 }
 
+void LinearSmoothing::LinearSmoothingProcessing(bool correction)
+{
+	float kOrg, kMin, kMid, kAbove, kMax;
+	int64_t now = InternalClock::nowPrecise();
+	int64_t deltaTime = _targetTime - now;
+	int64_t k;
+
+	int aspectLow = 16;
+	int aspectMid = 32;
+	int aspectHigh = 60;
+
+
+	if (deltaTime <= 0 || _targetTime <= _previousTime)
+	{
+		_previousValues = _targetValues;
+		_previousTimeouts.clear();
+		_previousTimeouts.resize(_previousValues.size(), now);
+
+		_previousTime = now;
+
+		if (_flushFrame)
+			queueColors(_previousValues);
+
+		if (!_continuousOutput && _coolDown > 0)
+		{
+			_coolDown--;
+			_flushFrame = true;
+		}
+		else
+			_flushFrame = _continuousOutput;
+	}
+	else
+	{
+		_flushFrame = true;
+
+		if (correction)
+			setupAdvColor(deltaTime, kOrg, kMin, kMid, kAbove, kMax);
+		else
+			k = std::max((1 << 8) - (deltaTime << 8) / (_targetTime - _previousTime), static_cast<int64_t>(1));
+
+		int redDiff = 0, greenDiff = 0, blueDiff = 0;
+
+		if (_previousValues.size() != _targetValues.size())
+		{
+			Error(_log, "Detect abnormal state. Previuos value: %d, new value: %d", _previousValues.size(), _targetValues.size());
+		}
+		else
+		{
+			for (size_t i = 0; i < _previousValues.size(); i++)
+			{
+				ColorRgb& prev = _previousValues[i];
+				ColorRgb& target = _targetValues[i];
+
+				redDiff = target.red - prev.red;
+				greenDiff = target.green - prev.green;
+				blueDiff = target.blue - prev.blue;
+
+				if (redDiff != 0)
+					prev.red += (redDiff < 0 ? -1 : 1) *
+					((correction) ? computeAdvColor(aspectLow, aspectMid, aspectHigh, kMin, kMid, kAbove, kMax, redDiff) : computeColor(k, redDiff));
+				if (greenDiff != 0)
+					prev.green += (greenDiff < 0 ? -1 : 1) *
+					((correction) ? computeAdvColor(aspectLow, aspectMid, aspectHigh, kMin, kMid, kAbove, kMax, greenDiff) : computeColor(k, greenDiff));
+				if (blueDiff != 0)
+					prev.blue += (blueDiff < 0 ? -1 : 1) *
+					((correction) ? computeAdvColor(aspectLow, aspectMid, aspectHigh, kMin, kMid, kAbove, kMax, blueDiff) : computeColor(k, blueDiff));
+			}
+		}
+		_previousTime = now;
+
+		queueColors(_previousValues);
+	}
+}
+
 void LinearSmoothing::DebugOutput()
 {
-	/*debugCounter = std::min(debugCounter+1,900);
-	if (_targetValues.size() > 0 && debugCounter < 900)
+	/*_debugCounter = std::min(_debugCounter+1,900);
+	if (_targetValues.size() > 0 && _debugCounter < 900)
 	{
-		if (debugCounter < 100 || (debugCounter > 200 && debugCounter < 300) || (debugCounter > 400 && debugCounter < 500) || (debugCounter > 600 && debugCounter < 700) || debugCounter>800)
+		if (_debugCounter < 100 || (_debugCounter > 200 && _debugCounter < 300) || (_debugCounter > 400 && _debugCounter < 500) || (_debugCounter > 600 && _debugCounter < 700) || _debugCounter>800)
 		{
 			_targetValues[0].red = 0;
 			_targetValues[0].green = 0;
 			_targetValues[0].blue = 0;
 		}
-		else if (debugCounter >= 100 && debugCounter <= 200)
+		else if (_debugCounter >= 100 && _debugCounter <= 200)
 		{
 			_targetValues[0].red = 255;
 			_targetValues[0].green = 255;
 			_targetValues[0].blue = 255;
 		}
-		else if (debugCounter >= 300 && debugCounter <= 400)
+		else if (_debugCounter >= 300 && _debugCounter <= 400)
 		{
 			_targetValues[0].red = 255;
 			_targetValues[0].green = 0;
 			_targetValues[0].blue = 0;
 		}
-		else if (debugCounter >= 500 && debugCounter <= 600)
+		else if (_debugCounter >= 500 && _debugCounter <= 600)
 		{
 			_targetValues[0].red = 0;
 			_targetValues[0].green = 255;
 			_targetValues[0].blue = 0;
 		}
-		else if (debugCounter >= 700 && debugCounter <= 800)
+		else if (_debugCounter >= 700 && _debugCounter <= 800)
 		{
 			_targetValues[0].red = 0;
 			_targetValues[0].green = 0;
diff --git a/sources/leddevice/dev_serial/ProviderRs232.cpp b/sources/leddevice/dev_serial/ProviderRs232.cpp
index f87be2f7b..d8d6542b5 100644
--- a/sources/leddevice/dev_serial/ProviderRs232.cpp
+++ b/sources/leddevice/dev_serial/ProviderRs232.cpp
@@ -45,7 +45,7 @@ bool ProviderRs232::init(const QJsonObject& deviceConfig)
 
 		_isAutoDeviceName = _deviceName.toLower() == "auto";
 		_baudRate_Hz = deviceConfig["rate"].toInt();
-		_delayAfterConnect_ms = deviceConfig["delayAfterConnect"].toInt(1500);
+		_delayAfterConnect_ms = deviceConfig["delayAfterConnect"].toInt(0);
 
 		Debug(_log, "deviceName   : %s", QSTRING_CSTR(_deviceName));
 		Debug(_log, "AutoDevice   : %d", _isAutoDeviceName);
diff --git a/sources/leddevice/schemas/schema-adalight.json b/sources/leddevice/schemas/schema-adalight.json
index 88d07c0f8..364432d69 100644
--- a/sources/leddevice/schemas/schema-adalight.json
+++ b/sources/leddevice/schemas/schema-adalight.json
@@ -105,6 +105,11 @@
 			"default": 0,
 			"append" : "ms",
 			"access" : "expert",
+			"options": {
+				"dependencies": {
+					"awa_mode": false
+				}
+			},
 			"propertyOrder" : 9
 		},
 		"lightberry_apa102_mode": {

From 50bbaed361d66826c303ae1603f38919e78eae07 Mon Sep 17 00:00:00 2001
From: Awawa <mail4awawa@gmail.com>
Date: Sun, 6 Nov 2022 18:31:55 +0100
Subject: [PATCH 10/10] Update

---
 sources/utils/ImageData.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/utils/ImageData.cpp b/sources/utils/ImageData.cpp
index 69f46043f..dcc00a142 100644
--- a/sources/utils/ImageData.cpp
+++ b/sources/utils/ImageData.cpp
@@ -37,7 +37,7 @@
 
 #define LOCAL_VID_ALIGN_SIZE       16
 
-static_assert (sizeof(ColorRgb) < LOCAL_VID_ALIGN_SIZE && sizeof(ColorRgb) <= sizeof(uint64_t));
+static_assert (sizeof(ColorRgb) < LOCAL_VID_ALIGN_SIZE && sizeof(ColorRgb) <= sizeof(uint64_t), "Unexpected image size");
 
 template <typename ColorSpace>
 VideoMemoryManager ImageData<ColorSpace>::videoCache;