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

added nymea light tcp interface

Browse Source
This commit is contained in:
Boernsman 2021-05-23 14:26:25 +02:00
parent 45925556e4
commit 9db85504c8
4 changed files with 138 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
ws2812fx/integrationpluginws2812fx.cpp
View File

@ -34,54 +34,93 @@
#include "integrationpluginws2812fx.h" #include "integrationpluginws2812fx.h"
#include "plugininfo.h" #include "plugininfo.h"
#include "platform/platformzeroconfcontroller.h"
#include "network/zeroconf/zeroconfservicebrowser.h"
#include "nymealightserialinterface.h" #include "nymealightserialinterface.h"
#include "nymealighttcpinterface.h"
IntegrationPluginWs2812fx ::IntegrationPluginWs2812fx () IntegrationPluginWs2812fx ::IntegrationPluginWs2812fx ()
{ {
} }
void IntegrationPluginWs2812fx::init()
{
m_serviceBrowser = hardwareManager()->zeroConfController()->createServiceBrowser();
connect(m_serviceBrowser, &ZeroConfServiceBrowser::serviceEntryAdded, this, [=] (const ZeroConfServiceEntry &entry){
qCDebug(dcWs2812fx()) << "mDNS service added" << entry;
foreach (Thing *thing, myThings().filterByThingClassId(nymeaLightThingClassId)) {
Q_UNUSED(thing) //TODO auto address update
if (entry.txt().contains("nymea-light")) {
}
}
});
}
void IntegrationPluginWs2812fx::setupThing(ThingSetupInfo *info) void IntegrationPluginWs2812fx::setupThing(ThingSetupInfo *info)
{ {
Thing *thing = info->thing(); Thing *thing = info->thing();
qCDebug(dcWs2812fx()) << "Setup thing" << thing->name();
if (thing->thingClassId() == nymeaLightSerialThingClassId) { if (thing->thingClassId() == nymeaLightThingClassId) {
QString interface = thing->paramValue(nymeaLightSerialThingSerialPortParamTypeId).toString();
QString interface = thing->paramValue(nymeaLightThingAddressParamTypeId).toString();
NymeaLight *light = nullptr;
if (thing->paramValue(nymeaLightThingConnectionTypeParamTypeId).toString() == "Serial") {
if (m_usedInterfaces.contains(interface)) {
info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("This serial port is already in use."));
return;
}
NymeaLightSerialInterface *lightInterface = new NymeaLightSerialInterface(interface, thing);
light = new NymeaLight(lightInterface, this);
lightInterface->setParent(light);
m_usedInterfaces.append(interface);
info->finish(Thing::ThingErrorNoError);
} else if (thing->paramValue(nymeaLightThingConnectionTypeParamTypeId).toString() == "Network") {
if (m_usedInterfaces.contains(interface)) {
m_usedInterfaces.removeAll(interface);
qCDebug(dcWs2812fx()) << "Setup after reconfiguration, cleaning up ...";
}
if (QHostAddress(interface).isNull()) {
info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Address not valid"));
return;
}
NymeaLightTcpInterface *lightInterface = new NymeaLightTcpInterface(QHostAddress(interface), thing);
light = new NymeaLight(lightInterface, this);
lightInterface->setParent(light);
m_usedInterfaces.append(interface);
if (m_usedInterfaces.contains(interface)) {
info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("This serial port is already in use."));
return;
} }
NymeaLightSerialInterface *lightInterface = new NymeaLightSerialInterface(interface, thing);
NymeaLight *light = new NymeaLight(lightInterface, this);
lightInterface->setParent(light);
m_usedInterfaces.append(interface);
m_lights.insert(thing, light); m_lights.insert(thing, light);
connect(light, &NymeaLight::availableChanged, thing, [=](bool available){ connect(light, &NymeaLight::availableChanged, thing, [=](bool available){
qCDebug(dcWs2812fx()) << thing << "available changed" << available; qCDebug(dcWs2812fx()) << thing << "available changed" << available;
thing->setStateValue(nymeaLightSerialConnectedStateTypeId, available); thing->setStateValue(nymeaLightConnectedStateTypeId, available);
if (available) { if (available) {
// Set the light to the current states // Set the light to the current states
light->setPower(thing->stateValue(nymeaLightSerialPowerStateTypeId).toBool()); light->setPower(thing->stateValue(nymeaLightPowerStateTypeId).toBool());
light->setBrightness(thing->stateValue(nymeaLightSerialBrightnessStateTypeId).toUInt()); light->setBrightness(thing->stateValue(nymeaLightBrightnessStateTypeId).toUInt());
light->setColor(thing->stateValue(nymeaLightSerialColorStateTypeId).value<QColor>()); light->setColor(thing->stateValue(nymeaLightColorStateTypeId).value<QColor>());
light->setEffect(thing->stateValue(nymeaLightSerialEffectModeStateTypeId).toUInt()); light->setEffect(thing->stateValue(nymeaLightEffectModeStateTypeId).toUInt());
light->setSpeed(thing->stateValue(nymeaLightSerialSpeedStateTypeId).toUInt()); light->setSpeed(thing->stateValue(nymeaLightSpeedStateTypeId).toUInt());
} }
}); });
} else {
qCWarning(dcWs2812fx()) << "ThingClass not supported" << thing->thingClassId();
info->finish(Thing::ThingErrorNoError); return info->finish(Thing::ThingErrorThingClassNotFound);
} }
} }
void IntegrationPluginWs2812fx::postSetupThing(Thing *thing) void IntegrationPluginWs2812fx::postSetupThing(Thing *thing)
{ {
if (thing->thingClassId() == nymeaLightSerialThingClassId) { qCDebug(dcWs2812fx()) << "Post setup thing" << thing;
if (thing->thingClassId() == nymeaLightThingClassId) {
NymeaLight *light = m_lights.value(thing); NymeaLight *light = m_lights.value(thing);
light->enable(); light->enable();
} }
@ -96,14 +135,31 @@ void IntegrationPluginWs2812fx::discoverThings(ThingDiscoveryInfo *info)
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();
ThingDescriptor descriptor(info->thingClassId(), QT_TR_NOOP("Nymea light"), description); ThingDescriptor descriptor(info->thingClassId(), QT_TR_NOOP("Nymea light"), description);
foreach (Thing *existingThing, myThings().filterByParam(nymeaLightSerialThingSerialPortParamTypeId, port.systemLocation())) { foreach (Thing *existingThing, myThings().filterByParam(nymeaLightThingAddressParamTypeId, port.systemLocation())) {
descriptor.setThingId(existingThing->id()); descriptor.setThingId(existingThing->id());
} }
ParamList parameters; ParamList parameters;
parameters.append(Param(nymeaLightSerialThingSerialPortParamTypeId, port.systemLocation())); parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Serial"));
parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, port.serialNumber()));
parameters.append(Param(nymeaLightThingAddressParamTypeId, port.systemLocation()));
descriptor.setParams(parameters); descriptor.setParams(parameters);
info->addThingDescriptor(descriptor); info->addThingDescriptor(descriptor);
} }
Q_FOREACH (const ZeroConfServiceEntry &service, m_serviceBrowser->serviceEntries()) {
qCDebug(dcWs2812fx()) << "mDNS service entry:" << service;
if (service.txt().contains("nymea-light")) {
ThingDescriptor descriptor(info->thingClassId(), service.name(), service.hostAddress().toString());
ParamList parameters;
parameters.append(Param(nymeaLightThingConnectionTypeParamTypeId, "Network"));
parameters.append(Param(nymeaLightThingSerialnumberParamTypeId, "")); //TODO fixme
parameters.append(Param(nymeaLightThingAddressParamTypeId, service.hostAddress().toString()));
descriptor.setParams(parameters);
info->addThingDescriptor(descriptor);
info->addThingDescriptor(descriptor);
}
}
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
} }
@ -118,8 +174,8 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
return; return;
} }
if (action.actionTypeId() == nymeaLightSerialPowerActionTypeId) { if (action.actionTypeId() == nymeaLightPowerActionTypeId) {
bool power = action.param(nymeaLightSerialPowerActionPowerParamTypeId).value().toBool(); bool power = action.param(nymeaLightPowerActionPowerParamTypeId).value().toBool();
qCDebug(dcWs2812fx()) << "Set power" << power; qCDebug(dcWs2812fx()) << "Set power" << power;
NymeaLightInterfaceReply *reply = light->setPower(power, 500); NymeaLightInterfaceReply *reply = light->setPower(power, 500);
@ -131,11 +187,11 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
} }
qCDebug(dcWs2812fx()) << "Set power finished successfully" << power; qCDebug(dcWs2812fx()) << "Set power finished successfully" << power;
thing->setStateValue(nymeaLightSerialPowerStateTypeId, power); thing->setStateValue(nymeaLightPowerStateTypeId, power);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} else if (action.actionTypeId() == nymeaLightSerialColorActionTypeId) { } else if (action.actionTypeId() == nymeaLightColorActionTypeId) {
QColor color = action.param(nymeaLightSerialColorActionColorParamTypeId).value().value<QColor>(); QColor color = action.param(nymeaLightColorActionColorParamTypeId).value().value<QColor>();
qCDebug(dcWs2812fx()) << "Set color to" << color.name(QColor::HexRgb); qCDebug(dcWs2812fx()) << "Set color to" << color.name(QColor::HexRgb);
NymeaLightInterfaceReply *reply = light->setColor(color); NymeaLightInterfaceReply *reply = light->setColor(color);
connect(info, &ThingActionInfo::aborted, reply, &NymeaLightInterfaceReply::finished); connect(info, &ThingActionInfo::aborted, reply, &NymeaLightInterfaceReply::finished);
@ -145,12 +201,12 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
return; return;
} }
qCDebug(dcWs2812fx()) << "Set color finished successfully" << color.name(QColor::HexRgb); qCDebug(dcWs2812fx()) << "Set color finished successfully" << color.name(QColor::HexRgb);
thing->setStateValue(nymeaLightSerialColorStateTypeId, color); thing->setStateValue(nymeaLightColorStateTypeId, color);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} else if (action.actionTypeId() == nymeaLightSerialColorTemperatureActionTypeId) { } else if (action.actionTypeId() == nymeaLightColorTemperatureActionTypeId) {
// minValue 153, maxValue 500 // minValue 153, maxValue 500
uint colorTemperature = action.param(nymeaLightSerialColorTemperatureActionColorTemperatureParamTypeId).value().toDouble(); uint colorTemperature = action.param(nymeaLightColorTemperatureActionColorTemperatureParamTypeId).value().toDouble();
QColor color; QColor color;
color.setRgb(255, 255, qRound((255.00 - (((colorTemperature - 153.00) / 347.00)) * 255.00))); color.setRgb(255, 255, qRound((255.00 - (((colorTemperature - 153.00) / 347.00)) * 255.00)));
@ -164,11 +220,11 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
} }
qCDebug(dcWs2812fx()) << "Set color temperature finished successfully" << colorTemperature; qCDebug(dcWs2812fx()) << "Set color temperature finished successfully" << colorTemperature;
thing->setStateValue(nymeaLightSerialColorTemperatureStateTypeId, colorTemperature); thing->setStateValue(nymeaLightColorTemperatureStateTypeId, colorTemperature);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} else if (action.actionTypeId() == nymeaLightSerialBrightnessActionTypeId) { } else if (action.actionTypeId() == nymeaLightBrightnessActionTypeId) {
quint8 brightnessPercentage = action.param(nymeaLightSerialBrightnessActionBrightnessParamTypeId).value().toUInt(); quint8 brightnessPercentage = action.param(nymeaLightBrightnessActionBrightnessParamTypeId).value().toUInt();
quint8 brightness = qRound(255.0 * brightnessPercentage / 100); quint8 brightness = qRound(255.0 * brightnessPercentage / 100);
qCDebug(dcWs2812fx()) << "Set brightness to" << brightnessPercentage << brightness; qCDebug(dcWs2812fx()) << "Set brightness to" << brightnessPercentage << brightness;
NymeaLightInterfaceReply *reply = light->setBrightness(brightness, 1000); NymeaLightInterfaceReply *reply = light->setBrightness(brightness, 1000);
@ -180,11 +236,11 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
} }
qCDebug(dcWs2812fx()) << "Set brightness finished successfully" << brightness; qCDebug(dcWs2812fx()) << "Set brightness finished successfully" << brightness;
thing->setStateValue(nymeaLightSerialBrightnessStateTypeId, brightnessPercentage); thing->setStateValue(nymeaLightBrightnessStateTypeId, brightnessPercentage);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} else if (action.actionTypeId() == nymeaLightSerialSpeedActionTypeId) { } else if (action.actionTypeId() == nymeaLightSpeedActionTypeId) {
quint16 speedPercentage = action.param(nymeaLightSerialSpeedActionSpeedParamTypeId).value().toUInt(); quint16 speedPercentage = action.param(nymeaLightSpeedActionSpeedParamTypeId).value().toUInt();
quint16 speed = 2000 - (speedPercentage * 20); quint16 speed = 2000 - (speedPercentage * 20);
qCDebug(dcWs2812fx()) << "Set speed" << speedPercentage << "%" << speed << "ms"; qCDebug(dcWs2812fx()) << "Set speed" << speedPercentage << "%" << speed << "ms";
@ -197,11 +253,11 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
} }
qCDebug(dcWs2812fx()) << "Set speed finished successfully" << speedPercentage << "%" << speed << "ms"; qCDebug(dcWs2812fx()) << "Set speed finished successfully" << speedPercentage << "%" << speed << "ms";
thing->setStateValue(nymeaLightSerialSpeedStateTypeId, speedPercentage); thing->setStateValue(nymeaLightSpeedStateTypeId, speedPercentage);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} else if (action.actionTypeId() == nymeaLightSerialEffectModeActionTypeId) { } else if (action.actionTypeId() == nymeaLightEffectModeActionTypeId) {
QString effectMode = action.param(nymeaLightSerialEffectModeActionEffectModeParamTypeId).value().toString(); QString effectMode = action.param(nymeaLightEffectModeActionEffectModeParamTypeId).value().toString();
quint8 mode = FX_MODE_STATIC; quint8 mode = FX_MODE_STATIC;
if (effectMode == "Static") { if (effectMode == "Static") {
mode = FX_MODE_STATIC; mode = FX_MODE_STATIC;
@ -331,7 +387,7 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
} }
qCDebug(dcWs2812fx()) << "Set mode finished successfully" << effectMode << mode; qCDebug(dcWs2812fx()) << "Set mode finished successfully" << effectMode << mode;
thing->setStateValue(nymeaLightSerialEffectModeStateTypeId, effectMode); thing->setStateValue(nymeaLightEffectModeStateTypeId, effectMode);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} }
@ -340,10 +396,10 @@ void IntegrationPluginWs2812fx::executeAction(ThingActionInfo *info)
void IntegrationPluginWs2812fx::thingRemoved(Thing *thing) void IntegrationPluginWs2812fx::thingRemoved(Thing *thing)
{ {
if (thing->thingClassId() == nymeaLightSerialThingClassId) { qCDebug(dcWs2812fx()) << "Thing removed" << thing;
m_usedInterfaces.removeAll(thing->paramValue(nymeaLightSerialThingSerialPortParamTypeId).toString()); if (thing->thingClassId() == nymeaLightThingClassId) {
m_usedInterfaces.removeAll(thing->paramValue(nymeaLightThingAddressParamTypeId).toString());
NymeaLight *light = m_lights.take(thing); NymeaLight *light = m_lights.take(thing);
light->deleteLater(); light->deleteLater();
} }
} }

