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

Meross: Also list devices with a Meross owned mac address

Browse Source 
The hostname resoving does not seem to work in all cases.
This commit is contained in:
Michael Zanetti 2022-06-12 23:28:08 +02:00
parent 1f411c2244
commit 86c23751cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meross/integrationpluginmeross.cpp
View File

@ -58,8 +58,7 @@ 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")) { if (deviceInfo.hostName().toLower().startsWith("meross_smart_plug") || deviceInfo.macAddressManufacturer().toLower().contains("meross")) {
ThingDescriptor descriptor(plugThingClassId, "Meross Smart Plug", deviceInfo.macAddress()); ThingDescriptor descriptor(plugThingClassId, "Meross Smart Plug", deviceInfo.macAddress());
descriptor.setParams({Param(plugThingMacAddressParamTypeId, deviceInfo.macAddress())}); descriptor.setParams({Param(plugThingMacAddressParamTypeId, deviceInfo.macAddress())});
@ -110,6 +109,7 @@ void IntegrationPluginMeross::confirmPairing(ThingPairingInfo *info, const QStri
qCDebug(dcMeross) << "Requesting" << request.url() << query.toString(); qCDebug(dcMeross) << "Requesting" << request.url() << query.toString();
QNetworkReply *reply = hardwareManager()->networkManager()->post(request, query.toString().toUtf8()); QNetworkReply *reply = hardwareManager()->networkManager()->post(request, query.toString().toUtf8());
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, info, [=](){ connect(reply, &QNetworkReply::finished, info, [=](){
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
qCWarning(dcMeross()) << "Error retrieving device key from cloud:" << reply->error() << reply->errorString(); qCWarning(dcMeross()) << "Error retrieving device key from cloud:" << reply->error() << reply->errorString();