Skip to content

Fix Poll Control cluster configuration #4163

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

Merged
merged 4 commits into from
Jan 17, 2021
Merged

Fix Poll Control cluster configuration #4163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
491a14b
Fix Poll Control cluster configuration
manup Jan 11, 2021
3237284
Poll control fix ZCL sequence is 0
manup Jan 13, 2021
36e4257
Ensure sending Set Long Poll Interval after Check-in Interval
manup Jan 14, 2021
a520010
Hide none public attributes like RStateLastCheckin in Websocket events
manup Jan 17, 2021
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
16 changes: 15 additions & 1 deletion de_web_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4729,6 +4729,8 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::
std::vector<Sensor>::iterator i = sensors.begin();
std::vector<Sensor>::iterator end = sensors.end();

bool pollControlInitialized = false;

for (; i != end; ++i)
{
if (i->address().ext() == node->address().ext())
Expand All @@ -4744,6 +4746,18 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::
DBG_Printf(DBG_INFO, "SensorNode %s set node %s\n", qPrintable(i->id()), qPrintable(node->address().toStringExt()));

pushSensorInfoToCore(&*i);

// If device has Poll Control cluster, configure it via the first Sensor.
if (!pollControlInitialized && PC_GetPollControlEndpoint(node) > 0)
{
auto *itemPending = i->item(RConfigPending);
if (itemPending)
{
DBG_Printf(DBG_INFO, "Init Poll Control for %s\n", qPrintable(node->address().toStringExt()));
pollControlInitialized = true;
itemPending->setValue(itemPending->toNumber() | R_PENDING_WRITE_POLL_CHECKIN_INTERVAL | R_PENDING_SET_LONG_POLL_INTERVAL);
}
}
}

auto *item = i->item(RStateBattery);
Expand Down Expand Up @@ -6829,7 +6843,7 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const SensorFi
{
sensorNode.setManufacturer("Samjin");

if (fingerPrint.hasInCluster(IAS_ZONE_CLUSTER_ID)) // POLL_CONTROL_CLUSTER_ID
if (PC_GetPollControlEndpoint(node) > 0)
{
item = sensorNode.addItem(DataTypeUInt8, RConfigPending);
item->setValue(item->toNumber() | R_PENDING_WRITE_POLL_CHECKIN_INTERVAL | R_PENDING_SET_LONG_POLL_INTERVAL);
Expand Down
12 changes: 10 additions & 2 deletions poll_control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ bool DeRestPluginPrivate::checkPollControlClusterTask(Sensor *sensor)
return false;
}

if (sensor->node()->nodeDescriptor().manufacturerCode() == VENDOR_IKEA && (item->toNumber() & R_PENDING_SET_LONG_POLL_INTERVAL) != 0)
{
// for IKEA devices leave long poll interval at factory default settings
// TODO configure in DDF
item->setValue(item->toNumber() & ~(R_PENDING_SET_LONG_POLL_INTERVAL));
}

if (item->toNumber() & R_PENDING_WRITE_POLL_CHECKIN_INTERVAL)
{
// write poll control checkin interval
Expand All @@ -128,12 +135,13 @@ bool DeRestPluginPrivate::checkPollControlClusterTask(Sensor *sensor)
item->setValue(item->toNumber() & ~R_PENDING_WRITE_POLL_CHECKIN_INTERVAL);
return true;
}

return false; // only send Set Long Poll Interval after writing this attribute
}

if (item->toNumber() & R_PENDING_SET_LONG_POLL_INTERVAL)
{
deCONZ::ApsDataRequest apsReq;
deCONZ::ZclFrame zclFrame;

// ZDP Header
apsReq.dstAddress() = sensor->address();
Expand All @@ -146,7 +154,7 @@ bool DeRestPluginPrivate::checkPollControlClusterTask(Sensor *sensor)
apsReq.setTxOptions(deCONZ::ApsTxAcknowledgedTransmission);

deCONZ::ZclFrame outZclFrame;
outZclFrame.setSequenceNumber(zclFrame.sequenceNumber());
outZclFrame.setSequenceNumber(static_cast<quint8>(QDateTime::currentMSecsSinceEpoch()));
outZclFrame.setCommandId(0x02); // set long poll interval
outZclFrame.setFrameControl(deCONZ::ZclFCClusterCommand | deCONZ::ZclFCDirectionClientToServer);

Expand Down
10 changes: 5 additions & 5 deletions rest_sensors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,7 +2721,7 @@ void DeRestPluginPrivate::handleSensorEvent(const Event &e)
if (strncmp(e.what(), "state/", 6) == 0)
{
ResourceItem *item = sensor->item(e.what());
if (item)
if (item && item->isPublic())
{
if (item->descriptor().suffix == RStatePresence && item->toBool())
{
Expand Down Expand Up @@ -2779,7 +2779,7 @@ void DeRestPluginPrivate::handleSensorEvent(const Event &e)
{
iy = item;
}
else if (item->lastSet().isValid() && (gwWebSocketNotifyAll || rid.suffix == RStateButtonEvent || (item->lastChanged().isValid() && item->lastChanged() >= sensor->lastStatePush)))
else if (item->isPublic() && item->lastSet().isValid() && (gwWebSocketNotifyAll || rid.suffix == RStateButtonEvent || (item->lastChanged().isValid() && item->lastChanged() >= sensor->lastStatePush)))
{
state[key] = item->toVariant();
}
Expand Down Expand Up @@ -2823,7 +2823,7 @@ void DeRestPluginPrivate::handleSensorEvent(const Event &e)
else if (strncmp(e.what(), "config/", 7) == 0)
{
ResourceItem *item = sensor->item(e.what());
if (item)
if (item && item->isPublic())
{
if (sensor->lastConfigPush.isValid() &&
item->lastSet() < sensor->lastConfigPush)
Expand Down Expand Up @@ -2869,7 +2869,7 @@ void DeRestPluginPrivate::handleSensorEvent(const Event &e)
{
ilct = item;
}
else if (item->lastSet().isValid() && (gwWebSocketNotifyAll || (item->lastChanged().isValid() && item->lastChanged() >= sensor->lastConfigPush)))
else if (item->isPublic() && item->lastSet().isValid() && (gwWebSocketNotifyAll || (item->lastChanged().isValid() && item->lastChanged() >= sensor->lastConfigPush)))
{
if (rid.suffix == RConfigSchedule)
{
Expand Down Expand Up @@ -2909,7 +2909,7 @@ void DeRestPluginPrivate::handleSensorEvent(const Event &e)
else if (strncmp(e.what(), "attr/", 5) == 0)
{
ResourceItem *item = sensor->item(e.what());
if (item)
if (item && item->isPublic())
{
QVariantMap map;
map["t"] = QLatin1String("event");
Expand Down