From 171f075959a65f3a20df92ef2702bc60f9b0276f Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Fri, 31 Mar 2017 16:14:59 +0200
Subject: [PATCH 1/8] clean color adjustment

---
 include/utils/RgbChannelAdjustment.h       | 21 +++---------
 libsrc/hyperion/MultiColorAdjustment.cpp   | 40 +++++-----------------
 libsrc/jsonserver/JsonClientConnection.cpp | 32 +++++------------
 libsrc/utils/RgbChannelAdjustment.cpp      | 35 ++++---------------
 4 files changed, 27 insertions(+), 101 deletions(-)

diff --git a/include/utils/RgbChannelAdjustment.h b/include/utils/RgbChannelAdjustment.h
index fae861b6b..88bb9aeab 100644
--- a/include/utils/RgbChannelAdjustment.h
+++ b/include/utils/RgbChannelAdjustment.h
@@ -21,6 +21,10 @@ class RgbChannelAdjustment
 
 	/// Destructor
 	~RgbChannelAdjustment();
+	
+	/// Transform the given array value
+	/// @param input The input color bytes
+	void apply(uint8_t input, uint8_t & red, uint8_t & green, uint8_t & blue);
 
 	/// setAdjustment RGB
 	/// @param adjustR  
@@ -31,29 +35,12 @@ class RgbChannelAdjustment
 	/// @return The current adjustR value
 	uint8_t getAdjustmentR() const;
 
-	/// @param threshold New adjustR value
-	void setAdjustmentR(uint8_t adjustR);
-
 	/// @return The current adjustG value
 	uint8_t getAdjustmentG() const;
 
-	/// @param gamma New adjustG value
-	void setAdjustmentG(uint8_t adjustG);
-
 	/// @return The current adjustB value
 	uint8_t getAdjustmentB() const;
 
-	/// @param blacklevel New adjustB value
-	void setAdjustmentB(uint8_t adjustB);
-
-	/// Transform the given array value
-	/// @param input The input color bytes
-	/// @return The corrected byte value
-	uint8_t getAdjustmentR(uint8_t inputR) const;
-	uint8_t getAdjustmentG(uint8_t inputG) const;
-	uint8_t getAdjustmentB(uint8_t inputB) const;
-
-
 private:
 	/// color channels
 	enum ColorChannel { RED=0,GREEN=1, BLUE=2 };
diff --git a/libsrc/hyperion/MultiColorAdjustment.cpp b/libsrc/hyperion/MultiColorAdjustment.cpp
index 8af98804c..6bab6382c 100644
--- a/libsrc/hyperion/MultiColorAdjustment.cpp
+++ b/libsrc/hyperion/MultiColorAdjustment.cpp
@@ -123,37 +123,15 @@ void MultiColorAdjustment::applyAdjustment(std::vector<ColorRgb>& ledColors)
 		uint8_t yellow  = rg  *(255-oblue)/65025;
 		uint8_t white   = rg  *(oblue)    /65025;
 		
-		uint8_t OR = adjustment->_rgbBlackAdjustment.getAdjustmentR(black);
-		uint8_t OG = adjustment->_rgbBlackAdjustment.getAdjustmentG(black);
-		uint8_t OB = adjustment->_rgbBlackAdjustment.getAdjustmentB(black);
-		
-		uint8_t RR = adjustment->_rgbRedAdjustment.getAdjustmentR(red);
-		uint8_t	RG = adjustment->_rgbRedAdjustment.getAdjustmentG(red);
-		uint8_t	RB = adjustment->_rgbRedAdjustment.getAdjustmentB(red);
-		
-		uint8_t GR = adjustment->_rgbGreenAdjustment.getAdjustmentR(green);
-		uint8_t	GG = adjustment->_rgbGreenAdjustment.getAdjustmentG(green);
-		uint8_t	GB = adjustment->_rgbGreenAdjustment.getAdjustmentB(green);
-		
-		uint8_t BR = adjustment->_rgbBlueAdjustment.getAdjustmentR(blue);
-		uint8_t	BG = adjustment->_rgbBlueAdjustment.getAdjustmentG(blue);
-		uint8_t	BB = adjustment->_rgbBlueAdjustment.getAdjustmentB(blue);
-		
-		uint8_t CR = adjustment->_rgbCyanAdjustment.getAdjustmentR(cyan);
-		uint8_t CG = adjustment->_rgbCyanAdjustment.getAdjustmentG(cyan);
-		uint8_t CB = adjustment->_rgbCyanAdjustment.getAdjustmentB(cyan);
-		
-		uint8_t MR = adjustment->_rgbMagentaAdjustment.getAdjustmentR(magenta);
-		uint8_t MG = adjustment->_rgbMagentaAdjustment.getAdjustmentG(magenta);
-		uint8_t MB = adjustment->_rgbMagentaAdjustment.getAdjustmentB(magenta);
-		
-		uint8_t YR = adjustment->_rgbYellowAdjustment.getAdjustmentR(yellow);
-		uint8_t YG = adjustment->_rgbYellowAdjustment.getAdjustmentG(yellow);
-		uint8_t YB = adjustment->_rgbYellowAdjustment.getAdjustmentB(yellow);
-		
-		uint8_t WR = adjustment->_rgbWhiteAdjustment.getAdjustmentR(white);
-		uint8_t WG = adjustment->_rgbWhiteAdjustment.getAdjustmentG(white);
-		uint8_t WB = adjustment->_rgbWhiteAdjustment.getAdjustmentB(white);
+		uint8_t OR, OG, OB, RR, RG, RB, GR, GG, GB, BR, BG, BB, CR, CG, CB, MR, MG, MB, YR, YG, YB, WR, WG, WB;
+		adjustment->_rgbBlackAdjustment.apply(black, OR, OG, OB);
+		adjustment->_rgbRedAdjustment.apply(red, RR, RG, RB);
+		adjustment->_rgbGreenAdjustment.apply(green, GR, GG, GB);
+		adjustment->_rgbBlueAdjustment.apply(blue, BR, BG, BB);
+		adjustment->_rgbCyanAdjustment.apply(cyan, CR, CG, CB);
+		adjustment->_rgbMagentaAdjustment.apply(magenta, MR, MG, MB);
+		adjustment->_rgbYellowAdjustment.apply(yellow, YR, YG, YB);
+		adjustment->_rgbWhiteAdjustment.apply(white, WR, WG, WB);
 
 		color.red   = OR + RR + GR + BR + CR + MR + YR + WR;
 		color.green = OG + RG + GG + BG + CG + MG + YG + WG;
diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp
index 08992d7a8..ba2465476 100644
--- a/libsrc/jsonserver/JsonClientConnection.cpp
+++ b/libsrc/jsonserver/JsonClientConnection.cpp
@@ -893,60 +893,44 @@ void JsonClientConnection::handleAdjustmentCommand(const QJsonObject& message, c
 	if (adjustment.contains("red"))
 	{
 		const QJsonArray & values = adjustment["red"].toArray();
-		colorAdjustment->_rgbRedAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbRedAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbRedAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbRedAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}
 
 	if (adjustment.contains("green"))
 	{
 		const QJsonArray & values = adjustment["green"].toArray();
-		colorAdjustment->_rgbGreenAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbGreenAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbGreenAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbGreenAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}
 
 	if (adjustment.contains("blue"))
 	{
 		const QJsonArray & values = adjustment["blue"].toArray();
-		colorAdjustment->_rgbBlueAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbBlueAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbBlueAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbBlueAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}	
 	if (adjustment.contains("cyan"))
 	{
 		const QJsonArray & values = adjustment["cyan"].toArray();
-		colorAdjustment->_rgbCyanAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbCyanAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbCyanAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbCyanAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}	
 	if (adjustment.contains("magenta"))
 	{
 		const QJsonArray & values = adjustment["magenta"].toArray();
-		colorAdjustment->_rgbMagentaAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbMagentaAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbMagentaAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbMagentaAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}	
 	if (adjustment.contains("yellow"))
 	{
 		const QJsonArray & values = adjustment["yellow"].toArray();
-		colorAdjustment->_rgbYellowAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbYellowAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbYellowAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbYellowAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}	
 	if (adjustment.contains("black"))
 	{
 		const QJsonArray & values = adjustment["black"].toArray();
-		colorAdjustment->_rgbBlackAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbBlackAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbBlackAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbBlackAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}	
 	if (adjustment.contains("white"))
 	{
 		const QJsonArray & values = adjustment["white"].toArray();
-		colorAdjustment->_rgbWhiteAdjustment.setAdjustmentR(values[0u].toInt());
-		colorAdjustment->_rgbWhiteAdjustment.setAdjustmentG(values[1u].toInt());
-		colorAdjustment->_rgbWhiteAdjustment.setAdjustmentB(values[2u].toInt());
+		colorAdjustment->_rgbWhiteAdjustment.setAdjustment(values[0u].toInt(), values[1u].toInt(), values[2u].toInt());
 	}	
 
 	if (adjustment.contains("gammaRed"))
diff --git a/libsrc/utils/RgbChannelAdjustment.cpp b/libsrc/utils/RgbChannelAdjustment.cpp
index 53c2b350e..f5c76c2d3 100644
--- a/libsrc/utils/RgbChannelAdjustment.cpp
+++ b/libsrc/utils/RgbChannelAdjustment.cpp
@@ -26,9 +26,9 @@ RgbChannelAdjustment::~RgbChannelAdjustment()
 
 void RgbChannelAdjustment::setAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB)
 {
-	_adjust[RED] = adjustR;
+	_adjust[RED]   = adjustR;
 	_adjust[GREEN] = adjustG;
-	_adjust[BLUE] = adjustB;
+	_adjust[BLUE]  = adjustB;
 	initializeMapping();
 }
 
