Merge pull request #238 from sweetpi/master

Added rgbOrder config for each led

Former-commit-id: 91881cdbe14a9fc33e12e91ef15b52faa66a6047
This commit is contained in:
tvdzwan
2015-02-23 15:53:44 +01:00
4 changed files with 27 additions and 8 deletions

View File

@@ -52,12 +52,6 @@ public:
SATURATION_GAIN, VALUE_GAIN, THRESHOLD, GAMMA, BLACKLEVEL, WHITELEVEL
};
/// Enumeration containing the possible orders of device color byte data
enum ColorOrder
{
ORDER_RGB, ORDER_RBG, ORDER_GRB, ORDER_BRG, ORDER_GBR, ORDER_BGR
};
///
/// Constructs the Hyperion instance based on the given Json configuration
///

View File

@@ -12,6 +12,12 @@
// Forward class declarations
namespace Json { class Value; }
/// Enumeration containing the possible orders of device color byte data
enum ColorOrder
{
ORDER_RGB, ORDER_RBG, ORDER_GRB, ORDER_BRG, ORDER_GBR, ORDER_BGR, ORDER_DEFAULT
};
///
/// The Led structure contains the definition of the image portion used to determine a single led's
/// color.
@@ -40,6 +46,8 @@ struct Led
double minY_frac;
/// The maximum horizontal scan line included for this leds color
double maxY_frac;
/// the color order
ColorOrder colorOrder;
};
///