ETM-Schurig
/
powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish tradfri remote

master
Simon Stürz 2020-12-11 18:07:11 +01:00
parent 3b41efc12c
commit 616385b281
3 changed files with 165 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zigbeelumi/integrationpluginzigbeelumi.cpp
View File

@ -472,7 +472,7 @@ void IntegrationPluginZigbeeLumi::setupThing(ThingSetupInfo *info)
ZigbeeClusterOnOff *onOffCluster = endpoint->inputCluster<ZigbeeClusterOnOff>(ZigbeeClusterLibrary::ClusterIdOnOff);
if (onOffCluster) {
connect(onOffCluster, &ZigbeeClusterOnOff::powerChanged, thing, [this, thing](bool power){
qCDebug(dcZigbeeLumi()) << thing << "state changed" << (power ? "closed" : "open");
qCDebug(dcZigbeeLumi()) << thing << "state changed" << (power ? "pressed" : "released");
if (!power) {
emitEvent(Event(lumiButtonSensorPressedEventTypeId, thing->id()));
}

124
zigbeetradfri/integrationpluginzigbeetradfri.cpp
View File

@ -31,6 +31,7 @@
#include "integrationpluginzigbeetradfri.h"
#include "plugininfo.h"
#include "zigbeeutils.h"
#include "hardware/zigbee/zigbeehardwareresource.h"
@ -86,7 +87,8 @@ bool IntegrationPluginZigbeeTradfri::handleNode(ZigbeeNode *node, const QUuid &n
bool handled = false;
foreach (ZigbeeNodeEndpoint *endpoint, node->endpoints()) {
if (endpoint->profile() == Zigbee::ZigbeeProfileHomeAutomation && endpoint->deviceId() == Zigbee::HomeAutomationDeviceNonColourController) {
if (endpoint->modelIdentifier().contains("on/off switch")) {
// "TRADFRI on/off switch"
qCDebug(dcZigbeeTradfri()) << "Handeling TRADFRI on/off switch" << node << endpoint;
createThing(onOffSwitchThingClassId, networkUuid, node, endpoint);
initOnOffSwitch(node, endpoint);
@ -100,15 +102,16 @@ bool IntegrationPluginZigbeeTradfri::handleNode(ZigbeeNode *node, const QUuid &n
handled = true;
}
if (endpoint->profile() == Zigbee::ZigbeeProfileLightLink && endpoint->deviceId() == Zigbee::LightLinkDeviceNonColourSceneController) {
if (endpoint->modelIdentifier().contains("remote control")) {
qCDebug(dcZigbeeTradfri()) << "Handeling TRADFRI remote control" << node << endpoint;
createThing(remoteThingClassId, networkUuid, node, endpoint);
initRemote(node, endpoint);
handled = true;
}
if (endpoint->profile() == Zigbee::ZigbeeProfileHomeAutomation && endpoint->deviceId() == Zigbee::HomeAutomationDeviceRemoteControl) {
qCDebug(dcZigbeeTradfri()) << "Handeling TRADFRI Symfonsik sound remote" << node << endpoint;
if (endpoint->modelIdentifier().contains("SYMFONISK")) {
// "SYMFONISK Sound Controller"
qCDebug(dcZigbeeTradfri()) << "Handeling TRADFRI Symfonisk sound remote" << node << endpoint;
createThing(soundRemoteThingClassId, networkUuid, node, endpoint);
initOnOffSwitch(node, endpoint);
handled = true;
@ -310,13 +313,94 @@ void IntegrationPluginZigbeeTradfri::setupThing(ThingSetupInfo *info)
qCWarning(dcZigbeeTradfri()) << "Could not find on/off client cluster on" << thing << endpoint;
} else {
connect(onOffCluster, &ZigbeeClusterOnOff::commandSent, thing, [=](ZigbeeClusterOnOff::Command command){
qCDebug(dcZigbeeTradfri()) << thing << "button pressed" << command;
qCDebug(dcZigbeeTradfri()) << thing << "power command received" << command;
if (command == ZigbeeClusterOnOff::CommandToggle) {
qCDebug(dcZigbeeTradfri()) << thing << "pressed power";
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Power";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Power")));
}
});
}
// Receive level control commands
ZigbeeClusterLevelControl *levelCluster = endpoint->outputCluster<ZigbeeClusterLevelControl>(ZigbeeClusterLibrary::ClusterIdLevelControl);
if (!levelCluster) {
qCWarning(dcZigbeeTradfri()) << "Could not find level client cluster on" << thing << endpoint;
} else {
connect(levelCluster, &ZigbeeClusterLevelControl::commandSent, thing, [=](ZigbeeClusterLevelControl::Command command, const QByteArray &payload){
qCDebug(dcZigbeeTradfri()) << thing << "level command received" << command << payload.toHex();
switch (command) {
case ZigbeeClusterLevelControl::CommandMoveWithOnOff:
case ZigbeeClusterLevelControl::CommandStepWithOnOff:
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Up";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Up")));
break;
default:
break;
}
});
connect(levelCluster, &ZigbeeClusterLevelControl::commandMoveSent, thing, [=](ZigbeeClusterLevelControl::MoveMode moveMode, quint8 rate){
qCDebug(dcZigbeeTradfri()) << "level command move received" << moveMode << rate;
switch (moveMode) {
case ZigbeeClusterLevelControl::MoveModeUp:
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Up";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Up")));
break;
case ZigbeeClusterLevelControl::MoveModeDown:
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Down";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Down")));
break;
}
});
connect(levelCluster, &ZigbeeClusterLevelControl::commandStepSent, thing, [=](ZigbeeClusterLevelControl::FadeMode fadeMode, quint8 stepSize, quint16 transitionTime){
qCDebug(dcZigbeeTradfri()) << "level command step received" << fadeMode << stepSize << transitionTime;
switch (fadeMode) {
case ZigbeeClusterLevelControl::FadeModeUp:
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Up";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Up")));
break;
case ZigbeeClusterLevelControl::FadeModeDown:
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Down";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Down")));
break;
}
});
}
// Receive scene commands
ZigbeeClusterScenes *scenesCluster = endpoint->outputCluster<ZigbeeClusterScenes>(ZigbeeClusterLibrary::ClusterIdScenes);
if (!scenesCluster) {
qCWarning(dcZigbeeTradfri()) << "Could not find scenes client cluster on" << thing << endpoint;
} else {
connect(scenesCluster, &ZigbeeClusterScenes::commandSent, thing, [=](quint8 command, const QByteArray &payload){
qCDebug(dcZigbeeTradfri()) << thing << "scene command received" << command << payload.toHex();
if (payload.count() <= 0)
return;
switch (command) {
// Note: these comands are not in the specs
case 0x07:
if (payload.at(0) == 0x00) {
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Right";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Right")));
} else if (payload.at(0) == 0x01) {
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Left";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Left")));
}
break;
case 0x08:
if (payload.at(0) == 0x00) {
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Right";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Right")));
} else if (payload.at(0) == 0x01) {
qCDebug(dcZigbeeTradfri()) << thing << "button pressed: Left";
emit emitEvent(Event(remotePressedEventTypeId, thing->id(), ParamList() << Param(remotePressedEventButtonNameParamTypeId, "Left")));
}
break;
}
});
}
}
if (thing->thingClassId() == soundRemoteThingClassId) {
@ -514,24 +598,20 @@ void IntegrationPluginZigbeeTradfri::initOnOffSwitch(ZigbeeNode *node, ZigbeeNod
void IntegrationPluginZigbeeTradfri::initRemote(ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint)
{
// Get the current configured bindings for this node
// ZigbeeReply *reply = node->removeAllBindings();
// connect(reply, &ZigbeeReply::finished, node, [=](){
// if (reply->error() != ZigbeeReply::ErrorNoError) {
// qCWarning(dcZigbeeTradfri()) << "Failed to remove all bindings for initialization of" << node;
// } else {
// qCDebug(dcZigbeeTradfri()) << "Removed all bindings successfully from" << node;
// if (endpoint->hasOutputCluster(ZigbeeClusterLibrary::ClusterIdGroups)) {
// qCDebug(dcZigbeeTradfri()) << "Try to add group...";
// ZigbeeClusterGroups *groupCluster = endpoint->outputCluster<ZigbeeClusterGroups>(ZigbeeClusterLibrary::ClusterIdGroups);
// ZigbeeClusterReply *reply = groupCluster->addGroup(0x0000, QString());
// connect(reply, &ZigbeeClusterReply::finished, node, [=](){
// if (reply->error()) {
// qCWarning(dcZigbeeTradfri()) << "Failed to add remote to group 0x0000";
// return;
// }
// Bind basic cluster
ZigbeeDeviceObjectReply *bindRegisterReply = node->deviceObject()->requestBindGroupAddress(endpoint->endpointId(), ZigbeeClusterLibrary::ClusterIdBasic, 0x0000);
connect(bindRegisterReply, &ZigbeeDeviceObjectReply::finished, node, [=](){
if (bindRegisterReply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbeeTradfri()) << "Failed to bind basic cluster" << bindRegisterReply->error();
} else {
qCDebug(dcZigbeeTradfri()) << "Bind basic cluster request finished successfully";
}
// });
// }
// Read battery, bind and configure attribute reporting for battery
if (!endpoint->hasInputCluster(ZigbeeClusterLibrary::ClusterIdPowerConfiguration)) {
@ -615,8 +695,6 @@ void IntegrationPluginZigbeeTradfri::initRemote(ZigbeeNode *node, ZigbeeNodeEndp
});
});
});
});
//433 });
}
void IntegrationPluginZigbeeTradfri::initMotionSensor(ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint)

18
zigbeetradfri/integrationpluginzigbeetradfri.json
View File

@ -128,7 +128,7 @@
"id": "19ee3f56-f958-4b04-8ea3-747b72d7c7d6",
"setupMethod": "JustAdd",
"createMethods": [ "Auto" ],
"interfaces": [ "longpressmultibutton", "batterylevel", "wirelessconnectable" ],
"interfaces": [ "multibutton", "batterylevel", "wirelessconnectable" ],
"paramTypes": [
{
"id": "2ee18d3e-5fb8-4809-a52a-8e420b677f6e",
@ -216,21 +216,7 @@
"name": "buttonName",
"displayName": "Button name",
"type": "QString",
"allowedValues": ["Power"]
}
]
},
{
"id": "3fb1bc3b-50ea-4a9f-a5b1-10b1fae2592e",
"name": "longPressed",
"displayName": "Button longpressed",
"paramTypes": [
{
"id": "4a151723-5798-4087-a4e5-5aa08ecbb9b8",
"name": "buttonName",
"displayName": "Button name",
"type": "QString",
"allowedValues": ["Power"]
"allowedValues": ["Power", "Up", "Down", "Left", "Right"]
}
]
}