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

Clean-up and Fixes

Browse Source
This commit is contained in:
LordGrey 2023-09-04 21:58:54 +02:00
parent 661f222d28
commit 00085410f3
2 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp
View File

@ -193,10 +193,7 @@ const uint8_t PAYLOAD_PER_CHANNEL_V2[] =
bool operator ==(const CiColor& p1, const CiColor& p2) bool operator ==(const CiColor& p1, const CiColor& p2)
{ {
return ((fabs(p1.x - p2.x) > std::numeric_limits<double>::epsilon()) && return ((p1.x == p2.x) && (p1.y == p2.y) && (p1.bri == p2.bri));
(fabs(p1.y - p2.y) > std::numeric_limits<double>::epsilon()) &&
(fabs(p1.bri - p2.bri) > std::numeric_limits<double>::epsilon())
);
} }
bool operator != (const CiColor& p1, const CiColor& p2) bool operator != (const CiColor& p1, const CiColor& p2)
@ -281,7 +278,6 @@ CiColor CiColor::rgbToCiColor(double red, double green, double blue, const CiCol
} }
if (dBC < lowest) if (dBC < lowest)
{ {
//lowest = dBC;
closestPoint = pBC; closestPoint = pBC;
} }
// Change the xy value to a value which is within the reach of the lamp. // Change the xy value to a value which is within the reach of the lamp.
@ -1759,8 +1755,6 @@ LedDevicePhilipsHue::LedDevicePhilipsHue(const QJsonObject& deviceConfig)
, _onBlackTimeToPowerOff(100) , _onBlackTimeToPowerOff(100)
, _onBlackTimeToPowerOn(100) , _onBlackTimeToPowerOn(100)
, _candyGamma(true) , _candyGamma(true)
, _lastConfirm(0)
, _lastId(-1)
, _groupStreamState(false) , _groupStreamState(false)
{ {
} }
@ -1825,7 +1819,7 @@ bool LedDevicePhilipsHue::init(const QJsonObject &deviceConfig)
if( _groupId.isEmpty() ) if( _groupId.isEmpty() )
{ {
Error(_log, "Disabling usage of HueEntertainmentAPI: Group-ID is invalid", "%s", QSTRING_CSTR(_groupId) ); Error(_log, "Disabling usage of Entertainment API - Group-ID is invalid [%s]", QSTRING_CSTR(_groupId) );
_useEntertainmentAPI = false; _useEntertainmentAPI = false;
} }
} }
@ -2528,7 +2522,20 @@ void LedDevicePhilipsHue::setState(PhilipsHueLight& light, bool on, const CiColo
QJsonObject cmd; QJsonObject cmd;
bool forceCmd {false}; bool forceCmd {false};
if (light.getOnOffState()) if (light.getOnOffState() != on)
{
forceCmd = true;
if (_useApiV2)
{
cmd.insert(API_STATE_ON, QJsonObject {{API_STATE_ON, on }});
}
else
{
cmd.insert(API_STATE_ON, on);
}
}
if (!_useEntertainmentAPI && light.getOnOffState())
{ {
if (light.getTransitionTime() != _transitionTime) if (light.getTransitionTime() != _transitionTime)
{ {
@ -2544,43 +2551,33 @@ void LedDevicePhilipsHue::setState(PhilipsHueLight& light, bool on, const CiColo
if (!light.hasColor() || light.getColor() != color) if (!light.hasColor() || light.getColor() != color)
{ {
if (_useApiV2) if (!light.isBusy() || forceCmd)
{ {
// Brightness is 0-100 %, Brightness percentage. value cannot be 0, writing 0 changes it to lowest possible brightness if (_useApiV2)
const double bri = qMin(_brightnessFactor * color.bri * 100, 100.0); {
// Brightness is 0-100 %, Brightness percentage. value cannot be 0, writing 0 changes it to lowest possible brightness
const double bri = qMin(_brightnessFactor * color.bri * 100, 100.0);
QJsonObject colorXY; QJsonObject colorXY;
colorXY[API_X_COORDINATE] = color.x; colorXY[API_X_COORDINATE] = color.x;
colorXY[API_Y_COORDINATE] = color.y; colorXY[API_Y_COORDINATE] = color.y;
cmd.insert(API_COLOR, QJsonObject {{API_DURATION, colorXY }}); cmd.insert(API_COLOR, QJsonObject {{API_DURATION, colorXY }});
cmd.insert(API_DIMMING, QJsonObject {{API_BRIGHTNESS, bri }}); cmd.insert(API_DIMMING, QJsonObject {{API_BRIGHTNESS, bri }});
} }
else else
{ {
const int bri = qRound(qMin(254.0, _brightnessFactor * qMax(1.0, color.bri * 254.0))); const int bri = qRound(qMin(254.0, _brightnessFactor * qMax(1.0, color.bri * 254.0)));
QJsonArray colorXY; QJsonArray colorXY;
colorXY.append(color.x); colorXY.append(color.x);
colorXY.append(color.y); colorXY.append(color.y);
cmd.insert(API_XY_COORDINATES, colorXY); cmd.insert(API_XY_COORDINATES, colorXY);
cmd.insert(API_BRIGHTNESS, bri); cmd.insert(API_BRIGHTNESS, bri);
}
} }
} }
} }
if (light.getOnOffState() != on) if (!cmd.isEmpty())
{
forceCmd = true;
if (_useApiV2)
{
cmd.insert(API_STATE_ON, QJsonObject {{API_STATE_ON, on }});
}
else
{
cmd.insert(API_STATE_ON, on);
}
}
if (!light.isBusy() || forceCmd)
{ {
if (_useApiV2) if (_useApiV2)
{ {
@ -2592,15 +2589,6 @@ void LedDevicePhilipsHue::setState(PhilipsHueLight& light, bool on, const CiColo
} }
put(resourcePath, cmd); put(resourcePath, cmd);
qint64 _currentTime = QDateTime::currentMSecsSinceEpoch();
if ((_currentTime - _lastConfirm > 1500 && light.getId() != _lastId) ||
(_currentTime - _lastConfirm > 3000))
{
_lastId = light.getId();
_lastConfirm = _currentTime;
}
if (!isInError()) if (!isInError())
{ {
light.setTransitionTime( _transitionTime ); light.setTransitionTime( _transitionTime );
@ -2704,8 +2692,6 @@ bool LedDevicePhilipsHue::switchOff()
} }
else else
{ {
writeBlack();
_isOn = false; _isOn = false;
rc = stopStream(); rc = stopStream();

2
libsrc/leddevice/dev_net/LedDevicePhilipsHue.h
View File

@ -638,7 +638,5 @@ private:
int _onBlackTimeToPowerOn; int _onBlackTimeToPowerOn;
bool _candyGamma; bool _candyGamma;
qint64 _lastConfirm;
QString _lastId;
bool _groupStreamState; bool _groupStreamState;
}; };