frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Boblight server: Added a sync after writing led N-1. Added clipping to a parsed RGB value instead of the modulo

Browse Source 
Former-commit-id: 9080c04a0f09f536587867912231b29565a31b5d
This commit is contained in:
johan 2013-12-12 23:12:22 +01:00
parent b7e91b7013
commit 83051543d2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsrc/boblightserver/BoblightClientConnection.cpp
View File

@ -133,7 +133,8 @@ void BoblightClientConnection::handleMessage(const QString & message)
if (messageParts[3] == "rgb" && messageParts.size() == 7) if (messageParts[3] == "rgb" && messageParts.size() == 7)
{ {
bool rc1, rc2, rc3; bool rc1, rc2, rc3;
uint8_t red = 255 * messageParts[4].toFloat(&rc1); uint8_t red = qMax(0, qMin(255, int(255 * messageParts[4].toFloat(&rc1))));
if (!rc1) if (!rc1)
{ {
// maybe a locale issue. switch to a locale with a comma instead of a dot as decimal seperator (or vice versa) // maybe a locale issue. switch to a locale with a comma instead of a dot as decimal seperator (or vice versa)
@ -141,11 +142,11 @@ void BoblightClientConnection::handleMessage(const QString & message)
_locale.setNumberOptions(QLocale::OmitGroupSeparator | QLocale::RejectGroupSeparator); _locale.setNumberOptions(QLocale::OmitGroupSeparator | QLocale::RejectGroupSeparator);
// try again // try again
red = 255 * messageParts[4].toFloat(&rc1); red = qMax(0, qMin(255, int(255 * messageParts[4].toFloat(&rc1))));
} }
uint8_t green = 255 * messageParts[5].toFloat(&rc2); uint8_t green = qMax(0, qMin(255, 255 * int(messageParts[5].toFloat(&rc2))));
uint8_t blue = 255 * messageParts[6].toFloat(&rc3); uint8_t blue = qMax(0, qMin(255, 255 * int(messageParts[6].toFloat(&rc3))));
if (rc1 && rc2 && rc3) if (rc1 && rc2 && rc3)
{ {
@ -153,6 +154,13 @@ void BoblightClientConnection::handleMessage(const QString & message)
rgb.red = red; rgb.red = red;
rgb.green = green; rgb.green = green;
rgb.blue = blue; rgb.blue = blue;
// send current color values to hyperion if this is the last led assuming leds values are send in order of id
if ((ledIndex == _ledColors.size() -1) && _priority < 255)
{
_hyperion->setColors(_priority, _ledColors, -1);
}
return; return;
} }
} }