From 02d69ce6754e8473c0552d1f5e50eb720c55ae15 Mon Sep 17 00:00:00 2001
From: Bernhard Trinnes <bernhard.trinnes@guh.io>
Date: Thu, 6 Dec 2018 20:06:21 +0100
Subject: [PATCH] unipi fixed parsing of json objects

---
 unipi/devicepluginunipi.cpp  | 48 +++++++++++++++++-------------------
 unipi/devicepluginunipi.h    |  1 +
 unipi/devicepluginunipi.json |  6 -----
 3 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/unipi/devicepluginunipi.cpp b/unipi/devicepluginunipi.cpp
index ff8a6b59..e723b022 100644
--- a/unipi/devicepluginunipi.cpp
+++ b/unipi/devicepluginunipi.cpp
@@ -61,12 +61,14 @@ DeviceManager::DeviceSetupStatus DevicePluginUniPi::setupDevice(Device *device)
     if (device->deviceClassId() == digitalInputDeviceClassId) {
 
         m_usedDigitalInputs.insert(device->paramValue(digitalInputDeviceNumberParamTypeId).toString(), device);
+        requestAllData();
         return DeviceManager::DeviceSetupStatusSuccess;
     }
 
     if (device->deviceClassId() == analogInputDeviceClassId) {
 
         m_usedAnalogInputs.insert(device->paramValue(analogInputDeviceInputNumberParamTypeId).toString(), device);
+        requestAllData();
         return DeviceManager::DeviceSetupStatusSuccess;
     }
 
@@ -118,8 +120,10 @@ DeviceManager::DeviceSetupStatus DevicePluginUniPi::setupDevice(Device *device)
     if (device->deviceClassId() == temperatureSensorDeviceClassId) {
 
         m_usedTemperatureSensors.insert(device->paramValue(temperatureSensorDeviceAddressParamTypeId).toString(), device);
+        requestAllData();
         return DeviceManager::DeviceSetupStatusSuccess;
     }
+
     return DeviceManager::DeviceSetupStatusFailure;
 }
 
@@ -363,10 +367,9 @@ DeviceManager::DeviceError DevicePluginUniPi::discoverDevices(const DeviceClassI
                 if (m_usedTemperatureSensors.contains(circuit)){
                     continue;
                 }
-                DeviceDescriptor descriptor(deviceClassId, QString("Temperature Sensor %1").arg(circuit), circuit);
+                DeviceDescriptor descriptor(deviceClassId, "Temperature Sensor", circuit);
                 ParamList parameters;
                 parameters.append(Param(temperatureSensorDeviceAddressParamTypeId, circuit));
-                parameters.append(Param(temperatureSensorDeviceTypeParamTypeId, circuit));
                 descriptor.setParams(parameters);
                 deviceDescriptors.append(descriptor);
             }
@@ -551,12 +554,7 @@ void DevicePluginUniPi::onWebSocketConnected()
     connect(m_webSocket, &QWebSocket::textMessageReceived,
             this, &DevicePluginUniPi::onWebSocketTextMessageReceived);
 
-    QJsonObject json;
-    json["cmd"] = "all";
-
-    QJsonDocument doc(json);
-    QByteArray bytes = doc.toJson();
-    m_webSocket->sendTextMessage(bytes);
+    requestAllData();
 }
 
 void DevicePluginUniPi::onWebSocketDisconnected()
@@ -565,19 +563,27 @@ void DevicePluginUniPi::onWebSocketDisconnected()
 
 }
 
