Added smoothing to the Hyperion configuration

Former-commit-id: 85e27d54841de5030199dd7f70bb0f29250abb6a

libsrc/hyperion/Hyperion.cpp

@@ -21,8 +21,12 @@
 LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
 {
 	std::cout << "Device configuration: " << deviceConfig << std::endl;
+
+	std::string type = deviceConfig.get("type", "UNSPECIFIED").asString();
+	std::transform(type.begin(), type.end(), type.begin(), ::tolower);
+
 	LedDevice* device = nullptr;
-	if (deviceConfig["type"].asString() == "ws2801")
+	if (type == "ws2801")
 	{
 		const std::string output = deviceConfig["output"].asString();
 		const unsigned rate      = deviceConfig["rate"].asInt();
@@ -32,13 +36,13 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
 
 		device = deviceWs2801;
 	}
-	else if (deviceConfig["type"].asString() == "test")
+	else if (type == "test")
 	{
 		device = new LedDeviceTest();
 	}
 	else
 	{
-		std::cout << "Unable to create device" << std::endl;
+		std::cout << "Unable to create device " << type << std::endl;
 		// Unknown / Unimplemented device
 	}
 	return device;
@@ -95,7 +99,35 @@ LedString Hyperion::createLedString(const Json::Value& ledsConfig)
 
 LedDevice * Hyperion::createColorSmoothing(const Json::Value & smoothingConfig, LedDevice * ledDevice)
 {
-	//return new LinearColorSmoothing(ledDevice, 20.0, .3);
+	std::string type = smoothingConfig.get("type", "none").asString();
+	std::transform(type.begin(), type.end(), type.begin(), ::tolower);
+
+	if (type == "none")
+	{
+		std::cout << "Not creating any smoothing" << std::endl;
+		return ledDevice;
+	}
+	else if (type == "linear")
+	{
+		if (!smoothingConfig.isMember("time_ms"))
+		{
+			std::cout << "Unable to create smoothing of type linear because of missing parameter 'time_ms'" << std::endl;
+		}
+		else if (!smoothingConfig.isMember("updateFrequency"))
+		{
+			std::cout << "Unable to create smoothing of type linear because of missing parameter 'updateFrequency'" << std::endl;
+		}
+		else
+		{
+			std::cout << "Creating linear smoothing" << std::endl;
+			return new LinearColorSmoothing(ledDevice, smoothingConfig["updateFrequency"].asDouble(), smoothingConfig["time_ms"].asInt());
+		}
+	}
+	else
+	{
+		std::cout << "Unable to create smoothing of type " << type << std::endl;
+	}
+
 	return ledDevice;
 }
 
@@ -114,7 +146,7 @@ Hyperion::Hyperion(const Json::Value &jsonConfig) :
 	ImageProcessorFactory::getInstance().init(_ledString, jsonConfig["blackborderdetector"].get("enable", true).asBool());
 
 	// initialize the color smoothing filter
-	_device = createColorSmoothing(jsonConfig["smoothing"], _device);
+	_device = createColorSmoothing(jsonConfig["color"]["smoothing"], _device);
 
 	// setup the timer
 	_timer.setSingleShot(true);

libsrc/hyperion/LinearColorSmoothing.cpp

@@ -3,12 +3,12 @@
 
 #include "LinearColorSmoothing.h"
 
-LinearColorSmoothing::LinearColorSmoothing(LedDevice *ledDevice, double ledUpdateFrequency, double settlingTime) :
+LinearColorSmoothing::LinearColorSmoothing(LedDevice *ledDevice, double ledUpdateFrequency_hz, int settlingTime_ms) :
 	QObject(),
 	LedDevice(),
 	_ledDevice(ledDevice),
-	_updateInterval(1000.0 / ledUpdateFrequency),
-	_settlingTime(1000 * settlingTime),
+	_updateInterval(1000 / ledUpdateFrequency_hz),
+	_settlingTime(settlingTime_ms),
 	_timer()
 {
 	_timer.setSingleShot(false);

libsrc/hyperion/LinearColorSmoothing.h

@@ -26,7 +26,7 @@ public:
 	/// @param LedDevice the led device
 	/// @param LedUpdatFrequency The frequency at which the leds will be updated (Hz)
 	/// @param settingTime The time after which the updated led values have been fully applied (sec)
-	LinearColorSmoothing(LedDevice *ledDevice, double ledUpdateFrequency, double settlingTime);
+	LinearColorSmoothing(LedDevice *ledDevice, double ledUpdateFrequency, int settlingTime);
 
 	/// Destructor
 	virtual ~LinearColorSmoothing();

libsrc/hyperion/hyperion.schema.json

@@ -125,7 +125,30 @@
                         }
                     },
                     "additionalProperties" : false
+                },
+                "smoothing" : {
+                    "type" : "object",
+                    "required" : false,
+                    "properties" : {
+                        "type" : {
+                            "type" : "enum",
+                            "required" : true,
+                            "values" : ["none", "linear"]
+                        },
+                        "time_ms" : {
+                            "type" : "integer",
+                            "required" : false,
+                            "minimum" : 10
+                        },
+                        "updateFrequency" : {
+                            "type" : "number",
+                            "required" : false,
+                            "minimum" : 0.001
+                        }
+                    },
+                    "additionalProperties" : false
                 }
+
             },
             "additionalProperties" : false
         },