Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic support for Hue Dynamic Scenes #8014

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
+1,132 −56
Draft

Add basic support for Hue Dynamic Scenes #8014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b47901b
Add a check for Hue lights that support effects
hanskroner Sep 29, 2024
0806c16
Add scaffolding for 'setHueLightState()'
hanskroner Oct 12, 2024
172e406
Add scaffolding for 'addTaskHueManufacturerSpecific’
hanskroner Sep 26, 2024
750fdac
Add an identifier for payload contents
hanskroner Sep 26, 2024
3c3e883
Process “on” states with ‘0xfc03’
hanskroner Sep 26, 2024
56310f7
Process “transitiontime” states with ‘0xfc03’
hanskroner Sep 26, 2024
0102258
Process “bri” states with ‘0xfc03’
hanskroner Sep 26, 2024
baf4f4b
Process “ct” states with ‘0xfc03’
hanskroner Sep 26, 2024
07c68bf
Process “xy” states with ‘0xfc03’
hanskroner Oct 11, 2024
6468b49
Process “effect” states with ‘0xfc03’
hanskroner Oct 11, 2024
4c2a33c
Process “effect_duration” states with ‘0xfc03’
hanskroner Sep 29, 2024
4a282d5
Add success replies to the API response
hanskroner Oct 11, 2024
5e66010
Update light ‘state’ to reflect the request
hanskroner Oct 11, 2024
51598d4
Process “effect_speed” states with ‘0xfc03’
hanskroner Oct 17, 2024
de01dc6
Introduce ‘hue-scenes’ API endpoint
hanskroner Oct 28, 2024
940b434
Add rudimentary recall of Hue Dynamic Scenes
hanskroner Nov 1, 2024
c0449c8
Extract manufacturer-specific set of Hue light state
hanskroner Nov 1, 2024
f9f7ccb
Add manufacturer-specifc creation of Hue Scenes
hanskroner Nov 2, 2024
acd5dd5
Validate the dynamic palette for Hue Scenes
hanskroner Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions de_web_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16066,6 +16066,10 @@ int DeRestPlugin::handleHttpRequest(const QHttpRequestHeader &hdr, QTcpSocket *s
{
ret = d->handleScenesApi(req, rsp);
}
else if (apiModule == QLatin1String("hue-scenes"))
{
ret = d->handleHueScenesApi(req, rsp);
}
else if (apiModule == QLatin1String("sensors"))
{
ret = d->handleSensorsApi(req, rsp);
Expand Down
17 changes: 16 additions & 1 deletion de_web_plugin_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,8 @@ enum TaskType
TaskTuyaRequest = 41,
TaskXmasLightStrip = 42,
TaskSimpleMetering = 43,
TaskHueEffect = 44
TaskHueEffect = 44,
TaskHueManufacturerSpecific = 45
};

enum XmasLightStripMode
Expand Down Expand Up @@ -1058,6 +1059,11 @@ class DeRestPluginPrivate : public QObject
int modifyScene(const ApiRequest &req, ApiResponse &rsp);
int deleteScene(const ApiRequest &req, ApiResponse &rsp);

// REST API hue-scenes
int handleHueScenesApi(const ApiRequest &req, ApiResponse &rsp);
int playHueDynamicScene(const ApiRequest &req, ApiResponse &rsp);
int modifyHueScene(const ApiRequest &req, ApiResponse &rsp);

bool groupToMap(const ApiRequest &req, const Group *group, QVariantMap &map);

// REST API schedules
Expand Down Expand Up @@ -1432,9 +1438,18 @@ public Q_SLOTS:
// Advanced features of Hue lights.
QStringList getHueEffectNames(quint64 effectBitmap, bool colorloop);
QStringList getHueGradientStyleNames(quint16 styleBitmap);
bool isHueEffectLight(const LightNode *lightNode);
bool isMappableToManufacturerSpecific(const QVariantMap &map);
bool addTaskHueEffect(TaskItem &task, QString &effect);
bool validateHueGradient(const ApiRequest &req, ApiResponse &rsp, QVariantMap &gradient, quint16 styleBitmap);
bool addTaskHueGradient(TaskItem &task, QVariantMap &gradient);
bool validateHueLightState(ApiResponse &rsp, const LightNode *lightNode, QVariantMap &map, QList<QString> &validatedParameters);
bool validateHueDynamicScenePalette(ApiResponse &rsp, const Scene *scene, QVariantMap &map, QList<QString> &validatedParameters);
bool addTaskHueManufacturerSpecificSetState(TaskItem &task, const QVariantMap &items);
bool addTaskHueManufacturerSpecificAddScene(TaskItem &task, const quint16 groupId, const quint8 sceneId, const QVariantMap &items);
bool addTaskHueDynamicSceneRecall(TaskItem &task, const quint16 groupId, const quint8 sceneId, const QVariantMap &palette);
int setHueLightState(const ApiRequest &req, ApiResponse &rsp, TaskItem &taskRef, QVariantMap &map);
int setHueSceneLightState(const ApiRequest &req, ApiResponse &rsp, TaskItem &taskRef, QVariantMap &map);

// Merry Christmas!
bool isXmasLightStrip(const LightNode *lightNode);
Expand Down
Loading