ETM-Schurig/nymea-plugins
1
0
Fork 0
mirror of https://github.com/nymea/nymea-plugins.git synced 2026-10-21 14:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #66: Elgato/Avea: Fix handling white channel in set color action

Browse Source
This commit is contained in:
Jenkins 2018-12-12 14:44:54 +01:00
commit 09c08d1439
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elgato/aveabulb.cpp
View File

@ -106,6 +106,7 @@ bool AveaBulb::setColor(const QColor &color)
m_red = scaleColorValueUp(color.red()); m_red = scaleColorValueUp(color.red());
m_green = scaleColorValueUp(color.green()); m_green = scaleColorValueUp(color.green());
m_blue = scaleColorValueUp(color.blue()); m_blue = scaleColorValueUp(color.blue());
m_white = scaleColorValueUp(color.alpha());
m_color = color; m_color = color;

4
elgato/devicepluginelgato.cpp
View File

@ -493,6 +493,7 @@ DeviceManager::DeviceError DevicePluginElgato::executeAction(Device *device, con
return DeviceManager::DeviceErrorNoError; return DeviceManager::DeviceErrorNoError;
} else if (action.actionTypeId() == aveaColorActionTypeId) { } else if (action.actionTypeId() == aveaColorActionTypeId) {
QColor color = action.param(aveaColorActionColorParamTypeId).value().value<QColor>(); QColor color = action.param(aveaColorActionColorParamTypeId).value().value<QColor>();
color.setAlpha(0); // Alpha is white
if (!bulb->setColor(color)) if (!bulb->setColor(color))
return DeviceManager::DeviceErrorHardwareNotAvailable; return DeviceManager::DeviceErrorHardwareNotAvailable;
@ -513,7 +514,8 @@ DeviceManager::DeviceError DevicePluginElgato::executeAction(Device *device, con
color.setRed(red); color.setRed(red);
color.setGreen(0); color.setGreen(0);
color.setBlue(blue); color.setBlue(blue);
if (!bulb->setWhite(4095) || !bulb->setColor(color)) { color.setAlpha(255); // Alpha is white
if (!bulb->setColor(color)) {
return DeviceManager::DeviceErrorHardwareNotAvailable; return DeviceManager::DeviceErrorHardwareNotAvailable;
} }
device->setStateValue(aveaColorStateTypeId, color); device->setStateValue(aveaColorStateTypeId, color);