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

allow the same plugin fetching a zigbeenode multiple times

Browse Source 
inform the zigbeemanager about things finishing loading
This commit is contained in:
Michael Zanetti 2020-11-16 22:18:19 +01:00
parent 57ec37712a
commit bfc4476019
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/hardware/zigbee/zigbeehardwareresourceimplementation.cpp
View File

@ -88,12 +88,12 @@ ZigbeeNode *ZigbeeHardwareResourceImplementation::claimNode(ZigbeeHandler *handl
return nullptr; return nullptr;
} }
if (m_nodeHandlers.contains(node)) { if (m_nodeHandlers.contains(node) && m_nodeHandlers.value(node) != handler) {
qCWarning(dcZigbeeResource()) << "Node with address" << extendedAddress << "is already claimed by another handler (" << m_nodeHandlers.value(node)->name() << "). Not allowing node to be reclaimed."; qCWarning(dcZigbeeResource()) << "Node with address" << extendedAddress << "is already claimed by another handler (" << m_nodeHandlers.value(node)->name() << "). Not allowing node to be reclaimed.";
return nullptr; return nullptr;
} }
m_nodeHandlers.insert(node, handler); m_nodeHandlers[node] = handler;
return node; return node;
} }

2
libnymea-core/nymeacore.cpp
View File

@ -824,7 +824,7 @@ void NymeaCore::thingManagerLoaded()
// Evaluate rules on current time // Evaluate rules on current time
onDateTimeChanged(m_timeManager->currentDateTime()); onDateTimeChanged(m_timeManager->currentDateTime());
// Tell zigbee we're done with loading stuff... // Tell hardare resources we're done with loading stuff...
m_hardwareManager->thingsLoaded(); m_hardwareManager->thingsLoaded();
emit initialized(); emit initialized();