5
ws2812fx/integrationpluginws2812fx.h
View File

@ -95,6 +95,8 @@
#include "integrations/integrationplugin.h" #include "integrations/integrationplugin.h"
#include "nymealight.h" #include "nymealight.h"
#include "network/zeroconf/zeroconfservicebrowser.h"
#include "network/zeroconf/zeroconfserviceentry.h"
#include <QTimer> #include <QTimer>
#include <QSerialPort> #include <QSerialPort>
@ -110,6 +112,7 @@ class IntegrationPluginWs2812fx : public IntegrationPlugin
public: public:
explicit IntegrationPluginWs2812fx(); explicit IntegrationPluginWs2812fx();
void init() override;
void setupThing(ThingSetupInfo *info) override; void setupThing(ThingSetupInfo *info) override;
void postSetupThing(Thing *thing) override; void postSetupThing(Thing *thing) override;
void thingRemoved(Thing *thing) override; void thingRemoved(Thing *thing) override;
@ -120,6 +123,8 @@ private:
QHash<Thing *, NymeaLight *> m_lights; QHash<Thing *, NymeaLight *> m_lights;
QList<QString> m_usedInterfaces; QList<QString> m_usedInterfaces;
ZeroConfServiceBrowser *m_serviceBrowser = nullptr;
private slots: private slots:
signals: signals:

