Merge branch 'master' of https://github.com/tvdzwan/hyperion

Former-commit-id: 3d78776087fc12679cccd6deae9686511fadf3fb

config/hyperion.config.json

@@ -31,7 +31,7 @@
         "hsv" :
         {
             "saturationGain" : 1.0000,
-			"valuGain"       : 1.5000
+            "valueGain"       : 1.5000
         },
         "red" :
         {

deploy/hyperiond.REMOVED.git-id

@@ -1 +1 @@
-cf974e6aa1ff2a7194ce2b82fd5da5fa2373676a
+eec9520a7c9861d27e5944da29ba31a5fcee41eb

libsrc/hyperion/Hyperion.cpp

@@ -71,6 +71,16 @@ LedString Hyperion::createLedString(const Json::Value& ledsConfig)
 		led.minY_frac = std::max(0.0, std::min(1.0, vscanConfig["minimum"].asDouble()));
 		led.maxY_frac = std::max(0.0, std::min(1.0, vscanConfig["maximum"].asDouble()));
 
+		// Fix if the user swapped min and max
+		if (led.minX_frac > led.maxX_frac)
+		{
+			std::swap(led.minX_frac, led.maxX_frac);
+		}
+		if (led.minY_frac > led.maxY_frac)
+		{
+			std::swap(led.minY_frac, led.maxY_frac);
+		}
+
 		ledString.leds().push_back(led);
 	}
 	return ledString;

libsrc/hyperion/ImageToLedsMap.cpp

@@ -85,6 +85,11 @@ void ImageToLedsMap::getMeanLedColor(const RgbImage & image, std::vector<RgbColo
 
 RgbColor ImageToLedsMap::calcMeanColor(const RgbImage & image, const std::vector<unsigned> & colors) const
 {
+	if (colors.size() == 0)
+	{
+		return RgbColor::BLACK;
+	}
+
 	// Accumulate the sum of each seperate color channel
 	uint_fast16_t cummRed   = 0;
 	uint_fast16_t cummGreen = 0;

src/hyperiond/hyperiond.cpp

@@ -87,6 +87,7 @@ int main(int argc, char** argv)
 		if (bootSequence != nullptr)
 		{
 			bootSequence->start();
+			std::cout << "Boot sequence created and started" << std::endl;
 		}
 	}
 
@@ -152,7 +153,7 @@ int main(int argc, char** argv)
 
 	// run the application
 	int rc = app.exec();
-	std::cout << "Application closed" << std::endl;
+	std::cout << "Application closed with code " << rc << std::endl;
 
 	// Clear all colors (switchting off all leds)
 	hyperion.clearall();