@@ -37,44 +37,21 @@ uint8_t RgbChannelAdjustment::getAdjustmentR() const
 	return _adjust[RED];
 }
 
-void RgbChannelAdjustment::setAdjustmentR(uint8_t adjustR)
-{
-	setAdjustment(adjustR, _adjust[GREEN], _adjust[BLUE]);
-}
-
 uint8_t RgbChannelAdjustment::getAdjustmentG() const
 {
 	return _adjust[GREEN];
 }
 
-void RgbChannelAdjustment::setAdjustmentG(uint8_t adjustG)
-{
-	setAdjustment(_adjust[RED], adjustG, _adjust[BLUE]);
-}
-
 uint8_t RgbChannelAdjustment::getAdjustmentB() const
 {
 	return _adjust[BLUE];
 }
 
-void RgbChannelAdjustment::setAdjustmentB(uint8_t adjustB)
-{
-	setAdjustment(_adjust[RED], _adjust[GREEN], adjustB);
-}
-
-uint8_t RgbChannelAdjustment::getAdjustmentR(uint8_t inputR) const
-{
-	return _mapping[RED][inputR];
-}
-
-uint8_t RgbChannelAdjustment::getAdjustmentG(uint8_t inputG) const
-{
-	return _mapping[GREEN][inputG];
-}
-
-uint8_t RgbChannelAdjustment::getAdjustmentB(uint8_t inputB) const
+void RgbChannelAdjustment::apply(uint8_t input, uint8_t & red, uint8_t & green, uint8_t & blue)
 {
-	return _mapping[BLUE][inputB];
+	red   = _mapping[RED][input];
+	green = _mapping[GREEN][input];
+	blue  = _mapping[BLUE][input];
 }
 
 void RgbChannelAdjustment::initializeMapping()

From 64d95689641f398cf4ec6b99a0b8342deff5b6ad Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Fri, 31 Mar 2017 19:52:11 +0200
Subject: [PATCH 2/8] now a prio duration of "0" means infinity

---
 libsrc/hyperion/PriorityMuxer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsrc/hyperion/PriorityMuxer.cpp b/libsrc/hyperion/PriorityMuxer.cpp
index 611d0650d..540afabb1 100644
--- a/libsrc/hyperion/PriorityMuxer.cpp
+++ b/libsrc/hyperion/PriorityMuxer.cpp
@@ -91,7 +91,7 @@ void PriorityMuxer::setCurrentTime(const int64_t& now)
 
 	for (auto infoIt = _activeInputs.begin(); infoIt != _activeInputs.end();)
 	{
-		if (infoIt->timeoutTime_ms != -1 && infoIt->timeoutTime_ms <= now)
+		if (infoIt->timeoutTime_ms > 0 && infoIt->timeoutTime_ms <= now)
 		{
 			infoIt = _activeInputs.erase(infoIt);
 		}

From cb8eb2bb2c00b5c0cf82c8a0420c3472135dce0d Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Fri, 31 Mar 2017 20:41:37 +0200
Subject: [PATCH 3/8] implement dynamic 'just in time' initialization

---
 include/utils/RgbChannelAdjustment.h  |  9 +++++---
 libsrc/utils/RgbChannelAdjustment.cpp | 31 ++++++++++++++++-----------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/include/utils/RgbChannelAdjustment.h b/include/utils/RgbChannelAdjustment.h
index 88bb9aeab..6b5c00b9e 100644
--- a/include/utils/RgbChannelAdjustment.h
+++ b/include/utils/RgbChannelAdjustment.h
@@ -45,9 +45,9 @@ class RgbChannelAdjustment
 	/// color channels
 	enum ColorChannel { RED=0,GREEN=1, BLUE=2 };
 
-	/// (re)-initilize the color mapping
-	void initializeMapping();
-	
+	/// reset init of color mapping
+	void resetInitialized();
+
 	/// The adjustment of RGB channel
 	uint8_t _adjust[3];
 	
@@ -59,4 +59,7 @@ class RgbChannelAdjustment
 
 	/// Logger instance
 	Logger * _log;
+
+	bool _initialized[256];
+
 };
diff --git a/libsrc/utils/RgbChannelAdjustment.cpp b/libsrc/utils/RgbChannelAdjustment.cpp
index f5c76c2d3..426b21a1c 100644
--- a/libsrc/utils/RgbChannelAdjustment.cpp
+++ b/libsrc/utils/RgbChannelAdjustment.cpp
@@ -10,7 +10,7 @@ RgbChannelAdjustment::RgbChannelAdjustment(QString channelName)
 	: _channelName(channelName)
 	, _log(Logger::getInstance(channelName))
 {
-	//setAdjustment(UINT8_MAX, UINT8_MAX, UINT8_MAX);
+	resetInitialized();
 }
 
 RgbChannelAdjustment::RgbChannelAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName)
@@ -24,12 +24,21 @@ RgbChannelAdjustment::~RgbChannelAdjustment()
 {
 }
 
+void RgbChannelAdjustment::resetInitialized()
+{
+	Debug(_log, "initialize mapping with %d,%d,%d", _adjust[RED], _adjust[GREEN], _adjust[BLUE]);
+	for(int idx=0;idx<256;idx++)
+	{
+		_initialized[idx] = false;
+	}
+}
+
 void RgbChannelAdjustment::setAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB)
 {
 	_adjust[RED]   = adjustR;
 	_adjust[GREEN] = adjustG;
 	_adjust[BLUE]  = adjustB;
-	initializeMapping();
+	resetInitialized();
 }
 
 uint8_t RgbChannelAdjustment::getAdjustmentR() const
@@ -49,18 +58,14 @@ uint8_t RgbChannelAdjustment::getAdjustmentB() const
 
 void RgbChannelAdjustment::apply(uint8_t input, uint8_t & red, uint8_t & green, uint8_t & blue)
 {
+	if (!_initialized[input])
+	{
+		_mapping[0][input] = std::min( (((unsigned)input * _adjust[0]) / UINT8_MAX), (unsigned)UINT8_MAX);
+		_mapping[1][input] = std::min( (((unsigned)input * _adjust[1]) / UINT8_MAX), (unsigned)UINT8_MAX);
+		_mapping[2][input] = std::min( (((unsigned)input * _adjust[2]) / UINT8_MAX), (unsigned)UINT8_MAX);
+		_initialized[input] = true;
+	}
 	red   = _mapping[RED][input];
 	green = _mapping[GREEN][input];
 	blue  = _mapping[BLUE][input];
 }
-
-void RgbChannelAdjustment::initializeMapping()
-{
-	Debug(_log, "initialize mapping with %d,%d,%d", _adjust[RED], _adjust[GREEN], _adjust[BLUE]);
-	// initialize linear mapping
-	for (unsigned channel=0; channel<3; channel++)
-		for (unsigned idx=0; idx<=UINT8_MAX; idx++)
-		{
-			_mapping[channel][idx] = std::min( ((idx * _adjust[channel]) / UINT8_MAX), (unsigned)UINT8_MAX);
-		}
-}

From bc5d7fb3c5a2b74437cf83838a2b6c057cb6f459 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Sun, 2 Apr 2017 06:43:48 +0200
Subject: [PATCH 4/8] implement new brightness handling

---
 assets/webconfig/i18n/de.json                 |  6 +-
 assets/webconfig/i18n/en.json                 |  2 +
 assets/webconfig/js/content_remote.js         |  4 +-
 assets/webconfig/js/ui_utils.js               |  6 +-
 config/hyperion.config.json.commented         |  3 +-
 config/hyperion.config.json.default           |  3 +-
 include/utils/RgbChannelAdjustment.h          |  5 +-
 include/utils/RgbTransform.h                  | 21 ++++--
 libsrc/hyperion/Hyperion.cpp                  |  5 +-
 libsrc/hyperion/MultiColorAdjustment.cpp      | 22 +++---
 libsrc/hyperion/PriorityMuxer.cpp             |  2 +-
 .../hyperion/schemas/hyperion.schema-2.json   | 27 ++++---
 libsrc/jsonserver/JsonClientConnection.cpp    |  9 ++-
 .../jsonserver/schema/schema-adjustment.json  | 12 +++-
 libsrc/utils/RgbChannelAdjustment.cpp         | 24 ++++---
 libsrc/utils/RgbTransform.cpp                 | 70 ++++++++++++++-----
 src/hyperion-remote/JsonConnection.cpp        |  7 +-
 src/hyperion-remote/JsonConnection.h          |  3 +-
 src/hyperion-remote/hyperion-remote.cpp       | 11 +--
 19 files changed, 167 insertions(+), 75 deletions(-)

diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json
index a87e3c75b..52b8dc6b1 100644
--- a/assets/webconfig/i18n/de.json
+++ b/assets/webconfig/i18n/de.json
@@ -439,8 +439,10 @@
 	"edt_conf_color_backlightThreshold_expl" : "Eine Beleuchtung die dauerhaft aktiv ist. (Automatisch deaktiviert bei Effekten, Farben oder im Zustand \"Aus\")",
 	"edt_conf_color_backlightColored_title" : "Farbige Hintergrund - beleuchtung",
 	"edt_conf_color_backlightColored_expl" : "Die Hintergrundbeleuchtung kann mit oder ohne Farbanteile genutzt werden.",
