From 642042425e35da9aa18ae7442c5d86528ec77cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Mon, 25 Apr 2022 07:44:45 +0200
Subject: [PATCH] Fix typos and handle reconfigure

---
 debian/control                         |  4 ++--
 usbrly82/integrationpluginusbrly82.cpp | 16 ++++++++++------
 usbrly82/usbrly82.cpp                  |  2 +-
 usbrly82/usbrly82.h                    |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index eedffece..d8f4fab2 100644
--- a/debian/control
+++ b/debian/control
@@ -853,8 +853,8 @@ Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libudev1,
-Description: nymea.io plugin for USB-RLY82 relay
- This package will install the nymea.io integration plugin for USB-RLY82 relay
+Description: nymea 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.
 
 
diff --git a/usbrly82/integrationpluginusbrly82.cpp b/usbrly82/integrationpluginusbrly82.cpp
index c6bc8ab7..cd7202e3 100644
--- a/usbrly82/integrationpluginusbrly82.cpp
+++ b/usbrly82/integrationpluginusbrly82.cpp
@@ -71,8 +71,13 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
             if (serialPortInfo.serialNumber == thing->paramValue(usbRelayThingSerialNumberParamTypeId).toString()) {
                 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);
-                relay->setAnlalogRefreshRate(thing->setting(usbRelaySettingsAnalogRefreshRateParamTypeId).toUInt());
+                relay->setAnalogRefreshRate(thing->setting(usbRelaySettingsAnalogRefreshRateParamTypeId).toUInt());
 
                 connect(relay, &UsbRly82::availableChanged, thing, [=](bool available){
                     qCDebug(dcUsbRly82()) << thing << "available changed" << available;
@@ -83,7 +88,7 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
                         thing->setStateValue(usbRelayPowerRelay1StateTypeId, relay->powerRelay1());
                         thing->setStateValue(usbRelayPowerRelay2StateTypeId, relay->powerRelay2());
 
-                        updateDigitalInuts(thing);
+                        updateDigitalInputs(thing);
 
                         thing->setStateValue(usbRelayVersionStateTypeId, relay->softwareVersion());
                     }
@@ -100,7 +105,7 @@ void IntegrationPluginUsbRly82::setupThing(ThingSetupInfo *info)
                 });
 
                 connect(relay, &UsbRly82::digitalInputsChanged, thing, [=](){
-                    updateDigitalInuts(thing);
+                    updateDigitalInputs(thing);
                 });
 
                 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){
                     if (paramTypeId == usbRelaySettingsAnalogRefreshRateParamTypeId) {
                         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)
 {
     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);
     if (!relay)
diff --git a/usbrly82/usbrly82.cpp b/usbrly82/usbrly82.cpp
index 2a894954..a2387e24 100644
--- a/usbrly82/usbrly82.cpp
+++ b/usbrly82/usbrly82.cpp
@@ -148,7 +148,7 @@ uint UsbRly82::analogRefreshRate() const
     return m_analogRefreshRate;
 }
 
-void UsbRly82::setAnlalogRefreshRate(uint analogRefreshRate)
+void UsbRly82::setAnalogRefreshRate(uint analogRefreshRate)
 {
     m_analogRefreshRate = analogRefreshRate;
     if (m_analogRefreshRate == 0) {
diff --git a/usbrly82/usbrly82.h b/usbrly82/usbrly82.h
index c45a7ba4..69075371 100644
--- a/usbrly82/usbrly82.h
+++ b/usbrly82/usbrly82.h
@@ -85,7 +85,7 @@ public:
     UsbRly82Reply *setRelay2Power(bool power);
 
     uint analogRefreshRate() const;
-    void setAnlalogRefreshRate(uint analogRefreshRate);
+    void setAnalogRefreshRate(uint analogRefreshRate);
 
     quint8 digitalInputs() const;