Merge remote-tracking branch 'origin/master' into config

include/utils/PixelFormat.h

@@ -10,6 +10,7 @@ enum class PixelFormat {
 	YUYV,
 	UYVY,
 	BGR16,
+	RGB24,
 	BGR24,
 	RGB32,
 	BGR32,
@@ -36,6 +37,10 @@ inline PixelFormat parsePixelFormat(const QString& pixelFormat)
 	{
 		return PixelFormat::BGR16;
 	}
+	else if (format.compare("rgb24")  == 0)
+	{
+		return PixelFormat::RGB24;
+	}
 	else if (format.compare("bgr24")  == 0)
 	{
 		return PixelFormat::BGR24;
@@ -80,6 +85,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)
 	{
 		return "BGR16";
 	}
+	else if (pixelFormat == PixelFormat::RGB24)
+	{
+		return "RGB24";
+	}
 	else if (pixelFormat == PixelFormat::BGR24)
 	{
 		return "BGR24";
@@ -115,10 +124,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)
 
 enum class FlipMode
 {
+	NO_CHANGE,
 	HORIZONTAL,
 	VERTICAL,
-	BOTH,
-	NO_CHANGE
+	BOTH
 };
 
 inline FlipMode parseFlipMode(const QString& flipMode)

include/utils/RgbToRgbw.h

@@ -11,7 +11,12 @@ namespace RGBW {
 		SUBTRACT_MINIMUM,
 		SUB_MIN_WARM_ADJUST,
 		SUB_MIN_COOL_ADJUST,
-		WHITE_OFF
+		WHITE_OFF,
+        COLD_WHITE,
+        NEUTRAL_WHITE,
+        AUTO,
+        AUTO_MAX,
+        AUTO_ACCURATE
 	};
 
 	WhiteAlgorithm stringToWhiteAlgorithm(const QString& str);