-	"edt_conf_color_brightness_title" : "Maximale Helligkeit",
-	"edt_conf_color_brightness_expl" : "Zwischen 0.0 und 0.5 ist die Helligkeit linearisiert. Von 0.5 bis 1.0 wird cyan, magenta und gelb bis zu 2x heller und weiß bis zu 3x.",
+	"edt_conf_color_brightness_title" : "Helligkeit",
+	"edt_conf_color_brightness_expl" : "die desamt Helligkeit",
+	"edt_conf_color_brightnessComp_title" : "Helligkeits Kompensation",
+	"edt_conf_color_brightnessComp_expl" : "Kompensiert unterschiede in der Helligkeit zwischen RGB, CMY und weiß. 100 ist volle Kompensation, 0 keine Kompensation",
 	"edt_conf_smooth_heading_title" : "Glättung",
 	"edt_conf_smooth_type_title" : "Art",
 	"edt_conf_smooth_type_expl" : "Algorithmus der Glättung.",
diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 7bbf01737..41d869b99 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -442,6 +442,8 @@
 	"edt_conf_color_backlightColored_expl" : "Add some color to your backlight.",
 	"edt_conf_color_brightness_title" : "maximal brightness",
 	"edt_conf_color_brightness_expl" : "From 0.0 to 0.5 the brightness is linearised, from 0.5 to 1.0 cyan, magenta, yellow is up to 2x brighter and white 3x.",
+	"edt_conf_color_brightnessComp_title" : "Brightness Compensation",
+	"edt_conf_color_brightnessComp_expl" : "compensates bightness differences between RGB, CMY and white. 100 means full compensation, 0 no compensation",
 	"edt_conf_smooth_heading_title" : "Smoothing",
 	"edt_conf_smooth_type_title" : "Type",
 	"edt_conf_smooth_type_expl" : "Type of smoothing.",
diff --git a/assets/webconfig/js/content_remote.js b/assets/webconfig/js/content_remote.js
index 258068683..f8a9eea41 100644
--- a/assets/webconfig/js/content_remote.js
+++ b/assets/webconfig/js/content_remote.js
@@ -53,8 +53,10 @@ $(document).ready(function() {
 			}
 			else
 			{
-				if(sColor[key].key == "brightness" || sColor[key].key == "backlightThreshold")
+				if(sColor[key].key == "backlightThreshold")
 					property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0" max="1.0" step="0.05" value="'+value+'"/>';
+				else if(sColor[key].key == "brightness" || sColor[key].key == "brightnessCompensation")
+					property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0" max="100" step="10" value="'+value+'"/>';
 				else
 					property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0.1" max="4.0" step="0.1" value="'+value+'"/>';
 				
diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js
index 9893e391e..9ca37938e 100644
--- a/assets/webconfig/js/ui_utils.js
+++ b/assets/webconfig/js/ui_utils.js
@@ -235,14 +235,14 @@ function valValue(id,value,min,max)
 {
 	if(typeof max === 'undefined' || max == "")
 		max = 999999;
-	
-	if(value > max)	
+
+	if(Number(value) > Number(max))	
 	{
 		$('#'+id).val(max);
 		showInfoDialog("warning","",$.i18n('edt_msg_error_maximum_incl',max));
 		return max;
 	}
-	else if(value < min)
+	else if(Number(value) < Number(min))
 	{
 		$('#'+id).val(min);
 		showInfoDialog("warning","",$.i18n('edt_msg_error_minimum_incl',min));
diff --git a/config/hyperion.config.json.commented b/config/hyperion.config.json.commented
index 0902c5d21..407b55200 100644
--- a/config/hyperion.config.json.commented
+++ b/config/hyperion.config.json.commented
@@ -74,7 +74,8 @@
 				"gammaBlue"  : 1.5,
 				"backlightThreshold"  : 0.0,
 				"backlightColored"  : false,
-				"brightness" : 0.5
+				"brightness" : 100,
+				"brightnessCompensation" : 80
 			}
 		]
 	},
diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default
index 0533f799c..9d781b242 100644
--- a/config/hyperion.config.json.default
+++ b/config/hyperion.config.json.default
@@ -40,7 +40,8 @@
 				"gammaBlue"  : 1.5,
 				"backlightThreshold"  : 0.0,
 				"backlightColored"  : false,
-				"brightness" : 0.75
+				"brightness" : 100,
+				"brightnessCompensation" : 80
 			}
 		]
 	},
diff --git a/include/utils/RgbChannelAdjustment.h b/include/utils/RgbChannelAdjustment.h
index 6b5c00b9e..80dfbe15b 100644
--- a/include/utils/RgbChannelAdjustment.h
+++ b/include/utils/RgbChannelAdjustment.h
@@ -24,7 +24,7 @@ class RgbChannelAdjustment
 	
 	/// Transform the given array value
 	/// @param input The input color bytes
-	void apply(uint8_t input, uint8_t & red, uint8_t & green, uint8_t & blue);
+	void apply(uint8_t input, uint8_t brightness, uint8_t & red, uint8_t & green, uint8_t & blue);
 
 	/// setAdjustment RGB
 	/// @param adjustR  
@@ -61,5 +61,6 @@ class RgbChannelAdjustment
 	Logger * _log;
 
 	bool _initialized[256];
-
+	
+	uint8_t _brightness;
 };
diff --git a/include/utils/RgbTransform.h b/include/utils/RgbTransform.h
index 32523362e..ea52496ec 100644
--- a/include/utils/RgbTransform.h
+++ b/include/utils/RgbTransform.h
@@ -24,7 +24,7 @@ class RgbTransform
 	/// @param backlightColored use color in backlight
 	/// @param brightnessHigh The used higher brightness
 	///
-	RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, double brightnessHigh);
+	RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation);
 
 	///
 	/// Destructor
@@ -65,10 +65,14 @@ class RgbTransform
 
 
 	/// @return The current brightness
-	double getBrightness() const;
+	uint8_t getBrightness() const;
 
 	/// @param brightness New brightness
-	void setBrightness(double brightness);
+	void setBrightness(uint8_t brightness);
+
+	void getBrightnessComponents(uint8_t & rgb, uint8_t & cmy, uint8_t & w );
+	uint8_t getBrightnessCompensation() const;
+	void setBrightnessCompensation(uint8_t brightnessCompensation);
 
 	///
 	/// Apply the transform the the given RGB values.
@@ -92,16 +96,18 @@ class RgbTransform
 	/// @param backlightColored en/disable color in backlight
 	/// @param brightnessHigh The used higher brightness
 	///
-	void init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, double brightnessHigh);
+	void init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation);
 
 	/// (re)-initilize the color mapping
 	void initializeMapping();	/// The saturation gain
 
+	void updateBrightnessComponents();
+	
 	double  _backlightThreshold;
 	bool    _backlightColored;
-	double  _brightnessHigh;
+	uint8_t _brightness;
+	uint8_t _brightnessCompensation;
 	double  _sumBrightnessLow;
-	double  _sumBrightnessHigh;
 
 	double _gammaR;
 	double _gammaG;
@@ -112,5 +118,8 @@ class RgbTransform
 	uint8_t _mappingG[256];
 	uint8_t _mappingB[256];
 
+	uint8_t _brightness_rgb;
+	uint8_t _brightness_cmy;
+	uint8_t _brightness_w;
 	bool _backLightEnabled;
 };
diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp
index fc9c2f6e0..000ae736b 100644
--- a/libsrc/hyperion/Hyperion.cpp
+++ b/libsrc/hyperion/Hyperion.cpp
@@ -162,12 +162,13 @@ RgbTransform* Hyperion::createRgbTransform(const QJsonObject& colorConfig)
 {
 	const double backlightThreshold = colorConfig["backlightThreshold"].toDouble(0.0);
 	const bool   backlightColored   = colorConfig["backlightColored"].toBool(false);
-	const double brightness    = colorConfig["brightness"].toDouble(0.5);
+	const double brightness    = colorConfig["brightness"].toInt(100);
+	const double brightnessComp= colorConfig["brightnessCompensation"].toInt(100);
 	const double gammaR        = colorConfig["gammaRed"].toDouble(1.0);
 	const double gammaG        = colorConfig["gammaGreen"].toDouble(1.0);
 	const double gammaB        = colorConfig["gammaBlue"].toDouble(1.0);
 
-	RgbTransform* transform = new RgbTransform(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, brightness);
+	RgbTransform* transform = new RgbTransform(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, brightness, brightnessComp);
 	return transform;
 }
 
diff --git a/libsrc/hyperion/MultiColorAdjustment.cpp b/libsrc/hyperion/MultiColorAdjustment.cpp
index 6bab6382c..302fb52b9 100644
--- a/libsrc/hyperion/MultiColorAdjustment.cpp
+++ b/libsrc/hyperion/MultiColorAdjustment.cpp
@@ -106,8 +106,10 @@ void MultiColorAdjustment::applyAdjustment(std::vector<ColorRgb>& ledColors)
 		uint8_t ored   = color.red;
 		uint8_t ogreen = color.green;
 		uint8_t oblue  = color.blue;
+		uint8_t B_RGB, B_CMY, B_W;
 		
 		adjustment->_rgbTransform.transform(ored,ogreen,oblue);
+		adjustment->_rgbTransform.getBrightnessComponents(B_RGB, B_CMY, B_W);
 
 		uint32_t nrng = (uint32_t) (255-ored)*(255-ogreen);
 		uint32_t rng  = (uint32_t) (ored)    *(255-ogreen);
@@ -123,15 +125,17 @@ void MultiColorAdjustment::applyAdjustment(std::vector<ColorRgb>& ledColors)
 		uint8_t yellow  = rg  *(255-oblue)/65025;
 		uint8_t white   = rg  *(oblue)    /65025;
 		
