Webui: extend led hardware config + connection lost page (#226)

* split content and js
tune leds config

* implement connection lost page

* split js/html in huebridge

* add js action for connection lost

* extend led config
make connection loss nicer

* tune led code
add menu entry for grabber

* more tuning of webui

* switch back to botstrap textarea
add v4l to components

* add icon

* extend schema for jsoneditor

* implement ledcolors streaming with 4fps

* implement component state

libsrc/hyperion/CMakeLists.txt

@@ -9,6 +9,7 @@ SET(Hyperion_QT_HEADERS
 
 	${CURRENT_SOURCE_DIR}/LinearColorSmoothing.h
 	${CURRENT_HEADER_DIR}/GrabberWrapper.h
+	${CURRENT_HEADER_DIR}/ComponentRegister.h
 )
 
 SET(Hyperion_HEADERS
@@ -38,6 +39,7 @@ SET(Hyperion_SOURCES
 	${CURRENT_SOURCE_DIR}/LinearColorSmoothing.cpp
 	${CURRENT_SOURCE_DIR}/MessageForwarder.cpp
 	${CURRENT_SOURCE_DIR}/GrabberWrapper.cpp
+	${CURRENT_SOURCE_DIR}/ComponentRegister.cpp
 )
 
 SET(Hyperion_RESOURCES

libsrc/hyperion/ComponentRegister.cpp

@@ -0,0 +1,27 @@
+#include <hyperion/ComponentRegister.h>
+#include <iostream>
+
+ComponentRegister::ComponentRegister()
+	: _log(Logger::getInstance("ComponentRegister"))
+{
+}
+
+ComponentRegister::~ComponentRegister()
+{
+}
+
+
+void ComponentRegister::componentStateChanged(const hyperion::Components comp, const bool activated)
+{
+	Info(_log, "%s: %s", componentToString(comp), (activated? "activated" : "off"));
+	_componentStates.emplace(comp,activated);
+	_componentStates[comp] = activated;
+
+/*	for(auto comp : _componentStates)
+	{
+		std::cout << hyperion::componentToIdString(comp.first) << " " << comp.second << std::endl;
+	}
+	std::cout << "\n";
+	*/
+}
+ 

libsrc/hyperion/GrabberWrapper.cpp

@@ -17,6 +17,7 @@ GrabberWrapper::GrabberWrapper(std::string grabberName, const int priority, hype
 	_timer.setSingleShot(false);
 
 	_forward = _hyperion->getForwarder()->protoForwardingEnabled();
+	_hyperion->getComponentRegister().componentStateChanged(hyperion::COMP_BLACKBORDER, _processor->blackBorderDetectorEnabled());
 	connect(_hyperion, SIGNAL(componentStateChanged(hyperion::Components,bool)), this, SLOT(componentStateChanged(hyperion::Components,bool)));
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(action()));
 
@@ -45,27 +46,36 @@ void GrabberWrapper::stop()
 
 void GrabberWrapper::componentStateChanged(const hyperion::Components component, bool enable)
 {
-	if (component == _grabberComponentId && _timer.isActive() != enable)
+	if (component == _grabberComponentId)
 	{
-		if (enable) start();
-		else        stop();
-
-		_forward = _hyperion->getForwarder()->protoForwardingEnabled();
-
-		if ( enable == _timer.isActive() )
+		if (_timer.isActive() != enable)
 		{
-			Info(_log, "grabber change state to %s", (_timer.isActive() ? "enabled" : "disabled") );
-		}
-		else
-		{
-			WarningIf( enable, _log, "enable grabber failed");
+			if (enable) start();
+			else        stop();
+
+			_forward = _hyperion->getForwarder()->protoForwardingEnabled();
+
+
+			if ( enable == _timer.isActive() )
+			{
+				Info(_log, "grabber change state to %s", (_timer.isActive() ? "enabled" : "disabled") );
+			}
+			else
+			{
+				WarningIf( enable, _log, "enable grabber failed");
+			}
 		}
+		_hyperion->getComponentRegister().componentStateChanged(component, _timer.isActive());
 	}
 
-	if (component == hyperion::COMP_BLACKBORDER && _processor->blackBorderDetectorEnabled() != enable)
+	if (component == hyperion::COMP_BLACKBORDER)
 	{
-		_processor->enableBlackBorderDetector(enable);
-		Info(_log, "bb detector change state to %s", (_processor->blackBorderDetectorEnabled() ? "enabled" : "disabled") );
+		if (_processor->blackBorderDetectorEnabled() != enable)
+		{
+			_processor->enableBlackBorderDetector(enable);
+			Info(_log, "bb detector change state to %s", (_processor->blackBorderDetectorEnabled() ? "enabled" : "disabled") );
+		}
+		_hyperion->getComponentRegister().componentStateChanged(component, _processor->blackBorderDetectorEnabled());
 	}
 }
 

libsrc/hyperion/Hyperion.cpp

@@ -507,6 +507,7 @@ LedDevice * Hyperion::createColorSmoothing(const Json::Value & smoothingConfig,
 	if ( ! smoothingConfig.get("enable", true).asBool() )
 	{
 		Info(log,"Smoothing disabled");
+		Hyperion::getInstance()->getComponentRegister().componentStateChanged(hyperion::COMP_SMOOTHING, false);
 		return nullptr;
 	}
 
@@ -603,12 +604,16 @@ Hyperion::Hyperion(const Json::Value &jsonConfig, const std::string configFile)
 				_ledString,
 				jsonConfig["blackborderdetector"]
 	);
+	//_hyperion->getComponentRegister().componentStateChanged(component, _processor->blackBorderDetectorEnabled());
 
+	getComponentRegister().componentStateChanged(hyperion::COMP_FORWARDER, _messageForwarder->forwardingEnabled());
+	
 	// initialize the color smoothing filter
 	LedDevice* smoothing = createColorSmoothing(jsonConfig["smoothing"], _device);
 	if ( smoothing != nullptr )
 	{
 		_device = smoothing;
+		getComponentRegister().componentStateChanged(hyperion::COMP_SMOOTHING, ((LinearColorSmoothing*)_device)->componentState());
 		connect(this, SIGNAL(componentStateChanged(hyperion::Components,bool)), (LinearColorSmoothing*)_device, SLOT(componentStateChanged(hyperion::Components,bool)));
 	}
 

libsrc/hyperion/LinearColorSmoothing.cpp

@@ -2,6 +2,7 @@
 #include <QDateTime>
 
 #include "LinearColorSmoothing.h"
+#include <hyperion/Hyperion.h>
 
 using namespace hyperion;
 
@@ -21,7 +22,6 @@ LinearColorSmoothing::LinearColorSmoothing( LedDevice * ledDevice, double ledUpd
 	_timer.setInterval(_updateInterval);
 
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(updateLeds()));
-
 	Info( _log, "Created linear-smoothing with interval: %d ms, settlingTime: %d ms, updateDelay: %d frames",
 	      _updateInterval, settlingTime_ms,  _outputDelay );
 }
@@ -141,10 +141,11 @@ void LinearColorSmoothing::queueColors(const std::vector<ColorRgb> & ledColors)
 
 void LinearColorSmoothing::componentStateChanged(const hyperion::Components component, bool enable)
 {
-	if (component == COMP_SMOOTHING && _bypass == enable)
+	if (component == COMP_SMOOTHING)
 	{
+		InfoIf(_bypass == enable, _log, "change state to %s", (enable ? "enabled" : "disabled") );
+		Hyperion::getInstance()->getComponentRegister().componentStateChanged(component, enable);
 		_bypass = !enable;
-		Info(_log, "change state to %s", (enable ? "enabled" : "disabled") );
 	}
 }
 

libsrc/hyperion/LinearColorSmoothing.h

@@ -40,7 +40,7 @@ public:
 	/// Switch the leds off
 	virtual int switchOff();
 
-	bool componentState() { return _bypass; }
+	bool componentState() { return !_bypass; }
 
 private slots:
 	/// Timer callback which writes updated led values to the led device

libsrc/hyperion/MessageForwarder.cpp

@@ -49,3 +49,8 @@ bool MessageForwarder::protoForwardingEnabled()
 {
 	return ! _protoSlaves.empty();
 }
+
+bool MessageForwarder::jsonForwardingEnabled()
+{
+	return ! _jsonSlaves.empty();
+}

libsrc/hyperion/hyperion.schema.json

@@ -59,16 +59,20 @@
 			"type":"object",
 			"title" : "Color Calibration",
 			"required" : true,
+			"defaultProperties": ["channelAdjustment_enable","channelAdjustment","transform_enable","transform"],
 			"properties":
 			{
 				"channelAdjustment_enable" :
 				{
-					"type" : "boolean"
+					"type" : "boolean",
+					"format": "checkbox",
+					"propertyOrder" : 1
 				},
 				"channelAdjustment" :
 				{
 					"type" : "array",
 					"required" : true,
+					"propertyOrder" : 2,
 					"items" :
 					{
 						"type" : "object",
@@ -239,12 +243,15 @@
 				},
 				"transform_enable" :
 				{
-					"type" : "boolean"
+					"type" : "boolean",
+					"format": "checkbox",
+					"propertyOrder" : 3
 				},
 				"transform" :
 				{
 					"type" : "array",
 					"required" : true,
+					"propertyOrder" : 4,
 					"items" :
 					{
 						"type" : "object",
@@ -376,7 +383,8 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"default" : true
+					"default" : true,
+					"propertyOrder" : 1
 				},
 				"type" :
 				{
@@ -433,7 +441,8 @@
 						"type" : "boolean",
 						"format": "checkbox",
 						"title" : "Activate",
-						"default" : false
+						"default" : false,
+						"propertyOrder" : 1
 					},
 					"device" :
 					{
@@ -565,12 +574,15 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"default" : true
+					"default" : true,
+					"propertyOrder" : 1
 				},
 				"type" :
 				{
 					"type" : "string",
-					"title" : "Type"
+					"title" : "Type",
+					"enum"  : ["auto","dispmanx","amlogic","x11","framebuffer"],
+					"default" : "auto"
 				},
 				"width" :
 				{
@@ -667,6 +679,7 @@
 			"type" : "object",
 			"title" : "Blackbar detector",
 			"required": ["mode"],
+			"defaultProperties": ["enable","mode","threshold"],
 			"properties" :
 			{
 				"enable" :
@@ -674,7 +687,8 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"default" : true
+					"default" : true,
+					"propertyOrder" : 1
 				},
 				"threshold" :
 				{
@@ -687,26 +701,22 @@
 				"unknownFrameCnt"    :
 				{
 					"type" : "number",
-					"minimum" : 0,
-					"advanced" : true
+					"minimum" : 0
 				},
 				"borderFrameCnt" :
 				{
 					"type" : "number",
-					"minimum" : 0,
-					"advanced" : true
+					"minimum" : 0
 				},
 				"maxInconsistentCnt" :
 				{
 					"type" : "number",
-					"minimum" : 0,
-					"advanced" : true
+					"minimum" : 0
 				},
 				"blurRemoveCnt" :
 				{
 					"type" : "number",
-					"minimum" : 0,
-					"advanced" : true
+					"minimum" : 0
 				},
 				"mode" :
 				{
@@ -729,7 +739,8 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"default" : false
+					"default" : false,
+					"propertyOrder" : 1
 				},
 				"kodiAddress" :
 				{
@@ -801,12 +812,14 @@
 		{
 			"type" : "object",
 			"title" : "Initial Effect",
+			"defaultProperties": ["background-effect","foreground-effect","foreground-duration_ms"],
 			"properties" :
 			{
 				"background-effect" :
 				{
 					"type" : "array",
-					"title" : "Background effect"
+					"title" : "Background effect",
+					"propertyOrder" : 3
 				},
 				"background-effect-args" :
 				{
@@ -816,7 +829,8 @@
 				"foreground-effect" :
 				{
 					"type" : "array",
-					"title" : "Boot effect"
+					"title" : "Boot effect",
+					"propertyOrder" : 1
 				},
 				"foreground-effect-args" :
 				{
@@ -826,7 +840,8 @@
 				"foreground-duration_ms" :
 				{
 					"type" : "integer",
-					"title" : "Boot effect duration"
+					"title" : "Boot effect duration",
+					"propertyOrder" : 2
 				}
 			},
 			"additionalProperties" : false
@@ -843,7 +858,8 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"required" : true
+					"required" : true,
+					"propertyOrder" : 1
 				},
 				"json" :
 				{
@@ -907,7 +923,8 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"default" : false
+					"default" : false,
+					"propertyOrder" : 1
 				},
 				"port" :
 				{
@@ -938,7 +955,8 @@
 					"type" : "boolean",
 					"format": "checkbox",
 					"title" : "Activate",
-					"default" : false
+					"default" : false,
+					"propertyOrder" : 1
 				},
 				"address" :
 				{
@@ -990,7 +1008,8 @@
 					"format": "checkbox",
 					"title" : "Activate",
 					"default" : true,
-					"required" : true
+					"required" : true,
+					"propertyOrder" : 1
 				},
 				"document_root" :
 				{
@@ -1085,7 +1104,7 @@
 					"colorOrder":
 					{
 						"type": "string",
-						"enum" : ["bgr", "rbg", "brg", "gbr", "grb"]
+						"enum" : ["rgb", "bgr", "rbg", "brg", "gbr", "grb"]
 					}
 				},
 				"additionalProperties" : false