Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	CMakeLists.txt
	config/hyperion.config.json

Former-commit-id: f0fb0e5aa6fb02ca41612bd675c48a1ab5d62600

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Define the main-project name
-project(hyperion)
+project(Hyperion)
 
 # define the minimum cmake version (as required by cmake)
 cmake_minimum_required(VERSION 2.8)
@@ -44,6 +44,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
 # Configure the use of QT4
 find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET)
 
+# add protocol buffers
+find_package(Protobuf REQUIRED)
+
+#add libusb and pthreads
+find_package(libusb-1.0 REQUIRED)
+find_package(Threads REQUIRED)
+
 include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 link_directories(${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)

config/hyperion.config.json

@@ -34,72 +34,35 @@
 	///            - 'updateFrequency' The update frequency of the leds in Hz
 	"color" :
 	{
-		"transform" :
+		"hsv" :
-		[
+		{
-			{
+			"saturationGain" : 1.0000,
-				"id" : "device_1",
+			"valueGain"      : 1.5000
-				"leds" : "0-24",
+		},
-				"hsv" :
+		"red" :
-				{
+		{
-					"saturationGain" : 1.0000,
+			"threshold"  : 0.1000,
-					"valueGain"      : 1.5000
+			"gamma"      : 2.0000,
-				},
+			"blacklevel" : 0.0000,
-				"red" :
+			"whitelevel" : 0.8000
-				{
+		},
-					"threshold"  : 0.1000,
+		"green" :
-					"gamma"      : 2.0000,
+		{
-					"blacklevel" : 0.0000,
+			"threshold"  : 0.1000,
-					"whitelevel" : 0.8000
+			"gamma"      : 2.0000,
-				},
+			"blacklevel" : 0.0000,
-				"green" :
+			"whitelevel" : 1.0000
-				{
+		},
-					"threshold"  : 0.1000,
+		"blue" :
-					"gamma"      : 2.0000,
+		{
-					"blacklevel" : 0.0000,
+			"threshold"  : 0.1000,
-					"whitelevel" : 1.0000
+			"gamma"      : 2.0000,
-				},
+			"blacklevel" : 0.0000,
-				"blue" :
+			"whitelevel" : 1.0000
-				{
+		},
-					"threshold"  : 0.1000,
-					"gamma"      : 2.0000,
-					"blacklevel" : 0.0000,
-					"whitelevel" : 1.0000
-				}
-			},
-			{
-				"id" : "device_2",
-				"leds" : "25-49",
-				"hsv" :
-				{
-					"saturationGain" : 1.0000,
-					"valueGain"      : 1.5000
-				},
-				"red" :
-				{
-					"threshold"  : 0.1000,
-					"gamma"      : 2.0000,
-					"blacklevel" : 0.0000,
-					"whitelevel" : 0.8000
-				},
-				"green" :
-				{
-					"threshold"  : 0.1000,
-					"gamma"      : 2.0000,
-					"blacklevel" : 0.0000,
-					"whitelevel" : 1.0000
-				},
-				"blue" :
-				{
-					"threshold"  : 0.1000,
-					"gamma"      : 2.0000,
-					"blacklevel" : 0.0000,
-					"whitelevel" : 1.0000
-				}
-			}
-		],
 		"smoothing" :
 		{
-			"type"            : "linear",
+			"type"            : "none",
 			"time_ms"         : 200,
 			"updateFrequency" : 20.0000
 		}
@@ -376,7 +339,7 @@
 	},
 
 	/// The boot-sequence configuration, contains the following items: 
-	///  * type        : The type of the boot-sequence ('rainbow', 'knight_rider', 'none')
+	///  * type        : The type of the boot-sequence ('rainbow', 'knightrider', 'none') 
 	///  * duration_ms : The length of the boot-sequence [ms]
 	"bootsequence" :
 	{

config/hyperion_multicolor.config.json

@@ -0,0 +1,409 @@
+// Automatically generated configuration file for 'Hyperion daemon'
+// Generated by: HyperCon (The Hyperion deamon configuration file builder
+
+{
+	/// Device configuration contains the following fields:
+	/// * 'name'       : The user friendly name of the device (only used for display purposes)
+	/// * 'type'       : The type of the device or leds (known types for now are 'ws2801', 'ldp8806',
+	///                  'lpd6803', 'sedu', 'adalight', 'lightpack', 'test' and 'none')
+	/// * 'output'     : The output specification depends on selected device. This can for example be the
+	///                  device specifier, device serial number, or the output file name
+	/// * 'rate'       : The baudrate of the output to the device
+	/// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.).
+	"device" :
+	{
+		"name"       : "MyPi",
+		"type"       : "ws2801",
+		"output"     : "/dev/spidev0.0",
+		"rate"       : 500000,
+		"colorOrder" : "rgb"
+	},
+
+	/// Color manipulation configuration used to tune the output colors to specific surroundings. Contains the following fields:
+	///  * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following tuning parameters:
+	///            - 'saturationGain'  The gain adjustement of the saturation
+	///            - 'valueGain'       The gain adjustement of the value
+	///  * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the following tuning parameters for each channel:
+	///            - 'threshold'       The minimum required input value for the channel to be on (else zero)
+	///            - 'gamma'           The gamma-curve correction factor
+	///            - 'blacklevel'      The lowest possible value (when the channel is black)
+	///            - 'whitelevel'      The highest possible value (when the channel is white)
+	///  * 'smoothing' : Smoothing of the colors in the time-domain with the following tuning parameters:
+	///            - 'type'            The type of smoothing algorithm ('linear' or 'none')
+	///            - 'time_ms'         The time constant for smoothing algorithm in milliseconds
+	///            - 'updateFrequency' The update frequency of the leds in Hz
+	"color" :
+	{
+		"transform" :
+		[
+			{
+				"id" : "MyPi device",
+				"leds" : "0-49",
+				"hsv" :
+				{
+					"saturationGain" : 1.0000,
+					"valueGain"      : 1.5000
+				},
+				"red" :
+				{
+					"threshold"  : 0.1000,
+					"gamma"      : 2.0000,
+					"blacklevel" : 0.0000,
+					"whitelevel" : 0.8000
+				},
+				"green" :
+				{
+					"threshold"  : 0.1000,
+					"gamma"      : 2.0000,
+					"blacklevel" : 0.0000,
+					"whitelevel" : 1.0000
+				},
+				"blue" :
+				{
+					"threshold"  : 0.1000,
+					"gamma"      : 2.0000,
+					"blacklevel" : 0.0000,
+					"whitelevel" : 1.0000
+				}
+			}
+		],
+		"smoothing" :
+		{
+			"type"            : "linear",
+			"time_ms"         : 200,
+			"updateFrequency" : 20.0000
+		}
+	},
+
+	/// The configuration for each individual led. This contains the specification of the area
+	/// averaged of an input image for each led to determine its color. Each item in the list
+	/// contains the following fields:
+	/// * index: The index of the led. This determines its location in the string of leds; zero
+	///          being the first led.
+	/// * hscan: The fractional part of the image along the horizontal used for the averaging
+	///          (minimum and maximum inclusive)
+	/// * vscan: The fractional part of the image along the vertical used for the averaging
+	///          (minimum and maximum inclusive)
+	"leds" :
+	[
+		{
+			"index" : 0,
+			"hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 1,
+			"hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 2,
+			"hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 3,
+			"hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 4,
+			"hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 5,
+			"hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 6,
+			"hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 7,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 8,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 9,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 10,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
+		},
+		{
+			"index" : 11,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
+		},
+		{
+			"index" : 12,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
+		},
+		{
+			"index" : 13,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
+		},
+		{
+			"index" : 14,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
+		},
+		{
+			"index" : 15,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
+		},
+		{
+			"index" : 16,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 17,
+			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 18,
+			"hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 19,
+			"hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 20,
+			"hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 21,
+			"hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 22,
+			"hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 23,
+			"hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 24,
+			"hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 25,
+			"hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 26,
+			"hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 27,
+			"hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 28,
+			"hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 29,
+			"hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 30,
+			"hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 31,
+			"hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 32,
+			"hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 33,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+		},
+		{
+			"index" : 34,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
+		},
+		{
+			"index" : 35,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
+		},
+		{
+			"index" : 36,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
+		},
+		{
+			"index" : 37,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
+		},
+		{
+			"index" : 38,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
+		},
+		{
+			"index" : 39,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
+		},
+		{
+			"index" : 40,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 41,
+			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 42,
+			"hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 43,
+			"hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 44,
+			"hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 45,
+			"hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 46,
+			"hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 47,
+			"hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 48,
+			"hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		},
+		{
+			"index" : 49,
+			"hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
+			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+		}
+	],
+
+	/// The black border configuration, contains the following items:
+	///  * enable : true if the detector should be activated
+	"blackborderdetector" :
+	{
+		"enable" : true
+	},
+
+	/// The boot-sequence configuration, contains the following items:
+	///  * type        : The type of the boot-sequence ('rainbow', 'knightrider', 'none')
+	/// The boot-sequence configuration, contains the following items:
+	///  * type        : The type of the boot-sequence ('rainbow', 'knight_rider', 'none')
+	///  * duration_ms : The length of the boot-sequence [ms]
+	"bootsequence" :
+	{
+		"type"        : "Rainbow",
+		"duration_ms" : 3000
+	},
+
+	/// The configuration for the frame-grabber, contains the following items:
+	///  * width        : The width of the grabbed frames [pixels]
+	///  * height       : The height of the grabbed frames [pixels]
+	///  * frequency_Hz : The frequency of the frame grab [Hz]
+	"framegrabber" :
+	{
+		"width"        : 64,
+		"height"       : 64,
+		"frequency_Hz" : 10.0
+	},
+
+	/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
+	///  * xbmcAddress  : The IP address of the XBMC-host
+	///  * xbmcTcpPort  : The TCP-port of the XBMC-server
+	///  * grabVideo    : Flag indicating that the frame-grabber is on(true) during video playback
+	///  * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
+	///  * grabAudio    : Flag indicating that the frame-grabber is on(true) during audio playback
+	///  * grabMenu     : Flag indicating that the frame-grabber is on(true) in the XBMC menu
+	"xbmcVideoChecker" :
+	{
+		"xbmcAddress"  : "127.0.0.1",
+		"xbmcTcpPort"  : 9090,
+		"grabVideo"    : true,
+		"grabPictures" : true,
+		"grabAudio"    : true,
+		"grabMenu"     : false
+	},
+
+	/// The configuration of the Json server which enables the json remote interface
+	///  * port : Port at which the json server is started
+	"jsonServer" :
+	{
+		"port" : 19444
+	},
+
+	/// The configuration of the Proto server which enables the protobuffer remote interface
+	///  * port : Port at which the protobuffer server is started
+	"protoServer" :
+	{
+		"port" : 19445
+	},
+
+	/// The configuration of the boblight server which enables the boblight remote interface
+	///  * port : Port at which the boblight server is started
+//	"boblightServer" :
+//	{
+//		"port" : 19333
+//	},
+
+	"end-of-json" : "end-of-json"
+}

include/hyperion/Hyperion.h

@@ -101,6 +101,9 @@ public:
 	///
 	ColorTransform * getTransform(const std::string& id);
 
+	/// Tell Hyperion that the transforms have changed and the leds need to be updated
+	void transformsUpdated();
+
 	///
 	/// Clears the given priority channel. This will switch the led-colors to the colors of the next
 	/// lower priority channel (or off if no more channels are set)

libsrc/hyperion/Hyperion.cpp

@@ -418,6 +418,11 @@ ColorTransform * Hyperion::getTransform(const std::string& id)
 	return _raw2ledTransform->getTransform(id);
 }
 
+void Hyperion::transformsUpdated()
+{
+	update();
+}
+
 void Hyperion::clear(int priority)
 {
 	if (_muxer.hasPriority(priority))

libsrc/jsonserver/JsonClientConnection.cpp

@@ -287,6 +287,9 @@ void JsonClientConnection::handleTransformCommand(const Json::Value &message)
 		colorTransform->_rgbBlueTransform .setWhitelevel(values[2u].asDouble());
 	}
 
+	// commit the changes
+	_hyperion->transformsUpdated();
+
 	sendSuccessReply();
 }
 

test/dispmanx2png/dispmanx2png.cpp

@@ -27,6 +27,7 @@ int main(int argc, char** argv)
 	signal(SIGINT,  signal_handler);
 
 	int grabFlags = 0;
+	int grabCount = -1;
 	try
 	{
 		// create the option parser and initialize all parameters
@@ -35,6 +36,8 @@ int main(int argc, char** argv)
 
 		QString flagDescr = QString("Set the grab flags of the dispmanx frame grabber [default: 0x%1]").arg(grabFlags, 8, 16, QChar('0'));
 		StringParameter   & argFlags = parameters.add<StringParameter>   ('f', "flags", flagDescr.toAscii().constData());
+		IntParameter      & argCount = parameters.add<IntParameter>      ('n', "count", "Number of images to capture (default infinite)");
+		argCount.setDefault(grabCount);
 		SwitchParameter<> & argList  = parameters.add<SwitchParameter<> >('l', "list",  "List the possible flags");
 		SwitchParameter<> & argHelp  = parameters.add<SwitchParameter<> >('h', "help",  "Show this help message and exit");
 
@@ -90,6 +93,8 @@ int main(int argc, char** argv)
 				return -1;
 			}
 		}
+
+		grabCount = argCount.getValue();
 	}
 	catch (const std::runtime_error & e)
 	{
@@ -106,7 +111,7 @@ int main(int argc, char** argv)
 	QImage qImage(64, 64, QImage::Format_ARGB32);
 	Image<ColorRgba> imageRgba(64, 64);
 
-	while(running)
+	for (int i=0; i<grabCount || grabCount < 0; ++i)
 	{
 		frameGrabber.grabFrame(imageRgba);
 
@@ -117,7 +122,7 @@ int main(int argc, char** argv)
 		}
 
 		const QImage qImageSwp = qImage.rgbSwapped();
-		qImageSwp.save(QString("HYPERION_%3.png").arg(iFrame));
+		qImageSwp.save(QString("HYPERION_f0x%1_%2.png").arg(grabFlags, 8, 16, QChar('0')).arg(iFrame));
 		++iFrame;
 
 		timespec sleepTime;
@@ -128,3 +133,4 @@ int main(int argc, char** argv)
 
 	return 0;
 }
+