-		uint8_t OR, OG, OB, RR, RG, RB, GR, GG, GB, BR, BG, BB, CR, CG, CB, MR, MG, MB, YR, YG, YB, WR, WG, WB;
-		adjustment->_rgbBlackAdjustment.apply(black, OR, OG, OB);
-		adjustment->_rgbRedAdjustment.apply(red, RR, RG, RB);
-		adjustment->_rgbGreenAdjustment.apply(green, GR, GG, GB);
-		adjustment->_rgbBlueAdjustment.apply(blue, BR, BG, BB);
-		adjustment->_rgbCyanAdjustment.apply(cyan, CR, CG, CB);
-		adjustment->_rgbMagentaAdjustment.apply(magenta, MR, MG, MB);
-		adjustment->_rgbYellowAdjustment.apply(yellow, YR, YG, YB);
-		adjustment->_rgbWhiteAdjustment.apply(white, WR, WG, WB);
+		uint8_t OR, OG, OB, RR, RG, RB, GR, GG, GB, BR, BG, BB;
+		uint8_t CR, CG, CB, MR, MG, MB, YR, YG, YB, WR, WG, WB;
+
+		adjustment->_rgbBlackAdjustment.apply  (black  , 255  , OR, OG, OB);
+		adjustment->_rgbRedAdjustment.apply    (red    , B_RGB, RR, RG, RB);
+		adjustment->_rgbGreenAdjustment.apply  (green  , B_RGB, GR, GG, GB);
+		adjustment->_rgbBlueAdjustment.apply   (blue   , B_RGB, BR, BG, BB);
+		adjustment->_rgbCyanAdjustment.apply   (cyan   , B_CMY, CR, CG, CB);
+		adjustment->_rgbMagentaAdjustment.apply(magenta, B_CMY, MR, MG, MB);
+		adjustment->_rgbYellowAdjustment.apply (yellow , B_CMY, YR, YG, YB);
+		adjustment->_rgbWhiteAdjustment.apply  (white  , B_W  , WR, WG, WB);
 
 		color.red   = OR + RR + GR + BR + CR + MR + YR + WR;
 		color.green = OG + RG + GG + BG + CG + MG + YG + WG;
diff --git a/libsrc/hyperion/PriorityMuxer.cpp b/libsrc/hyperion/PriorityMuxer.cpp
index 540afabb1..a71df0182 100644
--- a/libsrc/hyperion/PriorityMuxer.cpp
+++ b/libsrc/hyperion/PriorityMuxer.cpp
@@ -12,7 +12,7 @@ PriorityMuxer::PriorityMuxer(int ledCount)
 	, _lowestPriorityInfo()
 {
 	_lowestPriorityInfo.priority       = LOWEST_PRIORITY;
-	_lowestPriorityInfo.timeoutTime_ms = -1;
+	_lowestPriorityInfo.timeoutTime_ms = 0;
 	_lowestPriorityInfo.ledColors      = std::vector<ColorRgb>(ledCount, {0, 0, 0});
 	_lowestPriorityInfo.componentId    = hyperion::COMP_COLOR;
 	_lowestPriorityInfo.origin         = "System";
diff --git a/libsrc/hyperion/schemas/hyperion.schema-2.json b/libsrc/hyperion/schemas/hyperion.schema-2.json
index 3224c2053..41315e95f 100644
--- a/libsrc/hyperion/schemas/hyperion.schema-2.json
+++ b/libsrc/hyperion/schemas/hyperion.schema-2.json
@@ -294,15 +294,26 @@
 							},
 							"brightness" :
 							{
-								"type" : "number",
+								"type" : "integer",
 								"title" : "edt_conf_color_brightness_title",
 								"required" : true,
-								"minimum" : 0.0,
-								"maximum": 1.0,
-								"default" : 1.0,
-								"step" : 0.05,
+								"minimum" : 0,
+								"maximum": 100,
+								"default" : 100,
+								"append" : "edt_append_percent",
 								"propertyOrder" : 13
 							},
+							"brightnessCompensation" :
+							{
+								"type" : "integer",
+								"title" : "edt_conf_color_brightnessComp_title",
+								"required" : true,
+								"minimum" : 0,
+								"maximum": 100,
+								"default" : 90,
+								"append" : "edt_append_percent",
+								"propertyOrder" : 14
+							},
 							"gammaRed" :
 							{
 								"type" : "number",
@@ -312,7 +323,7 @@
 								"maximum": 100.0,
 								"default" : 1.5,
 								"step" : 0.1,
-								"propertyOrder" : 14
+								"propertyOrder" : 15
 							},
 							"gammaGreen" :
 							{
@@ -323,7 +334,7 @@
 								"maximum": 100.0,
 								"default" : 1.5,
 								"step" : 0.1,
-								"propertyOrder" : 15
+								"propertyOrder" : 16
 							},
 							"gammaBlue" :
 							{
@@ -334,7 +345,7 @@
 								"maximum": 100.0,
 								"default" : 1.5,
 								"step" : 0.1,
-								"propertyOrder" : 16
+								"propertyOrder" : 17
 							}
 						},
 						"additionalProperties" : false
diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp
index ba2465476..8c60c0fba 100644
--- a/libsrc/jsonserver/JsonClientConnection.cpp
+++ b/libsrc/jsonserver/JsonClientConnection.cpp
@@ -757,10 +757,11 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
 		yellowAdjust.append(colorAdjustment->_rgbYellowAdjustment.getAdjustmentG());
 		yellowAdjust.append(colorAdjustment->_rgbYellowAdjustment.getAdjustmentB());
 		adjustment.insert("yellow", yellowAdjust);
-		
+
 		adjustment["backlightThreshold"] = colorAdjustment->_rgbTransform.getBacklightThreshold();
 		adjustment["backlightColored"]   = colorAdjustment->_rgbTransform.getBacklightColored();
 		adjustment["brightness"] = colorAdjustment->_rgbTransform.getBrightness();
+		adjustment["brightnessCompensation"] = colorAdjustment->_rgbTransform.getBrightnessCompensation();
 		adjustment["gammaRed"]   = colorAdjustment->_rgbTransform.getGammaR();
 		adjustment["gammaGreen"] = colorAdjustment->_rgbTransform.getGammaG();
 		adjustment["gammaBlue"]  = colorAdjustment->_rgbTransform.getGammaB();
@@ -956,7 +957,11 @@ void JsonClientConnection::handleAdjustmentCommand(const QJsonObject& message, c
 	}	
 	if (adjustment.contains("brightness"))
 	{
-		colorAdjustment->_rgbTransform.setBrightness(adjustment["brightness"].toDouble());
+		colorAdjustment->_rgbTransform.setBrightness(adjustment["brightness"].toInt());
+	}	
+	if (adjustment.contains("brightnessCompensation"))
+	{
+		colorAdjustment->_rgbTransform.setBrightnessCompensation(adjustment["brightnessCompensation"].toInt());
 	}	
 
 	// commit the changes
diff --git a/libsrc/jsonserver/schema/schema-adjustment.json b/libsrc/jsonserver/schema/schema-adjustment.json
index fd7fc1630..2cb805316 100644
--- a/libsrc/jsonserver/schema/schema-adjustment.json
+++ b/libsrc/jsonserver/schema/schema-adjustment.json
@@ -135,10 +135,16 @@
 					"required" : false
 				},
 				"brightness" : {
-					"type" : "number",
+					"type" : "integer",
 					"required" : false,
-					"minimum" : 0.0,
-					"maximum" : 1.0
+					"minimum" : 0,
+					"maximum" : 100
+				},
+				"brightnessCompensation" : {
+					"type" : "integer",
+					"required" : false,
+					"minimum" : 0,
+					"maximum" : 100
 				}
 			},
 			"additionalProperties": false
diff --git a/libsrc/utils/RgbChannelAdjustment.cpp b/libsrc/utils/RgbChannelAdjustment.cpp
index 426b21a1c..2a317a8b9 100644
--- a/libsrc/utils/RgbChannelAdjustment.cpp
+++ b/libsrc/utils/RgbChannelAdjustment.cpp
@@ -9,6 +9,7 @@
 RgbChannelAdjustment::RgbChannelAdjustment(QString channelName)
 	: _channelName(channelName)
 	, _log(Logger::getInstance(channelName))
+	, _brightness(0)
 {
 	resetInitialized();
 }
@@ -27,10 +28,7 @@ RgbChannelAdjustment::~RgbChannelAdjustment()
 void RgbChannelAdjustment::resetInitialized()
 {
 	Debug(_log, "initialize mapping with %d,%d,%d", _adjust[RED], _adjust[GREEN], _adjust[BLUE]);
-	for(int idx=0;idx<256;idx++)
-	{
-		_initialized[idx] = false;
-	}
+	memset(_initialized, false, sizeof(_initialized));
 }
 
 void RgbChannelAdjustment::setAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB)
@@ -56,16 +54,22 @@ uint8_t RgbChannelAdjustment::getAdjustmentB() const
 	return _adjust[BLUE];
 }
 
-void RgbChannelAdjustment::apply(uint8_t input, uint8_t & red, uint8_t & green, uint8_t & blue)
+void RgbChannelAdjustment::apply(uint8_t input, uint8_t brightness, uint8_t & red, uint8_t & green, uint8_t & blue)
 {
+	if (_brightness != brightness)
+	{
+		_brightness = brightness;
+		resetInitialized();
+	}
+
 	if (!_initialized[input])
 	{
-		_mapping[0][input] = std::min( (((unsigned)input * _adjust[0]) / UINT8_MAX), (unsigned)UINT8_MAX);
-		_mapping[1][input] = std::min( (((unsigned)input * _adjust[1]) / UINT8_MAX), (unsigned)UINT8_MAX);
-		_mapping[2][input] = std::min( (((unsigned)input * _adjust[2]) / UINT8_MAX), (unsigned)UINT8_MAX);
+		_mapping[RED  ][input] = std::min( ((_brightness * input * _adjust[RED  ]) / 65025), UINT8_MAX);
+		_mapping[GREEN][input] = std::min( ((_brightness * input * _adjust[GREEN]) / 65025), UINT8_MAX);
+		_mapping[BLUE ][input] = std::min( ((_brightness * input * _adjust[BLUE ]) / 65025), UINT8_MAX);
 		_initialized[input] = true;
 	}
-	red   = _mapping[RED][input];
+	red   = _mapping[RED  ][input];
 	green = _mapping[GREEN][input];
-	blue  = _mapping[BLUE][input];
+	blue  = _mapping[BLUE ][input];
 }
