Shelly: Allow choosing between unicast and multicast CoIoT
UDP multicast isn't properly working on some network setups so we'll default to unicast by configuring our own IP to the shelly. This has the downside that the Shelly device won't work any more with other software or multiple nymea setups, so we'll still allow choosing the multicast option in the setup params.
This commit is contained in:
Michael Zanetti
parent
da48352f5d
commit
8ddea5c0f1
@ -37,6 +37,7 @@
|
|||||||
#include <QHostAddress>
|
#include <QHostAddress>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QColor>
|
#include <QColor>
|
||||||
|
#include <QNetworkInterface>
|
||||||
|
|
||||||
#include "hardwaremanager.h"
|
#include "hardwaremanager.h"
|
||||||
#include "network/networkaccessmanager.h"
|
#include "network/networkaccessmanager.h"
|
||||||
@ -769,8 +770,8 @@ void IntegrationPluginShelly::onMulticastMessageReceived(const QHostAddress &sou
|
|||||||
}
|
}
|
||||||
|
|
||||||
thing->setStateValue("connected", true);
|
thing->setStateValue("connected", true);
|
||||||
foreach (Thing *thing, myThings().filterByParentId(thing->id())) {
|
foreach (Thing *child, myThings().filterByParentId(thing->id())) {
|
||||||
thing->setStateValue("connected", true);
|
child->setStateValue("connected", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
qCDebug(dcShelly) << "CoIoT multicast message for" << thing->name() << ":" << qUtf8Printable(jsonDoc.toJson());
|
qCDebug(dcShelly) << "CoIoT multicast message for" << thing->name() << ":" << qUtf8Printable(jsonDoc.toJson());
|
||||||
@ -1214,6 +1215,25 @@ void IntegrationPluginShelly::setupGen1(ThingSetupInfo *info)
|
|||||||
|
|
||||||
QUrlQuery query;
|
QUrlQuery query;
|
||||||
query.addQueryItem("coiot_enable", "true");
|
query.addQueryItem("coiot_enable", "true");
|
||||||
|
if (thing->paramValue("coapMode").toString() == "unicast") {
|
||||||
|
QHostAddress ourAddress;
|
||||||
|
foreach (const QNetworkInterface &interface, QNetworkInterface::allInterfaces()) {
|
||||||
|
foreach (const QNetworkAddressEntry &addressEntry, interface.addressEntries()) {
|
||||||
|
if (address.isInSubnet(addressEntry.ip(), addressEntry.prefixLength())) {
|
||||||
|
ourAddress = addressEntry.ip();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!ourAddress.isNull()) {
|
||||||
|
query.addQueryItem("coiot_peer", ourAddress.toString() + ":5683");
|
||||||
|
} else {
|
||||||
|
qCWarning(dcShelly) << "Unable to determine a matching interface for CoIoT unicast. Falling back to multicast.";
|
||||||
|
query.addQueryItem("coiot_peer", "mcast");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
query.addQueryItem("coiot_peer", "mcast");
|
||||||
|
}
|
||||||
|
|
||||||
// Make sure the shelly 2.5 is in the mode we expect it to be (roller or relay)
|
// Make sure the shelly 2.5 is in the mode we expect it to be (roller or relay)
|
||||||
if (info->thing()->thingClassId() == shelly25ThingClassId || info->thing()->thingClassId() == shelly2ThingClassId) {
|
if (info->thing()->thingClassId() == shelly25ThingClassId || info->thing()->thingClassId() == shelly2ThingClassId) {
|
||||||
|
|||||||
@ -22,6 +22,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "da0587f1-2fd5-46b5-8f9c-726a853cb034",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "fa1aa0f6-93b2-410d-a2c5-7b2f45eae679",
|
"id": "fa1aa0f6-93b2-410d-a2c5-7b2f45eae679",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -121,6 +129,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "4ce97119-2791-4283-a3a8-16eb31b3dc71",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "99a31711-0029-461e-9117-2834451175c1",
|
"id": "99a31711-0029-461e-9117-2834451175c1",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -239,6 +255,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "988313b8-fa9e-4507-805e-8855f39e804f",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "b7c4c031-77ec-4ce7-a499-5bb8bf117fe8",
|
"id": "b7c4c031-77ec-4ce7-a499-5bb8bf117fe8",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -357,6 +381,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "64e9559a-b6fa-42b9-bdd4-6e1d14c200c5",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "521303e2-ef93-47df-8acb-fb1f8f78aae9",
|
"id": "521303e2-ef93-47df-8acb-fb1f8f78aae9",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -474,6 +506,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "1190e5e6-edc0-4584-a8eb-ee09e42bf8e0",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "4fb3c690-0183-4fc4-affa-1404788b2dcc",
|
"id": "4fb3c690-0183-4fc4-affa-1404788b2dcc",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -591,6 +631,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "8aa73fb6-fdb9-45f1-ac10-73933290c1b1",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "42797a00-1591-4021-8f4c-2a170189911b",
|
"id": "42797a00-1591-4021-8f4c-2a170189911b",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -719,6 +767,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "51e32b3c-f5de-4d54-abf5-24f9373d0ed3",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "0b060c1a-3b9b-42d7-87f8-41b7b64a7eb8",
|
"id": "0b060c1a-3b9b-42d7-87f8-41b7b64a7eb8",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -873,6 +929,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "ede766a3-ccd8-411d-b35a-d1b14422f2f3",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "2df0d509-d4b5-407a-835a-6b6392653e10",
|
"id": "2df0d509-d4b5-407a-835a-6b6392653e10",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -994,6 +1058,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "6db63b23-1513-4d63-8837-cafe51e1b283",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "cc4a3365-b302-4782-9eec-ee6b66df8ed6",
|
"id": "cc4a3365-b302-4782-9eec-ee6b66df8ed6",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -1165,6 +1237,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "e53d9a35-c5e0-42d4-8d96-cf6cd595789d",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "34a20277-bf0c-4fd5-8ae1-b3019681fa82",
|
"id": "34a20277-bf0c-4fd5-8ae1-b3019681fa82",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -1350,6 +1430,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "a9373316-4484-4be0-a153-bfbc1940c63f",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "1ea30a6f-5139-4452-8e23-0c525494c9c8",
|
"id": "1ea30a6f-5139-4452-8e23-0c525494c9c8",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -1472,6 +1560,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "5d898676-acc6-47de-a42d-0b9b9710286c",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "ee942141-3102-4b6a-87dc-0fc6481924e5",
|
"id": "ee942141-3102-4b6a-87dc-0fc6481924e5",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -1746,6 +1842,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "ec1bc52c-ca1b-4599-9ba7-7ca40d62faab",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "21e11417-b862-44e6-828f-d65207328630",
|
"id": "21e11417-b862-44e6-828f-d65207328630",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -2048,6 +2152,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "a64286ea-5532-412e-9c97-fa8c7a71439c",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "61957e60-4b77-4aa7-893f-e94559cac15c",
|
"id": "61957e60-4b77-4aa7-893f-e94559cac15c",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
@ -2317,6 +2429,14 @@
|
|||||||
"type": "QString",
|
"type": "QString",
|
||||||
"readOnly": true
|
"readOnly": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "aeac9b68-561e-4b3c-af1c-c24af3bb0d4d",
|
||||||
|
"name": "coapMode",
|
||||||
|
"displayName": "CoIoT peer mode",
|
||||||
|
"type": "QString",
|
||||||
|
"allowedValues": ["unicast", "multicast"],
|
||||||
|
"defaultValue": "unicast"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "ea210ec8-37ed-4479-9454-48cc06a1df88",
|
"id": "ea210ec8-37ed-4479-9454-48cc06a1df88",
|
||||||
"name": "username",
|
"name": "username",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user