Merge PR #407: Rename forgotten deviceParams in ThingDescriptor

libnymea-core/jsonrpc/devicehandler.h

@@ -125,6 +125,7 @@ class DeviceDescriptor: public ThingDescriptor
 {
     Q_GADGET
     Q_PROPERTY(QUuid deviceId READ thingId USER true)
+    Q_PROPERTY(ParamList deviceParams READ params)
 };
 
 class DeviceDescriptors: public ThingDescriptors

libnymea/integrations/thingdescriptor.h

@@ -44,7 +44,8 @@ class LIBNYMEA_EXPORT ThingDescriptor
     Q_PROPERTY(QUuid thingId READ thingId USER true)
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QString description READ description)
-    Q_PROPERTY(ParamList deviceParams READ params)
+    Q_PROPERTY(ParamList deviceParams READ params REVISION 1) // Had been forgotten in the device->thing transition.
+    Q_PROPERTY(ParamList params READ params)                  // added in 0.27
 
 public:
     ThingDescriptor();

nymea.pro

@@ -5,7 +5,7 @@ NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"
 
 # define protocol versions
 JSON_PROTOCOL_VERSION_MAJOR=5
-JSON_PROTOCOL_VERSION_MINOR=4
+JSON_PROTOCOL_VERSION_MINOR=5
 JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}"
 LIBNYMEA_API_VERSION_MAJOR=7
 LIBNYMEA_API_VERSION_MINOR=0

tests/auto/api.json

@@ -1,4 +1,4 @@
-5.4
+5.5
 {
     "enums": {
         "BasicType": [
@@ -2580,11 +2580,13 @@
             "$ref:DeviceClass"
         ],
         "DeviceDescriptor": {
+            "d:r:deviceParams": "$ref:ParamList",
             "r:description": "String",
             "r:deviceParams": "$ref:ParamList",
             "r:id": "Uuid",
             "r:o:deviceId": "Uuid",
             "r:o:thingId": "Uuid",
+            "r:params": "$ref:ParamList",
             "r:title": "String"
         },
         "DeviceDescriptors": [
@@ -2896,10 +2898,11 @@
             "$ref:ThingClass"
         ],
         "ThingDescriptor": {
+            "d:r:deviceParams": "$ref:ParamList",
             "r:description": "String",
-            "r:deviceParams": "$ref:ParamList",
             "r:id": "Uuid",
             "r:o:thingId": "Uuid",
+            "r:params": "$ref:ParamList",
             "r:title": "String"
         },
         "ThingDescriptors": [