diff --git a/libsrc/utils/RgbTransform.cpp b/libsrc/utils/RgbTransform.cpp
index 256cabb54..190e80608 100644
--- a/libsrc/utils/RgbTransform.cpp
+++ b/libsrc/utils/RgbTransform.cpp
@@ -5,21 +5,22 @@
 
 RgbTransform::RgbTransform()
 {
-	init(1.0, 1.0, 1.0, 0.0, false, 1.0);
+	init(1.0, 1.0, 1.0, 0.0, false, 100, 100);
 }
 
-RgbTransform::RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, double brightnessHigh)
+RgbTransform::RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation)
 {
-	init(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, brightnessHigh);
+	init(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, brightness, brightnessCompensation);
 }
 
-void RgbTransform::init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, double brightnessHigh)
+void RgbTransform::init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation)
 {
 	_backLightEnabled = true;
 	setGamma(gammaR,gammaG,gammaB);
 	setBacklightThreshold(backlightThreshold);
 	setBacklightColored(backlightColored);
-	setBrightness(brightnessHigh);
+	setBrightness(brightness);
+	setBrightnessCompensation(brightnessCompensation);
 	initializeMapping();
 }
 
@@ -92,15 +93,54 @@ void RgbTransform::setBackLightEnabled(bool enable)
 	_backLightEnabled = enable;
 }
 
-double RgbTransform::getBrightness() const
+uint8_t RgbTransform::getBrightness() const
 {
-	return _brightnessHigh;
+	return _brightness;
 }
 
-void RgbTransform::setBrightness(double brightness)
+void RgbTransform::setBrightness(uint8_t brightness)
 {
-	_brightnessHigh    = brightness;
-	_sumBrightnessHigh = 765.0 * ((std::pow(2.0,brightness*2)-1) / 3.0);
+	_brightness    = brightness;
+	updateBrightnessComponents();
+}
+
+void RgbTransform::setBrightnessCompensation(uint8_t brightnessCompensation)
+{
+	_brightnessCompensation = brightnessCompensation;
+	updateBrightnessComponents();
+}
+
+uint8_t RgbTransform::getBrightnessCompensation() const
+{
+	return _brightnessCompensation;
+}
+
+void RgbTransform::updateBrightnessComponents()
+{
+	double Fw   = _brightnessCompensation*2.0/100.0+1.0;
+	double Fcmy = _brightnessCompensation/100.0+1.0;
+	
+	double B_in= 0;
+	_brightness_rgb = 0;
+	_brightness_cmy = 0;
+	_brightness_w   = 0;
+
+	if (_brightness > 0)
+	{
+		B_in = -0.093*_brightness+std::sqrt(_brightness);
+		if (_brightness< 57) B_in += std::sqrt(57)-std::sqrt(_brightness);
+
+		_brightness_rgb = std::ceil(std::min(255.0,255.0/B_in));
+		_brightness_cmy = std::ceil(std::min(255.0,255.0/(B_in*Fcmy)));
+		_brightness_w   = std::ceil(std::min(255.0,255.0/(B_in*Fw)));
+	}
+}
+
+void RgbTransform::getBrightnessComponents(uint8_t & rgb, uint8_t & cmy, uint8_t & w )
+{
+	rgb = _brightness_rgb;
+	cmy = _brightness_cmy;
+	w   = _brightness_w;
 }
 
 void RgbTransform::transform(uint8_t & red, uint8_t & green, uint8_t & blue)
@@ -114,14 +154,7 @@ void RgbTransform::transform(uint8_t & red, uint8_t & green, uint8_t & blue)
 	// apply brightnesss
 	int rgbSum = red+green+blue;
 
-	if (_sumBrightnessHigh > 0 && rgbSum > _sumBrightnessHigh)
-	{
-		double cH = _sumBrightnessHigh / rgbSum;
-		red   *= cH;
-		green *= cH;
-		blue  *= cH;
-	}
-	else if ( _backLightEnabled && _sumBrightnessLow>0 && rgbSum < _sumBrightnessLow)
+	if ( _backLightEnabled && _sumBrightnessLow>0 && rgbSum < _sumBrightnessLow)
 	{
 		if (_backlightColored)
 		{
@@ -147,3 +180,4 @@ void RgbTransform::transform(uint8_t & red, uint8_t & green, uint8_t & blue)
 	}
 	//std::cout << _sumBrightnessLow << " " << (int)red << " " << (int)green << " " << (int)blue << std::endl;
 }
+
diff --git a/src/hyperion-remote/JsonConnection.cpp b/src/hyperion-remote/JsonConnection.cpp
index bfb42f7be..8953ea422 100644
--- a/src/hyperion-remote/JsonConnection.cpp
+++ b/src/hyperion-remote/JsonConnection.cpp
@@ -447,7 +447,8 @@ void JsonConnection::setAdjustment(
 		double *gammaB,
 		double *backlightThreshold,
 		int    *backlightColored,
-		double *brightness)
+		int    *brightness,
+		int    *brightnessC)
 {
 	qDebug() << "Set color adjustments";
 
@@ -538,6 +539,10 @@ void JsonConnection::setAdjustment(
 	{
 		adjust["brightness"] = *brightness;
 	}
+	if (brightnessC != nullptr)
+	{
+		adjust["brightnessCompensation"] = *brightnessC;
+	}
 	if (gammaR != nullptr)
 	{
 		adjust["gammaRed"] = *gammaR;
diff --git a/src/hyperion-remote/JsonConnection.h b/src/hyperion-remote/JsonConnection.h
index 5e1df5b6b..219ed0021 100644
--- a/src/hyperion-remote/JsonConnection.h
+++ b/src/hyperion-remote/JsonConnection.h
@@ -156,7 +156,8 @@ class JsonConnection
 		double *gammaB,
 		double *backlightThreshold,
 		int    *backlightColored,
-		double *brightness);
+		int    *brightness,
+		int    *brightnessC);
 
 	///
 	/// sets the image to leds mapping type
diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp
index 470d108ae..081a7a85a 100644
--- a/src/hyperion-remote/hyperion-remote.cpp
+++ b/src/hyperion-remote/hyperion-remote.cpp
@@ -75,8 +75,9 @@ int main(int argc, char * argv[])
 		BooleanOption   & argClearAll    = parser.add<BooleanOption>(0x0, "clearall"  , "Clear data for all active priority channels");
 		Option          & argEnableComponent  = parser.add<Option>  ('E', "enable"    , "Enable the Component with the given name. Available Components are [SMOOTHING, BLACKBORDER, KODICHECKER, FORWARDER, UDPLISTENER, BOBLIGHT_SERVER, GRABBER, V4L, LEDDEVICE]");
 		Option          & argDisableComponent = parser.add<Option>  ('D', "disable"    , "Disable the Component with the given name. Available Components are [SMOOTHING, BLACKBORDER, KODICHECKER, FORWARDER, UDPLISTENER, BOBLIGHT_SERVER, GRABBER, V4L, LEDDEVICE]");
-		Option          & argId           = parser.add<Option>       ('q', "qualifier" , "Identifier(qualifier) of the adjustment to set");
-		DoubleOption    & argBrightness   = parser.add<DoubleOption> ('L', "brightness" , "Set the brightness gain of the leds");
+		Option          & argId           = parser.add<Option>      ('q', "qualifier" , "Identifier(qualifier) of the adjustment to set");
+		IntOption       & argBrightness   = parser.add<IntOption>   ('L', "brightness" , "Set the brightness gain of the leds");
+		IntOption       & argBrightnessC  = parser.add<IntOption>   (0x0, "brightnessCompensation" , "Set the brightness compensation");
 		DoubleOption    & argBacklightThreshold= parser.add<DoubleOption> ('n', "backlightThreshold" , "threshold for activating backlight (minimum brightness)");
 		IntOption       & argBacklightColored  = parser.add<IntOption>    (0x0, "backlightColored" , "0 = white backlight; 1 =  colored backlight");
 		DoubleOption    & argGamma       = parser.add<DoubleOption>  ('g', "gamma"     , "Set the overall gamma of the leds");
@@ -110,7 +111,7 @@ int main(int argc, char * argv[])
 
 		// check if at least one of the available color transforms is set
 		bool colorAdjust = parser.isSet(argRAdjust) || parser.isSet(argGAdjust) || parser.isSet(argBAdjust) || parser.isSet(argCAdjust) || parser.isSet(argMAdjust)
-			|| parser.isSet(argYAdjust) || parser.isSet(argWAdjust) || parser.isSet(argbAdjust) || parser.isSet(argGamma)|| parser.isSet(argBrightness)
+			|| parser.isSet(argYAdjust) || parser.isSet(argWAdjust) || parser.isSet(argbAdjust) || parser.isSet(argGamma)|| parser.isSet(argBrightness)|| parser.isSet(argBrightnessC)
 			|| parser.isSet(argBacklightThreshold) || parser.isSet(argBacklightColored);
 		
 		// check that exactly one command was given
@@ -138,6 +139,7 @@ int main(int argc, char * argv[])
 			qWarning() << "or one or more of the available color modding operations:";
 			showHelp(argId);
 			showHelp(argBrightness);
+			showHelp(argBrightnessC);
 			showHelp(argBacklightThreshold);
 			showHelp(argBacklightColored);
 			showHelp(argGamma);
@@ -250,7 +252,8 @@ int main(int argc, char * argv[])
 				argGamma.getDoublePtr(parser),
 				argBacklightThreshold.getDoublePtr(parser),
 				argBacklightColored.getIntPtr(parser),
-				argBrightness.getDoublePtr(parser)
+				argBrightness.getIntPtr(parser),
+				argBrightnessC.getIntPtr(parser)
 			);
 		}
 	}

