mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00: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
103 lines
2.7 KiB
C++
103 lines
2.7 KiB
C++
#include <iostream>
|
|
|
|
#include "LedDeviceWS281x.h"
|
|
|
|
// Constructor
|
|
LedDeviceWS281x::LedDeviceWS281x(const int gpio, const int leds, const uint32_t freq, const int dmanum, const int pwmchannel, const int invert, const int rgbw, const std::string& whiteAlgorithm)
|
|
{
|
|
_whiteAlgorithm = whiteAlgorithm;
|
|
std::cout << "whiteAlgorithm :" << whiteAlgorithm << ":\n";
|
|
|
|
initialized = false;
|
|
led_string.freq = freq;
|
|
led_string.dmanum = dmanum;
|
|
if (pwmchannel != 0 && pwmchannel != 1) {
|
|
std::cout << "WS281x: invalid PWM channel; must be 0 or 1." << std::endl;
|
|
throw -1;
|
|
}
|
|
chan = pwmchannel;
|
|
led_string.channel[chan].gpionum = gpio;
|
|
led_string.channel[chan].invert = invert;
|
|
led_string.channel[chan].count = leds;
|
|
led_string.channel[chan].brightness = 255;
|
|
if (rgbw == 1) {
|
|
led_string.channel[chan].strip_type = SK6812_STRIP_GRBW;
|
|
} else {
|
|
led_string.channel[chan].strip_type = WS2811_STRIP_RGB;
|
|
}
|
|
|
|
led_string.channel[!chan].gpionum = 0;
|
|
led_string.channel[!chan].invert = invert;
|
|
led_string.channel[!chan].count = 0;
|
|
led_string.channel[!chan].brightness = 0;
|
|
led_string.channel[!chan].strip_type = WS2811_STRIP_RGB;
|
|
if (ws2811_init(&led_string) < 0) {
|
|
std::cout << "Unable to initialize ws281x library." << std::endl;
|
|
throw -1;
|
|
}
|
|
initialized = true;
|
|
}
|
|
|
|
// Send new values down the LED chain
|
|
int LedDeviceWS281x::write(const std::vector<ColorRgb> &ledValues)
|
|
{
|
|
if (!initialized)
|
|
return -1;
|
|
|
|
int idx = 0;
|
|
for (const ColorRgb& color : ledValues)
|
|
{
|
|
if (idx >= led_string.channel[chan].count)
|
|
break;
|
|
|
|
_temp_rgbw.red = color.red;
|
|
_temp_rgbw.green = color.green;
|
|
_temp_rgbw.blue = color.blue;
|
|
_temp_rgbw.white = 0;
|
|
|
|
if (led_string.channel[chan].strip_type == SK6812_STRIP_GRBW) {
|
|
Rgb_to_Rgbw(color, &_temp_rgbw, _whiteAlgorithm);
|
|
}
|
|
|
|
led_string.channel[chan].leds[idx++] =
|
|
((uint32_t)_temp_rgbw.white << 24) + ((uint32_t)_temp_rgbw.red << 16) + ((uint32_t)_temp_rgbw.green << 8) + _temp_rgbw.blue;
|
|
|
|
}
|
|
while (idx < led_string.channel[chan].count)
|
|
led_string.channel[chan].leds[idx++] = 0;
|
|
|
|
if (ws2811_render(&led_string))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
// Turn off the LEDs by sending 000000's
|
|
// TODO Allow optional power switch out another gpio, if this code handles it can
|
|
// make it more likely we don't accidentally drive data into an off strip
|
|
int LedDeviceWS281x::switchOff()
|
|
{
|
|
if (!initialized)
|
|
return -1;
|
|
|
|
int idx = 0;
|
|
while (idx < led_string.channel[chan].count)
|
|
led_string.channel[chan].leds[idx++] = 0;
|
|
|
|
if (ws2811_render(&led_string))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
// Destructor
|
|
LedDeviceWS281x::~LedDeviceWS281x()
|
|
{
|
|
if (initialized)
|
|
{
|
|
std::cout << "Shutdown WS281x PWM and DMA channel" << std::endl;
|
|
ws2811_fini(&led_string);
|
|
}
|
|
initialized = false;
|
|
}
|