From 4decb05348fa80c65c26f8f857f57f860d2964ac Mon Sep 17 00:00:00 2001
From: redpanther <redpanther@spooky-online.de>
Date: Sun, 31 Jan 2016 22:38:30 +0100
Subject: [PATCH] adds ability to set static color on boot.

Former-commit-id: 41ca5ba73fde698d73380fac3dcee5e33b310d76
---
 config/hyperion.config.json     |  4 ++++
 config/hyperion_x86.config.json |  6 +++++-
 src/hyperiond/hyperiond.cpp     | 20 +++++++++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/config/hyperion.config.json b/config/hyperion.config.json
index b16b845e..34f485cf 100644
--- a/config/hyperion.config.json
+++ b/config/hyperion.config.json
@@ -364,7 +364,10 @@
 	/// The configuration of the effect engine, contains the following items: 
 	///  * paths        : An array with absolute location(s) of directories with effects 
 	///  * bootsequence : The effect selected as 'boot sequence'
+	///    * effect : name of the effect you want to start. Set to empty if no effect wanted
+	///    * color  : switch to static color after effect is done
 	///    * duration_ms : duration of boot effect in ms. 0 means effect stays forever
+	///    * priority : priority of boot effect and static color
 	"effects" : 
 	{
 		"paths" : 
@@ -375,6 +378,7 @@
 
 	"bootsequence" : 
 	{
+		"color"       : [0,0,0],
 		"effect"      : "Rainbow swirl fast",
 		"duration_ms" : 3000,
 		"priority"    : 0
diff --git a/config/hyperion_x86.config.json b/config/hyperion_x86.config.json
index 06e35136..4121c499 100644
--- a/config/hyperion_x86.config.json
+++ b/config/hyperion_x86.config.json
@@ -359,7 +359,10 @@
 	/// The configuration of the effect engine, contains the following items: 
 	///  * paths        : An array with absolute location(s) of directories with effects 
 	///  * bootsequence : The effect selected as 'boot sequence'
+	///    * effect : name of the effect you want to start. Set to empty if no effect wanted
+	///    * color  : switch to static color after effect is done
 	///    * duration_ms : duration of boot effect in ms. 0 means effect stays forever
+	///    * priority : priority of boot effect and static color
 	"effects" : 
 	{
 		"paths" : 
@@ -370,9 +373,10 @@
 
 	"bootsequence" : 
 	{
+		"color"       : [0,0,0],
 		"effect"      : "Rainbow swirl fast",
 		"duration_ms" : 3000,
-		"priority"    : 0
+		"priority"    : 900
 	},
 
 	///  The configuration for the frame-grabber, contains the following items: 
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index b6289fe2..032d44db 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -127,19 +127,33 @@ int main(int argc, char** argv)
 		const std::string effectName = effectConfig["effect"].asString();
 		const unsigned duration_ms   = effectConfig["duration_ms"].asUInt();
 		const int priority           = effectConfig["priority"].asUInt();
+		const int bootcolor_priority = (priority > 990) ? priority+1 : 990;
 
-		hyperion.setColor(priority+1, ColorRgb::BLACK, duration_ms, false);
+		if ( ! effectConfig["color"].isNull() && effectConfig["color"].isArray() && effectConfig["color"].size() == 3 )
+		{
+			ColorRgb boot_color = {
+				(uint8_t)effectConfig["color"][0].asUInt(),
+				(uint8_t)effectConfig["color"][1].asUInt(),
+				(uint8_t)effectConfig["color"][2].asUInt()
+			};
+
+			hyperion.setColor(bootcolor_priority, boot_color, 0, false);
+		}
+		else
+		{
+			hyperion.setColor(bootcolor_priority, ColorRgb::BLACK, duration_ms, false);
+		}
 
 		if (effectConfig.isMember("args"))
 		{
 			const Json::Value effectConfigArgs = effectConfig["args"];
 			if (hyperion.setEffect(effectName, effectConfigArgs, priority, duration_ms) == 0)
 			{
-					std::cout << "Boot sequence(" << effectName << ") with user-defined arguments created and started" << std::endl;
+				std::cout << "Boot sequence(" << effectName << ") with user-defined arguments created and started" << std::endl;
 			}
 			else
 			{
-					std::cout << "Failed to start boot sequence: " << effectName << " with user-defined arguments" << std::endl;
+				std::cout << "Failed to start boot sequence: " << effectName << " with user-defined arguments" << std::endl;
 			}
 		}
 		else