From 9ffee5f97568ee4b293535a0756a7201e369dfd1 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Sun, 2 Apr 2017 06:45:12 +0200
Subject: [PATCH 5/8] cahnge access level

---
 libsrc/hyperion/schemas/hyperion.schema-2.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libsrc/hyperion/schemas/hyperion.schema-2.json b/libsrc/hyperion/schemas/hyperion.schema-2.json
index 41315e95f..51243e397 100644
--- a/libsrc/hyperion/schemas/hyperion.schema-2.json
+++ b/libsrc/hyperion/schemas/hyperion.schema-2.json
@@ -312,6 +312,7 @@
 								"maximum": 100,
 								"default" : 90,
 								"append" : "edt_append_percent",
+								"access" : "advanced",
 								"propertyOrder" : 14
 							},
 							"gammaRed" :

From ba8d4da23061f372e9e28045fbee6d25754de532 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Sun, 2 Apr 2017 06:46:55 +0200
Subject: [PATCH 6/8] i18n fix

---
 assets/webconfig/i18n/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json
index 41d869b99..2f54c44bb 100644
--- a/assets/webconfig/i18n/en.json
+++ b/assets/webconfig/i18n/en.json
@@ -440,8 +440,8 @@
 	"edt_conf_color_backlightThreshold_expl" : "The minimum amount of brightness (backlight). Disabled during effects, colors and in status \"Off\"",
 	"edt_conf_color_backlightColored_title" : "Colored backlight",
 	"edt_conf_color_backlightColored_expl" : "Add some color to your backlight.",
-	"edt_conf_color_brightness_title" : "maximal brightness",
-	"edt_conf_color_brightness_expl" : "From 0.0 to 0.5 the brightness is linearised, from 0.5 to 1.0 cyan, magenta, yellow is up to 2x brighter and white 3x.",
+	"edt_conf_color_brightness_title" : "brightness",
+	"edt_conf_color_brightness_expl" : "set overall brightness of leds",
 	"edt_conf_color_brightnessComp_title" : "Brightness Compensation",
 	"edt_conf_color_brightnessComp_expl" : "compensates bightness differences between RGB, CMY and white. 100 means full compensation, 0 no compensation",
 	"edt_conf_smooth_heading_title" : "Smoothing",

From 04f3a64cb2615285642c642150ced33d17d9af85 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Sun, 2 Apr 2017 10:21:48 +0200
Subject: [PATCH 7/8] - cleanup brightness stuff - update webserver, now with
 initial ssl support

---
 assets/webconfig/js/hyperion.js       |  2 +-
 config/hyperion.config.json.commented |  9 +--
 config/hyperion.config.json.default   |  2 +-
 include/utils/RgbChannelAdjustment.h  | 18 +++++-
 include/utils/RgbTransform.h          | 36 ++++++++---
 libsrc/webconfig/QtHttpServer.cpp     | 89 ++++++++++++++++++++++-----
 libsrc/webconfig/QtHttpServer.h       | 51 ++++++++++++---
 7 files changed, 168 insertions(+), 39 deletions(-)

diff --git a/assets/webconfig/js/hyperion.js b/assets/webconfig/js/hyperion.js
index ca5be504a..1b31f1751 100644
--- a/assets/webconfig/js/hyperion.js
+++ b/assets/webconfig/js/hyperion.js
@@ -41,7 +41,7 @@ function cron()
 
 function connectionLostDetection(type)
 {
-	if ( watchdog > 1 )
+	if ( watchdog > 2 )
 	{
 		var interval_id = window.setInterval("", 9999); // Get a reference to the last
 		for (var i = 1; i < interval_id; i++)
diff --git a/config/hyperion.config.json.commented b/config/hyperion.config.json.commented
index 407b55200..facea5b6d 100644
--- a/config/hyperion.config.json.commented
+++ b/config/hyperion.config.json.commented
@@ -49,10 +49,11 @@
 	///      * 'gammaRed'/'gammaGreen'/'gammaBlue'  : Gamma value for each channel 
 	///      * 'id'     : The unique identifier of the channel adjustments (eg 'device_1')
 	///      * 'id'     : The unique identifier of the channel adjustments (eg 'device_1')
-	///  	 * 'backlightThreshold' : Minimum brightness (backlight)
-	///  	 * 'backlightColored'   : backlight with color, instead of white
-	///  	 * 'brightness' : Between 0.0-0.5 the brightness is linearized (white is as bright as red, is as bright as yellow).
-	///						  Between 0.5-1.0 the linearization reduces slowly until it's gone with 1.0 (white is 3x brighter than red, yellow is 2x brighter than red)
+	///      * 'backlightThreshold' : Minimum brightness (backlight)
+	///      * 'backlightColored'   : backlight with color, instead of white
+	///      * 'brightness' : overall brightness
+	///      * 'brightnessCompensation' : 100 means brightness differences are compensated (white is as bright as red, is as bright as yellow.
+	///                                   0 means white is 3x brighter than red, yellow is 2x brighter than red
 	"color" :
 	{
 		"imageToLedMappingType" : "multicolor_mean",
diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default
index 9d781b242..ce71791a0 100644
--- a/config/hyperion.config.json.default
+++ b/config/hyperion.config.json.default
@@ -41,7 +41,7 @@
 				"backlightThreshold"  : 0.0,
 				"backlightColored"  : false,
 				"brightness" : 100,
-				"brightnessCompensation" : 80
+				"brightnessCompensation" : 100
 			}
 		]
 	},
diff --git a/include/utils/RgbChannelAdjustment.h b/include/utils/RgbChannelAdjustment.h
index 80dfbe15b..9d53b290d 100644
--- a/include/utils/RgbChannelAdjustment.h
+++ b/include/utils/RgbChannelAdjustment.h
@@ -22,14 +22,26 @@ class RgbChannelAdjustment
 	/// Destructor
 	~RgbChannelAdjustment();
 	
+	///
 	/// Transform the given array value
+	///
 	/// @param input The input color bytes
+	/// @param brightness The current brightness value
+	/// @param red The red color component
+	/// @param green The green color component
+	/// @param blue The blue color component
+	///
+	/// @note The values are updated in place.
+	///
 	void apply(uint8_t input, uint8_t brightness, uint8_t & red, uint8_t & green, uint8_t & blue);
 
+	///
 	/// setAdjustment RGB
+	///
 	/// @param adjustR  
 	/// @param adjustG 
 	/// @param adjustB 
+	///
 	void setAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB);
 
 	/// @return The current adjustR value
@@ -43,7 +55,7 @@ class RgbChannelAdjustment
 
 private:
 	/// color channels
-	enum ColorChannel { RED=0,GREEN=1, BLUE=2 };
+	enum ColorChannel { RED=0, GREEN=1, BLUE=2 };
 
 	/// reset init of color mapping
 	void resetInitialized();
@@ -60,7 +72,9 @@ class RgbChannelAdjustment
 	/// Logger instance
 	Logger * _log;
 
+	/// bitfield to determine white value is alreade initialized
 	bool _initialized[256];
-	
+
+	/// current brightness value
 	uint8_t _brightness;
 };
diff --git a/include/utils/RgbTransform.h b/include/utils/RgbTransform.h
index ea52496ec..0c972d578 100644
--- a/include/utils/RgbTransform.h
+++ b/include/utils/RgbTransform.h
@@ -63,17 +63,29 @@ class RgbTransform
 	/// @param enable en/disable backlight
 	void setBackLightEnabled(bool enable);
 
-
 	/// @return The current brightness
 	uint8_t getBrightness() const;
 
 	/// @param brightness New brightness
 	void setBrightness(uint8_t brightness);
 
-	void getBrightnessComponents(uint8_t & rgb, uint8_t & cmy, uint8_t & w );
+	/// @return The current brightnessCompensation value
 	uint8_t getBrightnessCompensation() const;
+
+	/// @param brightnessCompensation new brightnessCompensation
 	void setBrightnessCompensation(uint8_t brightnessCompensation);
 
+	///
+	/// get component values of brightness for compensated brightness
+	///
+	///	@param rgb the rgb component
+	///	@param cmy the cyan magenta yellow component
+	///	@param w the white component
+	///
+	/// @note The values are updated in place.
+	///
+	void getBrightnessComponents(uint8_t & rgb, uint8_t & cmy, uint8_t & w );
+
 	///
 	/// Apply the transform the the given RGB values.
 	///
@@ -94,7 +106,8 @@ class RgbTransform
 	/// @param gammab The used blue gamma
 	/// @param backlightThreshold The used lower brightness
 	/// @param backlightColored en/disable color in backlight
-	/// @param brightnessHigh The used higher brightness
+	/// @param brightness The used brightness
+	/// @param brightnessCompensation The used brightness compensation
 	///
 	void init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation);
 
@@ -102,13 +115,14 @@ class RgbTransform
 	void initializeMapping();	/// The saturation gain
 
 	void updateBrightnessComponents();
-	
-	double  _backlightThreshold;
-	bool    _backlightColored;
-	uint8_t _brightness;
-	uint8_t _brightnessCompensation;
-	double  _sumBrightnessLow;
 
