mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
d5ce395e8e
* Removed -HUP so the default -TERM signal is sent instead. - hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config Changed pgrep to add '-x' so it wont partial match on the exe name. - I have multiple instances with multiple hyperiond-instance1 names - this ensures the service script only kills the right process * reversing errant change to hyperion.systemd.sh * adding support for SK6812 - not working yet * Changed rpi_ws281x submodule to be penfold42's fork * Set White to zero for now * starting on the code to make the White led do stuff * Added some basic whie led calculation white = min(r,g,b) r-=w, g-=w, b-=w * cleaned up a couple of compiler warnings * updated strip type to use corrected RGBW strip type (the SK6812RGBW datasheet is wrong) * moved bitpair_to_byte initialiser to (hopefully) work with older GCC * compiler warning in udp driver removed some tabs in ws2812b.cpp * formatting - spaces to tabs * moved rpi_281x to tag sk6812-v1.0 * attempt #3 at migrating the rpi_281x submodule to my fork/branch * moving to my fork of rpi_281x * Started implementing multiple RGB to RGBW conversion options a quick hack has been implemented inside WS281x.cpp but ive started moving this to RgbToRgbw.cpp for reuse by other led device types * migrated RGB to RGBW conversion to RgbToRgbw.cpp Former-commit-id: ff8e9038c4bb8203b71b42d12bf23be4abcc0b3b
66 lines
1.9 KiB
C++
66 lines
1.9 KiB
C++
#pragma once
|
|
|
|
// STL includes
|
|
#include <cstdint>
|
|
#include <iostream>
|
|
|
|
struct ColorRgbw;
|
|
|
|
///
|
|
/// Plain-Old-Data structure containing the red-green-blue color specification. Size of the
|
|
/// structure is exactly 3-bytes for easy writing to led-device
|
|
///
|
|
struct ColorRgbw
|
|
{
|
|
/// The red color channel
|
|
uint8_t red;
|
|
/// The green color channel
|
|
uint8_t green;
|
|
/// The blue color channel
|
|
uint8_t blue;
|
|
/// The white color channel
|
|
uint8_t white;
|
|
|
|
/// 'Black' RgbColor (0, 0, 0, 0)
|
|
static ColorRgbw BLACK;
|
|
/// 'Red' RgbColor (255, 0, 0, 0)
|
|
static ColorRgbw RED;
|
|
/// 'Green' RgbColor (0, 255, 0, 0)
|
|
static ColorRgbw GREEN;
|
|
/// 'Blue' RgbColor (0, 0, 255, 0)
|
|
static ColorRgbw BLUE;
|
|
/// 'Yellow' RgbColor (255, 255, 0, 0)
|
|
static ColorRgbw YELLOW;
|
|
/// 'White' RgbColor (0, 0, 0, 255)
|
|
static ColorRgbw WHITE;
|
|
};
|
|
|
|
/// Assert to ensure that the size of the structure is 'only' 4 bytes
|
|
static_assert(sizeof(ColorRgbw) == 4, "Incorrect size of ColorRgbw");
|
|
|
|
///
|
|
/// Stream operator to write ColorRgb to an outputstream (format "'{'[red]','[green]','[blue]'}'")
|
|
///
|
|
/// @param os The output stream
|
|
/// @param color The color to write
|
|
/// @return The output stream (with the color written to it)
|
|
///
|
|
inline std::ostream& operator<<(std::ostream& os, const ColorRgbw& color)
|
|
{
|
|
os << "{" << unsigned(color.red) << "," << unsigned(color.green) << "," << unsigned(color.blue) << "," << unsigned(color.white) << "}";
|
|
return os;
|
|
}
|
|
|
|
|
|
/// Compare operator to check if a color is 'smaller' than another color
|
|
inline bool operator<(const ColorRgbw & lhs, const ColorRgbw & rhs)
|
|
{
|
|
return (lhs.red < rhs.red) && (lhs.green < rhs.green) && (lhs.blue < rhs.blue) && (lhs.white < rhs.white);
|
|
}
|
|
|
|
/// Compare operator to check if a color is 'smaller' than or 'equal' to another color
|
|
inline bool operator<=(const ColorRgbw & lhs, const ColorRgbw & rhs)
|
|
{
|
|
return (lhs.red <= rhs.red) && (lhs.green <= rhs.green) && (lhs.blue <= rhs.blue) && (lhs.white < rhs.white);
|
|
}
|