33
ws2812fx/integrationpluginws2812fx.json
View File

@ -10,18 +10,37 @@
"thingClasses": [ "thingClasses": [
{ {
"id": "24364e36-b199-4e35-b468-c44da58c009c", "id": "24364e36-b199-4e35-b468-c44da58c009c",
"name": "nymeaLightSerial", "name": "nymeaLight",
"displayName": "Serial nymea light", "displayName": "nymea light",
"createMethods": ["user", "discovery"], "createMethods": ["user", "discovery"],
"interfaces": ["colorlight", "connectable"], "interfaces": ["colorlight", "connectable"],
"paramTypes": [ "paramTypes": [
{ {
"id": "ed49f7d8-ab18-4c37-9b80-1004b75dcb91", "id": "a02dcbf9-c1d8-4dc3-9fb6-92ea75e0539d",
"name": "serialPort", "name": "connectionType",
"displayName": "Serial port", "displayName": "Connection type",
"type": "QString", "type": "QString",
"inputType": "TextLine", "allowedValues": [
"defaultValue": "/dev/ttyAMC0" "Serial",
"Network"
],
"defaultValue": "Serial",
"readOnly": true
},
{
"id": "7faf014a-a13d-4c41-9c12-d4427313e2c2",
"name": "serialnumber",
"displayName": "Serial number",
"type": "QString",
"defaultValue": "",
"readOnly": true
},
{
"id": "ed49f7d8-ab18-4c37-9b80-1004b75dcb91",
"name": "address",
"displayName": "Serial port or network address",
"type": "QString",
"defaultValue": ""
} }
], ],
"stateTypes": [ "stateTypes": [

10
ws2812fx/ws2812fx.pro
View File

@ -1,17 +1,21 @@
include(../plugins.pri) include(../plugins.pri)
QT += serialport QT += \
serialport \
network
TARGET = $$qtLibraryTarget(nymea_integrationpluginws2812fx) TARGET = $$qtLibraryTarget(nymea_integrationpluginws2812fx)
SOURCES += \ SOURCES += \
integrationpluginws2812fx.cpp \ integrationpluginws2812fx.cpp \
nymealight.cpp \ nymealight.cpp \
nymealightserialinterface.cpp nymealightserialinterface.cpp \
nymealighttcpinterface.cpp
HEADERS += \ HEADERS += \
integrationpluginws2812fx.h \ integrationpluginws2812fx.h \
nymealight.h \ nymealight.h \
nymealightinterface.h \ nymealightinterface.h \
nymealightserialinterface.h nymealightserialinterface.h \
nymealighttcpinterface.h