+	/// backlight variables
+	bool   _backLightEnabled;
+	bool   _backlightColored;
+	double _backlightThreshold;
+	double _sumBrightnessLow;
+
+	/// gamma variables
 	double _gammaR;
 	double _gammaG;
 	double _gammaB;
@@ -118,8 +132,10 @@ class RgbTransform
 	uint8_t _mappingG[256];
 	uint8_t _mappingB[256];
 
+	/// brightness variables
+	uint8_t _brightness;
+	uint8_t _brightnessCompensation;
 	uint8_t _brightness_rgb;
 	uint8_t _brightness_cmy;
 	uint8_t _brightness_w;
-	bool _backLightEnabled;
 };
diff --git a/libsrc/webconfig/QtHttpServer.cpp b/libsrc/webconfig/QtHttpServer.cpp
index 8053f0e2a..2830b8f73 100644
--- a/libsrc/webconfig/QtHttpServer.cpp
+++ b/libsrc/webconfig/QtHttpServer.cpp
@@ -4,18 +4,41 @@
 #include "QtHttpReply.h"
 #include "QtHttpClientWrapper.h"
 
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QHostAddress>
+#include <QDebug>
+#include <QUrlQuery>
 
 const QString & QtHttpServer::HTTP_VERSION = QStringLiteral ("HTTP/1.1");
 
+QtHttpServerWrapper::QtHttpServerWrapper (QObject * parent)
+    : QTcpServer (parent)
+    , m_useSsl   (false)
+{ }
+
+QtHttpServerWrapper::~QtHttpServerWrapper (void) { }
+
+void QtHttpServerWrapper::setUseSecure (const bool ssl) {
+    m_useSsl = ssl;
+}
+
+void QtHttpServerWrapper::incomingConnection (qintptr handle) {
+    QTcpSocket * sock = (m_useSsl
+                         ? new QSslSocket (this)
+                         : new QTcpSocket (this));
+    if (sock->setSocketDescriptor (handle)) {
+        addPendingConnection (sock);
+    }
+    else {
+        delete sock;
+    }
+}
+
 QtHttpServer::QtHttpServer (QObject * parent)
     : QObject      (parent)
