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

Fix typos and handle reconfigure

Browse Source
This commit is contained in:
Simon Stürz 2022-04-25 07:44:45 +02:00
parent aa6c145eca
commit 642042425e
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -853,8 +853,8 @@ Section: libs
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
libudev1, libudev1,
Description: nymea.io plugin for USB-RLY82 relay Description: nymea integration plugin for USB-RLY82 relay
This package will install the nymea.io integration plugin for USB-RLY82 relay This package will install the nymea integration plugin for USB-RLY82 relay
with 2 relays and 8 analog/digital inputs. with 2 relays and 8 analog/digital inputs.

16
usbrly82/integrationpluginusbrly82.cpp
View File

@ -71,8 +71,13 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
if (serialPortInfo.serialNumber == thing->paramValue(usbRelayThingSerialNumberParamTypeId).toString()) { if (serialPortInfo.serialNumber == thing->paramValue(usbRelayThingSerialNumberParamTypeId).toString()) {
qCDebug(dcUsbRly82()) << "Found serial port for" << thing << serialPortInfo; qCDebug(dcUsbRly82()) << "Found serial port for" << thing << serialPortInfo;
// Handle reconfigure
if (m_relays.contains(thing)) {
m_relays.take(thing)->deleteLater();
}
UsbRly82 *relay = new UsbRly82(this); UsbRly82 *relay = new UsbRly82(this);
relay->setAnlalogRefreshRate(thing->setting(usbRelaySettingsAnalogRefreshRateParamTypeId).toUInt()); relay->setAnalogRefreshRate(thing->setting(usbRelaySettingsAnalogRefreshRateParamTypeId).toUInt());
connect(relay, &UsbRly82::availableChanged, thing, [=](bool available){ connect(relay, &UsbRly82::availableChanged, thing, [=](bool available){
qCDebug(dcUsbRly82()) << thing << "available changed" << available; qCDebug(dcUsbRly82()) << thing << "available changed" << available;
@ -83,7 +88,7 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
thing->setStateValue(usbRelayPowerRelay1StateTypeId, relay->powerRelay1()); thing->setStateValue(usbRelayPowerRelay1StateTypeId, relay->powerRelay1());
thing->setStateValue(usbRelayPowerRelay2StateTypeId, relay->powerRelay2()); thing->setStateValue(usbRelayPowerRelay2StateTypeId, relay->powerRelay2());
updateDigitalInuts(thing); updateDigitalInputs(thing);
thing->setStateValue(usbRelayVersionStateTypeId, relay->softwareVersion()); thing->setStateValue(usbRelayVersionStateTypeId, relay->softwareVersion());
} }
@ -100,7 +105,7 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
}); });
connect(relay, &UsbRly82::digitalInputsChanged, thing, [=](){ connect(relay, &UsbRly82::digitalInputsChanged, thing, [=](){
updateDigitalInuts(thing); updateDigitalInputs(thing);
}); });
if (!relay->connectRelay(serialPortInfo.systemLocation)) { if (!relay->connectRelay(serialPortInfo.systemLocation)) {
@ -116,7 +121,7 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
connect(thing, &Thing::settingChanged, this, [=](const ParamTypeId &paramTypeId, const QVariant &value){ connect(thing, &Thing::settingChanged, this, [=](const ParamTypeId &paramTypeId, const QVariant &value){
if (paramTypeId == usbRelaySettingsAnalogRefreshRateParamTypeId) { if (paramTypeId == usbRelaySettingsAnalogRefreshRateParamTypeId) {
qCDebug(dcUsbRly82()) << "Refrsh rat changed for" << thing << value.toUInt() << "ms"; qCDebug(dcUsbRly82()) << "Refrsh rat changed for" << thing << value.toUInt() << "ms";
relay->setAnlalogRefreshRate(value.toUInt()); relay->setAnalogRefreshRate(value.toUInt());
} }
}); });
@ -149,7 +154,6 @@ void IntegrationPluginUsbRly82::thingRemoved(Thing *thing)
} }
} }
void IntegrationPluginUsbRly82::executeAction(ThingActionInfo *info) void IntegrationPluginUsbRly82::executeAction(ThingActionInfo *info)
{ {
qCDebug(dcUsbRly82()) << "Executing action for thing" << info->thing() << info->action().actionTypeId().toString() << info->action().params(); qCDebug(dcUsbRly82()) << "Executing action for thing" << info->thing() << info->action().actionTypeId().toString() << info->action().params();
@ -235,7 +239,7 @@ void IntegrationPluginUsbRly82::onSerialPortRemoved(const SerialPortMonitor::Ser
} }
} }
void IntegrationPluginUsbRly82::updateDigitalInuts(Thing *thing) void IntegrationPluginUsbRly82::updateDigitalInputs(Thing *thing)
{ {
UsbRly82 *relay = m_relays.value(thing); UsbRly82 *relay = m_relays.value(thing);
if (!relay) if (!relay)

2
usbrly82/usbrly82.cpp
View File

@ -148,7 +148,7 @@ uint UsbRly82::analogRefreshRate() const
return m_analogRefreshRate; return m_analogRefreshRate;
} }
void UsbRly82::setAnlalogRefreshRate(uint analogRefreshRate) void UsbRly82::setAnalogRefreshRate(uint analogRefreshRate)
{ {
m_analogRefreshRate = analogRefreshRate; m_analogRefreshRate = analogRefreshRate;
if (m_analogRefreshRate == 0) { if (m_analogRefreshRate == 0) {

2
usbrly82/usbrly82.h
View File

@ -85,7 +85,7 @@ public:
UsbRly82Reply *setRelay2Power(bool power); UsbRly82Reply *setRelay2Power(bool power);
uint analogRefreshRate() const; uint analogRefreshRate() const;
void setAnlalogRefreshRate(uint analogRefreshRate); void setAnalogRefreshRate(uint analogRefreshRate);
quint8 digitalInputs() const; quint8 digitalInputs() const;