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

Merge PR #684: Meross: Fix polling for totalEnergy

master
jenkins 2023-05-16 12:59:10 +02:00
parent 849c926a54 410520244a
commit e65fe63d86
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
meross/integrationpluginmeross.cpp
View File

@ -158,44 +158,50 @@ void IntegrationPluginMeross::setupThing(ThingSetupInfo *info)
if (monitor) {
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(monitor);
}
PluginTimer *timer = m_timers.take(thing);
if (timer) {
hardwareManager()->pluginTimerManager()->unregisterTimer(timer);
}
monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(MacAddress(thing->paramValue(plugThingMacAddressParamTypeId).toString()));
m_deviceMonitors.insert(thing, monitor);
timer = hardwareManager()->pluginTimerManager()->registerTimer(5);
m_timers.insert(thing, timer);
connect(monitor, &NetworkDeviceMonitor::reachableChanged, thing, [timer, thing](bool reachable) {
thing->setStateValue("connected", reachable);
if (reachable) {
timer->start();
} else {
timer->stop();
}
});
connect(timer, &PluginTimer::currentTickChanged, this, [this, thing](qlonglong tick){
if (tick % 5 == 0) {
pollDevice5s(thing);
} else if (tick == 0) {
pollDevice60s(thing);
}
});
pollDevice5s(thing);
pollDevice60s(thing);
info->finish(Thing::ThingErrorNoError);
}
void IntegrationPluginMeross::postSetupThing(Thing */*thing*/)
{
if (!m_timer5s) {
m_timer5s = hardwareManager()->pluginTimerManager()->registerTimer(5);
connect(m_timer5s, &PluginTimer::timeout, this, [=](){
foreach (Thing *thing, myThings()) {
if (m_deviceMonitors.value(thing)->reachable()) {
pollDevice5s(thing);
}
}
});
}
if (!m_timer60s) {
m_timer5s = hardwareManager()->pluginTimerManager()->registerTimer(60);
connect(m_timer5s, &PluginTimer::timeout, this, [=](){
foreach (Thing *thing, myThings()) {
if (m_deviceMonitors.value(thing)->reachable()) {
pollDevice60s(thing);
}
}
});
}
}
void IntegrationPluginMeross::thingRemoved(Thing *thing)
{
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_deviceMonitors.take(thing));
hardwareManager()->pluginTimerManager()->unregisterTimer(m_timers.take(thing));
if (myThings().isEmpty()) {
hardwareManager()->pluginTimerManager()->unregisterTimer(m_timer5s);
m_timer5s = nullptr;
hardwareManager()->pluginTimerManager()->unregisterTimer(m_timer60s);
m_timer60s = nullptr;
}
}
void IntegrationPluginMeross::executeAction(ThingActionInfo *info)

4
meross/integrationpluginmeross.h
View File

@ -60,6 +60,7 @@ public:
void confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret) override;
void setupThing(ThingSetupInfo *info) override;
void postSetupThing(Thing *thing) override;
void thingRemoved(Thing *thing) override;
void executeAction(ThingActionInfo *info) override;
@ -75,7 +76,8 @@ private:
QHash<Thing*, QByteArray> m_keys;
QHash<Thing*, NetworkDeviceMonitor*> m_deviceMonitors;
QHash<Thing*, PluginTimer*> m_timers;
PluginTimer* m_timer5s = nullptr;
PluginTimer* m_timer60s = nullptr;
};
#endif // INTEGRATIONPLUGINMEROSS_H