DEV sort subdevices by specific order

E.g. a light comes before sensors. The order is given in the sub device JSON description.

Author: manup

de_web_plugin.cpp

@@ -17808,6 +17808,18 @@ void DeRestPluginPrivate::pushSensorInfoToCore(Sensor *sensor)
 
     Q_Q(DeRestPlugin);
 
+    bool isMainSubDevice = false;
+    Device *device = static_cast<Device*>(sensor->parentResource());
+
+    if (device)
+    {
+        const auto &subs = device->subDevices();
+        if (!subs.empty() && subs.front() == sensor)
+        {
+            isMainSubDevice = true;
+        }
+    }
+
     if (sensor->modelId().startsWith(QLatin1String("FLS-NB")))
     { } // use name from light
     else if (sensor->modelId().startsWith(QLatin1String("D1")) || sensor->modelId().startsWith(QLatin1String("S1")) ||
@@ -17819,19 +17831,19 @@ void DeRestPluginPrivate::pushSensorInfoToCore(Sensor *sensor)
     { } // use name from ZHAPresence sensor only
     else if (sensor->modelId() == QLatin1String("WarningDevice") && sensor->type() == QLatin1String("ZHAAlarm"))
     { } // use name from light
-    else if (!sensor->name().isEmpty())
+    else if (!sensor->name().isEmpty() || isMainSubDevice)
     {
-        q->nodeUpdated(sensor->address().ext(), QLatin1String("name"), sensor->name());
+        emit q->nodeUpdated(sensor->address().ext(), QLatin1String("name"), sensor->name());
     }
 
     if (!sensor->modelId().isEmpty())
     {
-        q->nodeUpdated(sensor->address().ext(), QLatin1String("modelid"), sensor->modelId());
+        emit q->nodeUpdated(sensor->address().ext(), QLatin1String("modelid"), sensor->modelId());
     }
 
     if (!sensor->manufacturer().isEmpty())
     {
-        q->nodeUpdated(sensor->address().ext(), QLatin1String("vendor"), sensor->manufacturer());
+        emit q->nodeUpdated(sensor->address().ext(), QLatin1String("vendor"), sensor->manufacturer());
     }
 
     if (!sensor->swVersion().isEmpty())

device.cpp

@@ -1564,6 +1564,13 @@ void Device::addSubDevice(Resource *sub)
         {
             hnd = sub->handle();
             DEV_CheckReachable(this);
+
+            std::sort(d->subResourceHandles.begin(), d->subResourceHandles.end(), [](const auto &a, const auto &b)
+            {
+                if (a.order == 0) { return false; }
+                return a.order < b.order;
+            });
+
             return;
         }
     }

device_descriptions.cpp

@@ -1489,6 +1489,9 @@ static DDF_SubDeviceDescriptor DDF_ReadSubDeviceFile(const QString &path)
         {
             result.restApi = obj.value(QLatin1String("restapi")).toString();
         }
+
+        result.order = obj.value(QLatin1String("order")).toInt(SUBDEVICE_DEFAULT_ORDER);
+
         if (obj.contains(QLatin1String("uuid")))
         {
             const auto uniqueId = obj.value(QLatin1String("uuid"));
@@ -1678,3 +1681,28 @@ static DeviceDescription DDF_MergeGenericItems(const std::vector<DeviceDescripti
 
     return result;
 }
+
+uint8_t DDF_GetSubDeviceOrder(const QString &type)
+{
+    if (type.isEmpty() || type.startsWith(QLatin1String("CLIP")))
+    {
+        return SUBDEVICE_DEFAULT_ORDER;
+    }
+
+    if (_priv)
+    {
+        auto i = std::find_if(_priv->subDevices.cbegin(), _priv->subDevices.cend(), [&](const auto &sub)
+        { return sub.name == type; });
+
+        if (i != _priv->subDevices.cend())
+        {
+            return i->order;
+        }
+    }
+
+#ifdef QT_DEBUG
+    DBG_Printf(DBG_DDF, "DDF: No subdevice for type: %s\n", qPrintable(type));
+#endif
+
+    return SUBDEVICE_DEFAULT_ORDER;
+}

device_descriptions.h

@@ -16,6 +16,8 @@
 #include "resource.h"
 #include "sensor.h"
 
+#define SUBDEVICE_DEFAULT_ORDER  200
+
 class Event;
 
 class DDF_ZclReport
@@ -186,6 +188,7 @@ class DDF_SubDeviceDescriptor
     QString restApi;
     QStringList uniqueId;
     std::vector<const char*> items; // RAttrName, etc.
+    int order;
 };
 
 inline bool isValid(const DDF_SubDeviceDescriptor &sub)

resource.cpp

@@ -1477,9 +1477,19 @@ Resource::Handle R_CreateResourceHandle(const Resource *r, size_t containerIndex
     result.hash = qHash(r->item(RAttrUniqueId)->toString());
     result.index = containerIndex;
     result.type = r->prefix()[1];
+    result.order = 0;
 
     Q_ASSERT(result.type == 's' || result.type == 'l' || result.type == 'd' || result.type == 'g');
     Q_ASSERT(isValid(result));
 
+    if (result.type == 's' || result.type == 'l')
+    {
+        const ResourceItem *type = r->item(RAttrType);
+        if (type)
+        {
+            result.order = DDF_GetSubDeviceOrder(type->toString());
+        }
+    }
+
     return result;
 }

resource.h

@@ -459,7 +459,7 @@ class Resource
         // 'L' LightNode
         // 'S' Sensor
         char type = 0;
-        quint8 reserved = 0;
+        quint8 order = 0;
     };
 
     Resource(const char *prefix);
@@ -586,6 +586,7 @@ bool R_SetValueEventOnSet(Resource *r, const char *suffix, const V &val, Resourc
     return result;
 }
 
+uint8_t DDF_GetSubDeviceOrder(const QString &type);
 QLatin1String R_DataTypeToString(ApiDataType type);
 Resource::Handle R_CreateResourceHandle(const Resource *r, size_t containerIndex);
 inline bool isValid(Resource::Handle hnd) { return hnd.hash != 0 && hnd.index < UINT16_MAX && hnd.type != 0; }