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

Merge PR #757: Meross: Update to networkdevice interface

Browse Source
This commit is contained in:
jenkins 2025-03-30 20:36:37 +02:00
commit 6a171ebcf1
3 changed files with 67 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
meross/integrationpluginmeross.cpp
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2022, nymea GmbH * Copyright 2013 - 2024, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -59,16 +59,44 @@ void IntegrationPluginMeross::discoverThings(ThingDiscoveryInfo *info)
connect(reply, &NetworkDeviceDiscoveryReply::finished, info, [info, reply, this](){ connect(reply, &NetworkDeviceDiscoveryReply::finished, info, [info, reply, this](){
foreach (const NetworkDeviceInfo &deviceInfo, reply->networkDeviceInfos()) { foreach (const NetworkDeviceInfo &deviceInfo, reply->networkDeviceInfos()) {
qCDebug(dcMeross) << "Discovery result" << deviceInfo; qCDebug(dcMeross) << "Discovery result" << deviceInfo;
if (deviceInfo.hostName().toLower().startsWith("meross_smart_plug") || deviceInfo.macAddressManufacturer().toLower().contains("meross")) {
ThingDescriptor descriptor(plugThingClassId, "Meross Smart Plug", deviceInfo.macAddress()); bool macVendorMatches = false;
descriptor.setParams({Param(plugThingMacAddressParamTypeId, deviceInfo.macAddress())}); foreach (const MacAddressInfo &macInfo, deviceInfo.macAddressInfos()) {
if (macInfo.vendorName().toLower().contains("meross")) {
macVendorMatches = true;
break;
}
}
if (deviceInfo.hostName().toLower().startsWith("meross_smart_plug") || macVendorMatches) {
QString description;
switch (deviceInfo.monitorMode()) {
case NetworkDeviceInfo::MonitorModeMac:
description = deviceInfo.macAddressInfos().constFirst().macAddress().toString();
break;
case NetworkDeviceInfo::MonitorModeHostName:
description = deviceInfo.hostName();
break;
case NetworkDeviceInfo::MonitorModeIp:
description = deviceInfo.address().toString();
break;
}
ThingDescriptor descriptor(plugThingClassId, "Meross Smart Plug", description);
ParamList params;
params.append(Param(plugThingMacAddressParamTypeId, deviceInfo.thingParamValueMacAddress()));
params.append(Param(plugThingHostNameParamTypeId, deviceInfo.thingParamValueHostName()));
params.append(Param(plugThingAddressParamTypeId, deviceInfo.thingParamValueAddress()));
descriptor.setParams(params);
Thing *existingThing = myThings().findByParams(descriptor.params()); Thing *existingThing = myThings().findByParams(descriptor.params());
if (existingThing) { if (existingThing) {
qCInfo(dcMeross) << "Existing smart plug discovered"; qCInfo(dcMeross) << "Existing smart plug discovered" << existingThing;
descriptor.setThingId(existingThing->id()); descriptor.setThingId(existingThing->id());
} else { } else {
qCInfo(dcMeross) << "New smart plug discovered"; qCInfo(dcMeross) << "New smart plug discovered" << deviceInfo;
} }
info->addThingDescriptor(descriptor); info->addThingDescriptor(descriptor);
@ -154,13 +182,13 @@ void IntegrationPluginMeross::setupThing(ThingSetupInfo *info)
m_keys.insert(thing, pluginStorage()->value("key").toByteArray()); m_keys.insert(thing, pluginStorage()->value("key").toByteArray());
pluginStorage()->endGroup(); pluginStorage()->endGroup();
NetworkDeviceMonitor *monitor = m_deviceMonitors.take(thing); NetworkDeviceMonitor *monitor = m_monitors.take(thing);
if (monitor) { if (monitor) {
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(monitor); hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(monitor);
} }
monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(MacAddress(thing->paramValue(plugThingMacAddressParamTypeId).toString())); monitor = hardwareManager()->networkDeviceDiscovery()->registerMonitor(thing);
m_deviceMonitors.insert(thing, monitor); m_monitors.insert(thing, monitor);
pollDevice5s(thing); pollDevice5s(thing);
pollDevice60s(thing); pollDevice60s(thing);
@ -174,7 +202,7 @@ void IntegrationPluginMeross::postSetupThing(Thing */*thing*/)
m_timer5s = hardwareManager()->pluginTimerManager()->registerTimer(5); m_timer5s = hardwareManager()->pluginTimerManager()->registerTimer(5);
connect(m_timer5s, &PluginTimer::timeout, this, [=](){ connect(m_timer5s, &PluginTimer::timeout, this, [=](){
foreach (Thing *thing, myThings()) { foreach (Thing *thing, myThings()) {
if (m_deviceMonitors.value(thing)->reachable()) { if (m_monitors.value(thing)->reachable()) {
pollDevice5s(thing); pollDevice5s(thing);
} }
} }
@ -184,7 +212,7 @@ void IntegrationPluginMeross::postSetupThing(Thing */*thing*/)
m_timer5s = hardwareManager()->pluginTimerManager()->registerTimer(60); m_timer5s = hardwareManager()->pluginTimerManager()->registerTimer(60);
connect(m_timer5s, &PluginTimer::timeout, this, [=](){ connect(m_timer5s, &PluginTimer::timeout, this, [=](){
foreach (Thing *thing, myThings()) { foreach (Thing *thing, myThings()) {
if (m_deviceMonitors.value(thing)->reachable()) { if (m_monitors.value(thing)->reachable()) {
pollDevice60s(thing); pollDevice60s(thing);
} }
} }
@ -194,7 +222,8 @@ void IntegrationPluginMeross::postSetupThing(Thing */*thing*/)
void IntegrationPluginMeross::thingRemoved(Thing *thing) void IntegrationPluginMeross::thingRemoved(Thing *thing)
{ {
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_deviceMonitors.take(thing)); if (m_monitors.contains(thing))
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_monitors.take(thing));
if (myThings().isEmpty()) { if (myThings().isEmpty()) {
hardwareManager()->pluginTimerManager()->unregisterTimer(m_timer5s); hardwareManager()->pluginTimerManager()->unregisterTimer(m_timer5s);
@ -366,7 +395,7 @@ QNetworkReply* IntegrationPluginMeross::request(Thing *thing, const QString &nam
QUrl url; QUrl url;
url.setScheme("http"); url.setScheme("http");
url.setHost(m_deviceMonitors.value(thing)->networkDeviceInfo().address().toString()); url.setHost(m_monitors.value(thing)->networkDeviceInfo().address().toString());
url.setPath("/config"); url.setPath("/config");
QNetworkRequest request(url); QNetworkRequest request(url);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");

10
meross/integrationpluginmeross.h
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright 2013 - 2022, nymea GmbH * Copyright 2013 - 2024, nymea GmbH
* Contact: contact@nymea.io * Contact: contact@nymea.io
* *
* This file is part of nymea. * This file is part of nymea.
@ -74,10 +74,10 @@ private:
QNetworkReply *request(Thing *thing, const QString &nameSpace, Method method = GET, const QVariantMap &payload = QVariantMap()); QNetworkReply *request(Thing *thing, const QString &nameSpace, Method method = GET, const QVariantMap &payload = QVariantMap());
QHash<Thing*, QByteArray> m_keys; QHash<Thing *, QByteArray> m_keys;
QHash<Thing*, NetworkDeviceMonitor*> m_deviceMonitors; QHash<Thing *, NetworkDeviceMonitor *> m_monitors;
PluginTimer* m_timer5s = nullptr; PluginTimer *m_timer5s = nullptr;
PluginTimer* m_timer60s = nullptr; PluginTimer *m_timer60s = nullptr;
}; };
#endif // INTEGRATIONPLUGINMEROSS_H #endif // INTEGRATIONPLUGINMEROSS_H

22
meross/integrationpluginmeross.json
View File

@ -14,13 +14,31 @@
"displayName": "Smart plug", "displayName": "Smart plug",
"createMethods": ["discovery"], "createMethods": ["discovery"],
"setupMethod": "userandpassword", "setupMethod": "userandpassword",
"interfaces": [ "powersocket", "smartmeterconsumer", "wirelessconnectable" ], "interfaces": [ "powersocket", "smartmeterconsumer", "wirelessconnectable", "networkdevice"],
"paramTypes": [ "paramTypes": [
{ {
"id": "1e273e10-3ea0-4337-a221-3b8e26c6e7dc", "id": "1e273e10-3ea0-4337-a221-3b8e26c6e7dc",
"name":"macAddress", "name":"macAddress",
"displayName": "MAC address", "displayName": "MAC address",
"type": "QString" "type": "QString",
"inputType": "MacAddress",
"defaultValue": ""
},
{
"id": "e9a8097d-409b-4d2c-a4d5-86c5f4016b73",
"name":"hostName",
"displayName": "Host name",
"type": "QString",
"inputType": "TextLine",
"defaultValue": ""
},
{
"id": "7d2f1a1a-f26b-4ae4-820a-cbc381675f8b",
"name":"address",
"displayName": "IP address",
"type": "QString",
"inputType": "IPv4Address",
"defaultValue": ""
} }
], ],
"stateTypes": [ "stateTypes": [