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

Fix discovery

Browse Source 
Regression from migrating from devices to things
This commit is contained in:
Michael Zanetti 2021-03-14 15:33:15 +01:00
parent f71c1fc219
commit 1bf896fb72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnymea-app/thingdiscovery.cpp
View File

@ -133,21 +133,21 @@ QString ThingDiscovery::displayMessage() const
void ThingDiscovery::discoverThingsResponse(int /*commandId*/, const QVariantMap &params) void ThingDiscovery::discoverThingsResponse(int /*commandId*/, const QVariantMap &params)
{ {
qDebug() << "response received" << params; qDebug() << "Discovery response received" << params;
QVariantList descriptors = params.value("deviceDescriptors").toList(); QVariantList descriptors = params.value("thingDescriptors").toList();
foreach (const QVariant &descriptorVariant, descriptors) { foreach (const QVariant &descriptorVariant, descriptors) {
qDebug() << "Found device. Descriptor:" << descriptorVariant;
if (!contains(descriptorVariant.toMap().value("id").toUuid())) { if (!contains(descriptorVariant.toMap().value("id").toUuid())) {
beginInsertRows(QModelIndex(), m_foundThings.count(), m_foundThings.count()); beginInsertRows(QModelIndex(), m_foundThings.count(), m_foundThings.count());
ThingDescriptor *descriptor = new ThingDescriptor(descriptorVariant.toMap().value("id").toUuid(), ThingDescriptor *descriptor = new ThingDescriptor(descriptorVariant.toMap().value("id").toUuid(),
descriptorVariant.toMap().value("thingId").toString(), descriptorVariant.toMap().value("thingId").toString(),
descriptorVariant.toMap().value("title").toString(), descriptorVariant.toMap().value("title").toString(),
descriptorVariant.toMap().value("description").toString()); descriptorVariant.toMap().value("description").toString());
foreach (const QVariant &paramVariant, descriptorVariant.toMap().value("deviceParams").toList()) { foreach (const QVariant &paramVariant, descriptorVariant.toMap().value("thingParams").toList()) {
qDebug() << "Adding param:" << paramVariant.toMap().value("paramTypeId").toString() << paramVariant.toMap().value("value"); qDebug() << "Adding param:" << paramVariant.toMap().value("paramTypeId").toString() << paramVariant.toMap().value("value");
Param* p = new Param(paramVariant.toMap().value("paramTypeId").toString(), paramVariant.toMap().value("value")); Param* p = new Param(paramVariant.toMap().value("paramTypeId").toString(), paramVariant.toMap().value("value"));
descriptor->params()->addParam(p); descriptor->params()->addParam(p);
} }
qDebug() << "Found thing. Descriptor:" << descriptor->name() << descriptor->id();
m_foundThings.append(descriptor); m_foundThings.append(descriptor);
endInsertRows(); endInsertRows();
emit countChanged(); emit countChanged();