ETM-Schurig/nymea-plugins
1
0
Fork 0
mirror of https://github.com/nymea/nymea-plugins.git synced 2026-10-22 14:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

finished nymealight network discovery

Browse Source
This commit is contained in:
Boernsman 2021-05-23 15:43:42 +02:00
parent 25c80753a7
commit 20c8083a2a
2 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ws2812fx/integrationpluginws2812fx.cpp
View File

@ -38,7 +38,6 @@
#include "network/zeroconf/zeroconfservicebrowser.h" #include "network/zeroconf/zeroconfservicebrowser.h"
#include "nymealightserialinterface.h" #include "nymealightserialinterface.h"
#include "nymealighttcpinterface.h"
IntegrationPluginWs2812fx ::IntegrationPluginWs2812fx () IntegrationPluginWs2812fx ::IntegrationPluginWs2812fx ()
{ {
@ -48,12 +47,30 @@ void IntegrationPluginWs2812fx::init()
{ {
m_serviceBrowser = hardwareManager()->zeroConfController()->createServiceBrowser(); m_serviceBrowser = hardwareManager()->zeroConfController()->createServiceBrowser();
connect(m_serviceBrowser, &ZeroConfServiceBrowser::serviceEntryAdded, this, [=] (const ZeroConfServiceEntry &entry){ connect(m_serviceBrowser, &ZeroConfServiceBrowser::serviceEntryAdded, this, [=] (const ZeroConfServiceEntry &entry){
qCDebug(dcWs2812fx()) << "mDNS service added" << entry; if (!entry.serviceType().contains("nymealight")) {
foreach (Thing *thing, myThings().filterByThingClassId(nymeaLightThingClassId)) { return;
Q_UNUSED(thing) //TODO auto address update
if (entry.txt().contains("nymea-light")) {
}
} }
if (entry.txt("mac").isEmpty()) {
return;
}
ParamList parameters;
parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Network"));
parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, entry.txt("mac")));
Thing *thing = myThings().findByParams(parameters);
if (!thing) {
return;
}
qCDebug(dcWs2812fx()) << "Updating IP address" << thing << "to" << entry.hostAddress();
thing->setParamValue(nymeaLightThingAddressParamTypeId, entry.hostAddress().toString());
if (!m_lights.contains(thing)) {
qCWarning(dcWs2812fx()) << "No nyema light connection found for" << thing;
return;
}
NymeaLightTcpInterface *lightInterface = qobject_cast<NymeaLightTcpInterface *>(m_lights.value(thing)->parent());
lightInterface->setAddress(entry.hostAddress());
}); });
} }
@ -121,7 +138,6 @@ void IntegrationPluginWs2812fx::setupThing(ThingSetupInfo *info)
void IntegrationPluginWs2812fx::discoverThings(ThingDiscoveryInfo *info) void IntegrationPluginWs2812fx::discoverThings(ThingDiscoveryInfo *info)
{ {
// Create the list of available serial interfaces // Create the list of available serial interfaces
Q_FOREACH(QSerialPortInfo port, QSerialPortInfo::availablePorts()) { Q_FOREACH(QSerialPortInfo port, QSerialPortInfo::availablePorts()) {
qCDebug(dcWs2812fx()) << "Found serial port:" << port.portName(); qCDebug(dcWs2812fx()) << "Found serial port:" << port.portName();
QString description = port.systemLocation() + " " + port.manufacturer() + " " + port.description(); QString description = port.systemLocation() + " " + port.manufacturer() + " " + port.description();
@ -137,18 +153,31 @@ void IntegrationPluginWs2812fx::discoverThings(ThingDiscoveryInfo *info)
info->addThingDescriptor(descriptor); info->addThingDescriptor(descriptor);
} }
if (!hardwareManager()->zeroConfController()->available()) {
qCWarning(dcWs2812fx()) << "ZeroConfController not available";
}
Q_FOREACH (const ZeroConfServiceEntry &service, m_serviceBrowser->serviceEntries()) { Q_FOREACH (const ZeroConfServiceEntry &service, m_serviceBrowser->serviceEntries()) {
qCDebug(dcWs2812fx()) << "mDNS service entry:" << service;
if (service.txt().contains("nymea-light")) { if (service.serviceType().contains("nymealight")) {
ThingDescriptor descriptor(info->thingClassId(), service.name(), service.hostAddress().toString()); if (service.txt("mac").isEmpty()) {
qCDebug(dcWs2812fx()) << "Found nymea light but mac txt record is missing, ignoring.";
continue;
}
QString name;
if (!service.txt("name").isEmpty()) {
name = service.txt("name");
} else {
name = service.name();
}
ThingDescriptor descriptor(info->thingClassId(), name, service.hostAddress().toString());
ParamList parameters; ParamList parameters;
parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Network")); parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Network"));
parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, "")); //TODO fixme parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, service.txt("mac")));
parameters.append(Param(nymeaLightThingAddressParamTypeId, service.hostAddress().toString())); parameters.append(Param(nymeaLightThingAddressParamTypeId, service.hostAddress().toString()));
descriptor.setParams(parameters); descriptor.setParams(parameters);
info->addThingDescriptor(descriptor); info->addThingDescriptor(descriptor);
info->addThingDescriptor(descriptor);
} }
} }
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);

2
ws2812fx/integrationpluginws2812fx.h
View File

@ -97,6 +97,7 @@
#include "nymealight.h" #include "nymealight.h"
#include "network/zeroconf/zeroconfservicebrowser.h" #include "network/zeroconf/zeroconfservicebrowser.h"
#include "network/zeroconf/zeroconfserviceentry.h" #include "network/zeroconf/zeroconfserviceentry.h"
#include "nymealighttcpinterface.h"
#include <QTimer> #include <QTimer>
#include <QSerialPort> #include <QSerialPort>
@ -120,6 +121,7 @@ public:
private: private:
QHash<Thing *, NymeaLight *> m_lights; QHash<Thing *, NymeaLight *> m_lights;
QHash<Thing *, NymeaLightTcpInterface *> m_lightTcpInterface;
QList<QString> m_usedInterfaces; QList<QString> m_usedInterfaces;
ZeroConfServiceBrowser *m_serviceBrowser = nullptr; ZeroConfServiceBrowser *m_serviceBrowser = nullptr;