From 7f2261d7699defec5369dfa877d396ce832f2dec Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 25 Jun 2021 13:46:09 +0200 Subject: [PATCH] Add thingClassId to thingDescriptors json --- libnymea/integrations/thingdescriptor.h | 1 + nymea.pro | 2 +- tests/auto/api.json | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libnymea/integrations/thingdescriptor.h b/libnymea/integrations/thingdescriptor.h index 756871be..f24b4c78 100644 --- a/libnymea/integrations/thingdescriptor.h +++ b/libnymea/integrations/thingdescriptor.h @@ -41,6 +41,7 @@ class LIBNYMEA_EXPORT ThingDescriptor { Q_GADGET Q_PROPERTY(QUuid id READ id) + Q_PROPERTY(QUuid thingClassId READ thingClassId) Q_PROPERTY(QUuid thingId READ thingId USER true) Q_PROPERTY(QString title READ title) Q_PROPERTY(QString description READ description) diff --git a/nymea.pro b/nymea.pro index f51820af..d5d719b7 100644 --- a/nymea.pro +++ b/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=5 +JSON_PROTOCOL_VERSION_MINOR=6 JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}" LIBNYMEA_API_VERSION_MAJOR=7 LIBNYMEA_API_VERSION_MINOR=0 diff --git a/tests/auto/api.json b/tests/auto/api.json index b1c0dfc2..8d72ef74 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -5.5 +5.6 { "enums": { "BasicType": [ @@ -2626,6 +2626,7 @@ "r:o:deviceId": "Uuid", "r:o:thingId": "Uuid", "r:params": "$ref:ParamList", + "r:thingClassId": "Uuid", "r:title": "String" }, "DeviceDescriptors": [ @@ -2942,6 +2943,7 @@ "r:id": "Uuid", "r:o:thingId": "Uuid", "r:params": "$ref:ParamList", + "r:thingClassId": "Uuid", "r:title": "String" }, "ThingDescriptors": [