+void DevicePluginUniPi::requestAllData()
+{
+    QJsonObject json;
+    json["cmd"] = "all";
+
+    QJsonDocument doc(json);
+    QByteArray bytes = doc.toJson();
+    m_webSocket->sendTextMessage(bytes);
+}
 
 void DevicePluginUniPi::onWebSocketTextMessageReceived(QString message)
 {
     QJsonArray array;
-    QJsonObject obj;
     QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
 
     // check validity of the document
     if(!doc.isNull()) {
         if(doc.isObject()) {
-            obj = doc.object();
+            array.append(doc.object());
         } else if (doc.isArray()){
-            array = doc.array();
+            array = doc.array();;
         }else {
             qCDebug(dcUniPi()) << "Document is not an object nor an array";
         }
@@ -586,13 +592,9 @@ void DevicePluginUniPi::onWebSocketTextMessageReceived(QString message)
     }
 
     for (int levelIndex = 0; levelIndex < array.size(); ++levelIndex) {
+        QJsonObject obj;
         obj = array[levelIndex].toObject();
 
-        if (obj["cmd"] == "all") {
-            //read model number
-            qCDebug(dcUniPi()) << message;
-        }
-
         if (obj["dev"] == "relay") {
             qCDebug(dcUniPi()) << "Relay:" << "Circuit:" <<  obj["circuit"].toString() << "Value:" << obj["value"].toInt() << "Relay Type:" << obj["relay_type"].toString() ;
 
@@ -713,15 +715,6 @@ void DevicePluginUniPi::onWebSocketTextMessageReceived(QString message)
             }
         }
 
-        if (obj["dev"] == "led") { //TODO can't discover leds without toggling it from another client
-            qCDebug(dcUniPi()) << "Led:" << obj["dev"] << "Circuit:" <<  obj["circuit"].toString() << "Value:" << obj["value"].toInt();
-
-            if (!m_leds.contains(obj["circuit"].toString())){
-                //New led detected
-                m_leds.append(obj["circuit"].toString());
-            }
-        }
-
         if (obj["dev"] == "ao") {
             qCDebug(dcUniPi()) << "Analog Output:" << obj["dev"] << "Circuit:" <<  obj["circuit"].toString() << "Value:" << obj["value"].toDouble();
 
@@ -759,17 +752,20 @@ void DevicePluginUniPi::onWebSocketTextMessageReceived(QString message)
         }
 
         if (obj["dev"] == "temp") {
-            qCDebug(dcUniPi()) << "Temperature Sensor:" << obj["typ"] << "Circuit:" <<  obj["circuit"].toString() << "Value:" << obj["value"].toDouble();
+            qCDebug(dcUniPi()) << "Temperature Sensor:" << obj["typ"].toString() << "Address:" <<  obj["circuit"].toString() << "Value:" << obj["value"].toDouble();
             if (!m_temperatureSensors.contains(obj["circuit"].toString())){
                 //New temperature sensor detected
                 m_temperatureSensors.append(obj["circuit"].toString());
             } else {
+                //Updating states of already added temperature sensor
                 if (m_usedTemperatureSensors.contains(obj["circuit"].toString())) {
                     double value = QVariant(obj["value"]).toDouble();
+                    bool connected = QVariant(obj["lost"]).toBool();
                     Device *device = m_usedTemperatureSensors.value(obj["circuit"].toString());
 
                     if (device->deviceClassId() == temperatureSensorDeviceClassId) {
                         device->setStateValue(temperatureSensorTemperatureStateTypeId, value);
+                        device->setStateValue(temperatureSensorConnectedStateTypeId, connected);
                     }
                 }
             }
diff --git a/unipi/devicepluginunipi.h b/unipi/devicepluginunipi.h
index 3161d806..1ff4e4a9 100644
--- a/unipi/devicepluginunipi.h
+++ b/unipi/devicepluginunipi.h
@@ -81,6 +81,7 @@ private:
 
     PluginTimer *m_refreshTimer = nullptr;
 
+    void requestAllData();
     void setOutput(const QString &circuit, bool value);
     void connectToEvok();
 
diff --git a/unipi/devicepluginunipi.json b/unipi/devicepluginunipi.json
index 18502ce8..b6db4aec 100644
--- a/unipi/devicepluginunipi.json
+++ b/unipi/devicepluginunipi.json
@@ -328,12 +328,6 @@
                     "createMethods": ["discovery"],
                     "interfaces": ["temperaturesensor", "connectable"],
                     "paramTypes": [
-                        {
-                            "id": "9dd8f7e9-a24c-4a67-82cd-1e25e911cf5d",
-                            "name": "type",
-                            "displayName": "Type",
-                            "type": "QString"
-                        },
                         {
                             "id": "4684cee2-674e-4aa4-823d-096bd49f18ee",
                             "name": "address",