+    , m_useSsl     (false)
     , m_serverName (QStringLiteral ("The Qt5 HTTP Server"))
 {
-    m_sockServer = new QTcpServer (this);
-    connect (m_sockServer, &QTcpServer::newConnection, this, &QtHttpServer::onClientConnected);
+    m_sockServer = new QtHttpServerWrapper (this);
+    connect (m_sockServer, &QtHttpServerWrapper::newConnection, this, &QtHttpServer::onClientConnected);
 }
 
 const QString & QtHttpServer::getServerName (void) const {
@@ -50,21 +73,59 @@ void QtHttpServer::setServerName (const QString & serverName) {
     m_serverName = serverName;
 }
 
+void QtHttpServer::setUseSecure (const bool ssl) {
+    m_useSsl = ssl;
+    m_sockServer->setUseSecure (m_useSsl);
+}
+
+void QtHttpServer::setPrivateKey (const QSslKey & key) {
+    m_sslKey = key;
+}
+
+void QtHttpServer::setCertificates (const QList<QSslCertificate> & certs) {
+    m_sslCerts = certs;
+}
+
 void QtHttpServer::onClientConnected (void) {
     while (m_sockServer->hasPendingConnections ()) {
-        QTcpSocket * sockClient = m_sockServer->nextPendingConnection ();
-        QtHttpClientWrapper * wrapper = new QtHttpClientWrapper (sockClient, this);
-        connect (sockClient, &QTcpSocket::disconnected, this, &QtHttpServer::onClientDisconnected);
-        m_socksClientsHash.insert (sockClient, wrapper);
-        emit clientConnected (wrapper->getGuid ());
+        if (QTcpSocket * sock = m_sockServer->nextPendingConnection ()) {
+            connect (sock, &QTcpSocket::disconnected, this, &QtHttpServer::onClientDisconnected);
+            if (m_useSsl) {
+                if (QSslSocket * ssl = qobject_cast<QSslSocket *> (sock)) {
+                    connect (ssl, SslErrorSignal (&QSslSocket::sslErrors), this, &QtHttpServer::onClientSslErrors);
+                    connect (ssl, &QSslSocket::encrypted,                  this, &QtHttpServer::onClientSslEncrypted);
+                    connect (ssl, &QSslSocket::peerVerifyError,            this, &QtHttpServer::onClientSslPeerVerifyError);
+                    connect (ssl, &QSslSocket::modeChanged,                this, &QtHttpServer::onClientSslModeChanged);
+                    ssl->setLocalCertificateChain (m_sslCerts);
+                    ssl->setPrivateKey (m_sslKey);
+                    ssl->setPeerVerifyMode (QSslSocket::AutoVerifyPeer);
+                    ssl->startServerEncryption ();
+                }
+            }
+            QtHttpClientWrapper * wrapper = new QtHttpClientWrapper (sock, this);
+            m_socksClientsHash.insert (sock, wrapper);
+            emit clientConnected (wrapper->getGuid ());
+        }
     }
 }
 
+void QtHttpServer::onClientSslEncrypted (void) { }
+
+void QtHttpServer::onClientSslPeerVerifyError (const QSslError & err) {
+    Q_UNUSED (err)
+}
+
+void QtHttpServer::onClientSslErrors (const QList<QSslError> & errors) {
+    Q_UNUSED (errors)
+}
+
+void QtHttpServer::onClientSslModeChanged (QSslSocket::SslMode mode) {
+    Q_UNUSED (mode)
+}
+
 void QtHttpServer::onClientDisconnected (void) {
-    QTcpSocket * sockClient = qobject_cast<QTcpSocket *> (sender ());
-    if (sockClient) {
-        QtHttpClientWrapper * wrapper = m_socksClientsHash.value (sockClient, Q_NULLPTR);
-        if (wrapper) {
+    if (QTcpSocket * sockClient = qobject_cast<QTcpSocket *> (sender ())) {
+        if (QtHttpClientWrapper * wrapper = m_socksClientsHash.value (sockClient, Q_NULLPTR)) {
             emit clientDisconnected (wrapper->getGuid ());
             wrapper->deleteLater ();
             m_socksClientsHash.remove (sockClient);
diff --git a/libsrc/webconfig/QtHttpServer.h b/libsrc/webconfig/QtHttpServer.h
index 6ddf4b827..a14b191e2 100644
--- a/libsrc/webconfig/QtHttpServer.h
+++ b/libsrc/webconfig/QtHttpServer.h
@@ -4,6 +4,12 @@
 #include <QObject>
 #include <QString>
 #include <QHash>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QHostAddress>
 
 class QTcpSocket;
 class QTcpServer;
@@ -12,6 +18,22 @@ class QtHttpRequest;
 class QtHttpReply;
 class QtHttpClientWrapper;
 
+class QtHttpServerWrapper : public QTcpServer {
+    Q_OBJECT
+
+public:
+    explicit QtHttpServerWrapper (QObject * parent = Q_NULLPTR);
+    virtual ~QtHttpServerWrapper (void);
+
+    void setUseSecure (const bool ssl = true);
+
+protected:
+    void incomingConnection (qintptr handle) Q_DECL_OVERRIDE;
+
+private:
+    bool m_useSsl;
+};
+
 class QtHttpServer : public QObject {
     Q_OBJECT
 
@@ -19,14 +41,21 @@ class QtHttpServer : public QObject {
     explicit QtHttpServer (QObject * parent = Q_NULLPTR);
 
     static const QString & HTTP_VERSION;
+
+    typedef void (QSslSocket::* SslErrorSignal) (const QList<QSslError> &);
+
     const QString & getServerName (void) const;
-    quint16 getServerPort (void) const;
+
+    quint16 getServerPort  (void) const;
     QString getErrorString (void) const;
 
 public slots:
-    void start         (quint16 port = 0);
-    void stop          (void);
-    void setServerName (const QString & serverName);
+    void start           (quint16 port = 0);
+    void stop            (void);
+    void setServerName   (const QString & serverName);
+    void setUseSecure    (const bool ssl = true);
+    void setPrivateKey   (const QSslKey & key);
+    void setCertificates (const QList<QSslCertificate> & certs);
 
 signals:
     void started            (quint16 port);
@@ -37,13 +66,21 @@ public slots:
     void requestNeedsReply  (QtHttpRequest * request, QtHttpReply * reply);
 
 private slots:
-    void onClientConnected    (void);
-    void onClientDisconnected (void);
+    void onClientConnected          (void);
+    void onClientDisconnected       (void);
+    void onClientSslEncrypted       (void);
+    void onClientSslPeerVerifyError (const QSslError & err);
+    void onClientSslErrors          (const QList<QSslError> & errors);
+    void onClientSslModeChanged     (QSslSocket::SslMode mode);
 
 private:
+    bool                                       m_useSsl;
+    QSslKey                                    m_sslKey;
+    QList<QSslCertificate>                     m_sslCerts;
     QString                                    m_serverName;
-    QTcpServer *                               m_sockServer;
+    QtHttpServerWrapper *                      m_sockServer;
     QHash<QTcpSocket *, QtHttpClientWrapper *> m_socksClientsHash;
 };
 
 #endif // QTHTTPSERVER_H
+

From daa82172ff098df1d2e9e7026609f010a8858b95 Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Mon, 3 Apr 2017 04:03:22 +0200
Subject: [PATCH 8/8] - backlightThreshold is now 0-100 instead 0-1 - better
 performance for brightness - use piecewise linear instead of sqrt

---
 assets/webconfig/js/content_remote.js           |  4 +---
 config/hyperion.config.json.commented           |  2 +-
 config/hyperion.config.json.default             |  2 +-
 include/utils/RgbTransform.h                    |  4 ++--
 libsrc/hyperion/schemas/hyperion.schema-2.json  | 10 +++++-----
 libsrc/jsonserver/schema/schema-adjustment.json |  6 +++---
 libsrc/utils/RgbTransform.cpp                   |  9 ++++-----
 src/hyperion-remote/JsonConnection.cpp          |  2 +-
 src/hyperion-remote/JsonConnection.h            |  2 +-
 src/hyperion-remote/hyperion-remote.cpp         |  4 ++--
 10 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/assets/webconfig/js/content_remote.js b/assets/webconfig/js/content_remote.js
index f8a9eea41..aa2bb378a 100644
--- a/assets/webconfig/js/content_remote.js
+++ b/assets/webconfig/js/content_remote.js
@@ -53,9 +53,7 @@ $(document).ready(function() {
 			}
 			else
 			{
-				if(sColor[key].key == "backlightThreshold")
-					property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0" max="1.0" step="0.05" value="'+value+'"/>';
-				else if(sColor[key].key == "brightness" || sColor[key].key == "brightnessCompensation")
+				if(sColor[key].key == "backlightThreshold" || sColor[key].key == "brightness" || sColor[key].key == "brightnessCompensation")
 					property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0" max="100" step="10" value="'+value+'"/>';
 				else
 					property = '<input id="cr_'+sColor[key].key+'" type="number" class="form-control" min="0.1" max="4.0" step="0.1" value="'+value+'"/>';
diff --git a/config/hyperion.config.json.commented b/config/hyperion.config.json.commented
index facea5b6d..69f3a712b 100644
--- a/config/hyperion.config.json.commented
+++ b/config/hyperion.config.json.commented
@@ -73,7 +73,7 @@
 				"gammaRed"   : 1.5,
 				"gammaGreen" : 1.5,
 				"gammaBlue"  : 1.5,
-				"backlightThreshold"  : 0.0,
+				"backlightThreshold"  : 0,
 				"backlightColored"  : false,
 				"brightness" : 100,
 				"brightnessCompensation" : 80
diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default
index ce71791a0..18f08b1b1 100644
--- a/config/hyperion.config.json.default
+++ b/config/hyperion.config.json.default
@@ -38,7 +38,7 @@
 				"gammaRed"   : 1.5,
 				"gammaGreen" : 1.5,
 				"gammaBlue"  : 1.5,
-				"backlightThreshold"  : 0.0,
+				"backlightThreshold"  : 0,
 				"backlightColored"  : false,
 				"brightness" : 100,
 				"brightnessCompensation" : 100
diff --git a/include/utils/RgbTransform.h b/include/utils/RgbTransform.h
index 0c972d578..0cb45b8e9 100644
--- a/include/utils/RgbTransform.h
+++ b/include/utils/RgbTransform.h
@@ -46,10 +46,10 @@ class RgbTransform
 	void setGamma(double gammaR,double gammaG=-1, double gammaB=-1);
 
 	/// @return The current lower brightness
-	double getBacklightThreshold() const;
+	int getBacklightThreshold() const;
 
 	/// @param backlightThreshold New lower brightness
-	void setBacklightThreshold(double backlightThreshold);
+	void setBacklightThreshold(int backlightThreshold);
 
 	/// @return The current state
 	bool getBacklightColored() const;
diff --git a/libsrc/hyperion/schemas/hyperion.schema-2.json b/libsrc/hyperion/schemas/hyperion.schema-2.json
index 51243e397..ba9f4ead7 100644
--- a/libsrc/hyperion/schemas/hyperion.schema-2.json
+++ b/libsrc/hyperion/schemas/hyperion.schema-2.json
@@ -275,13 +275,13 @@
 							},
 							"backlightThreshold" :
 							{
-								"type" : "number",
+								"type" : "integer",
 								"title" : "edt_conf_color_backlightThreshold_title",
 								"required" : true,
-								"minimum" : 0.0,
-								"maximum": 1.0,
-								"default" : 0.0,
-								"step" : 0.05,
+								"minimum" : 0,
+								"maximum": 100,
+								"default" : 0,
+								"append" : "edt_append_percent",
 								"propertyOrder" : 11
 							},
 							"backlightColored" :
diff --git a/libsrc/jsonserver/schema/schema-adjustment.json b/libsrc/jsonserver/schema/schema-adjustment.json
index 2cb805316..a16796b18 100644
--- a/libsrc/jsonserver/schema/schema-adjustment.json
+++ b/libsrc/jsonserver/schema/schema-adjustment.json
@@ -125,10 +125,10 @@
 					"maximum" : 5.0
 				},
 				"backlightThreshold" : {
-					"type" : "number",
+					"type" : "integer",
 					"required" : false,
-					"minimum" : 0.0,
-					"maximum" : 1.0
+					"minimum" : 0,
+					"maximum" : 100
 				},
 				"backlightColored" : {
 					"type" : "boolean",
diff --git a/libsrc/utils/RgbTransform.cpp b/libsrc/utils/RgbTransform.cpp
index 190e80608..d99cc6878 100644
--- a/libsrc/utils/RgbTransform.cpp
+++ b/libsrc/utils/RgbTransform.cpp
@@ -62,15 +62,15 @@ void RgbTransform::initializeMapping()
 }
 
 
-double RgbTransform::getBacklightThreshold() const
+int RgbTransform::getBacklightThreshold() const
 {
 	return _backlightThreshold;
 }
 
-void RgbTransform::setBacklightThreshold(double backlightThreshold)
+void RgbTransform::setBacklightThreshold(int backlightThreshold)
 {
 	_backlightThreshold = backlightThreshold;
-	_sumBrightnessLow   = 765.0 * ((std::pow(2.0,backlightThreshold*2)-1) / 3.0);
+	_sumBrightnessLow   = 765.0 * ((std::pow(2.0,(_backlightThreshold/100)*2)-1) / 3.0);
 }
 
 bool RgbTransform::getBacklightColored() const
@@ -127,8 +127,7 @@ void RgbTransform::updateBrightnessComponents()
 
 	if (_brightness > 0)
 	{
-		B_in = -0.093*_brightness+std::sqrt(_brightness);
-		if (_brightness< 57) B_in += std::sqrt(57)-std::sqrt(_brightness);
+		B_in = (_brightness<50)? -0.09*_brightness+7.5 : -0.04*_brightness+5.0;
 
 		_brightness_rgb = std::ceil(std::min(255.0,255.0/B_in));
 		_brightness_cmy = std::ceil(std::min(255.0,255.0/(B_in*Fcmy)));
diff --git a/src/hyperion-remote/JsonConnection.cpp b/src/hyperion-remote/JsonConnection.cpp
index 8953ea422..25d7ffcf1 100644
--- a/src/hyperion-remote/JsonConnection.cpp
+++ b/src/hyperion-remote/JsonConnection.cpp
@@ -445,7 +445,7 @@ void JsonConnection::setAdjustment(
 		double *gammaR,
 		double *gammaG,
 		double *gammaB,
-		double *backlightThreshold,
+		int    *backlightThreshold,
 		int    *backlightColored,
 		int    *brightness,
 		int    *brightnessC)
diff --git a/src/hyperion-remote/JsonConnection.h b/src/hyperion-remote/JsonConnection.h
index 219ed0021..4a3d9f6a4 100644
--- a/src/hyperion-remote/JsonConnection.h
+++ b/src/hyperion-remote/JsonConnection.h
@@ -154,7 +154,7 @@ class JsonConnection
 		double *gammaR,
 		double *gammaG,
 		double *gammaB,
-		double *backlightThreshold,
+		int    *backlightThreshold,
 		int    *backlightColored,
 		int    *brightness,
 		int    *brightnessC);
diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp
index 081a7a85a..aa6e1f929 100644
--- a/src/hyperion-remote/hyperion-remote.cpp
+++ b/src/hyperion-remote/hyperion-remote.cpp
@@ -78,7 +78,7 @@ int main(int argc, char * argv[])
 		Option          & argId           = parser.add<Option>      ('q', "qualifier" , "Identifier(qualifier) of the adjustment to set");
 		IntOption       & argBrightness   = parser.add<IntOption>   ('L', "brightness" , "Set the brightness gain of the leds");
 		IntOption       & argBrightnessC  = parser.add<IntOption>   (0x0, "brightnessCompensation" , "Set the brightness compensation");
-		DoubleOption    & argBacklightThreshold= parser.add<DoubleOption> ('n', "backlightThreshold" , "threshold for activating backlight (minimum brightness)");
+		IntOption       & argBacklightThreshold= parser.add<IntOption> ('n', "backlightThreshold" , "threshold for activating backlight (minimum brightness)");
 		IntOption       & argBacklightColored  = parser.add<IntOption>    (0x0, "backlightColored" , "0 = white backlight; 1 =  colored backlight");
 		DoubleOption    & argGamma       = parser.add<DoubleOption>  ('g', "gamma"     , "Set the overall gamma of the leds");
 		BooleanOption   & argPrint       = parser.add<BooleanOption>(0x0, "print"     , "Print the json input and output messages on stdout");
@@ -250,7 +250,7 @@ int main(int argc, char * argv[])
 				argGamma.getDoublePtr(parser),
 				argGamma.getDoublePtr(parser),
 				argGamma.getDoublePtr(parser),
-				argBacklightThreshold.getDoublePtr(parser),
+				argBacklightThreshold.getIntPtr(parser),
 				argBacklightColored.getIntPtr(parser),
 				argBrightness.getIntPtr(parser),
 				argBrightnessC.getIntPtr(parser)