Add thingClassId to thingDescriptors json

This commit is contained in:
Michael Zanetti 2021-06-25 13:46:09 +02:00
parent 1acd8ca808
commit 7f2261d769
3 changed files with 5 additions and 2 deletions

View File

@ -41,6 +41,7 @@ class LIBNYMEA_EXPORT ThingDescriptor
{ {
Q_GADGET Q_GADGET
Q_PROPERTY(QUuid id READ id) Q_PROPERTY(QUuid id READ id)
Q_PROPERTY(QUuid thingClassId READ thingClassId)
Q_PROPERTY(QUuid thingId READ thingId USER true) Q_PROPERTY(QUuid thingId READ thingId USER true)
Q_PROPERTY(QString title READ title) Q_PROPERTY(QString title READ title)
Q_PROPERTY(QString description READ description) Q_PROPERTY(QString description READ description)

View File

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

View File

@ -1,4 +1,4 @@
5.5 5.6
{ {
"enums": { "enums": {
"BasicType": [ "BasicType": [
@ -2626,6 +2626,7 @@
"r:o:deviceId": "Uuid", "r:o:deviceId": "Uuid",
"r:o:thingId": "Uuid", "r:o:thingId": "Uuid",
"r:params": "$ref:ParamList", "r:params": "$ref:ParamList",
"r:thingClassId": "Uuid",
"r:title": "String" "r:title": "String"
}, },
"DeviceDescriptors": [ "DeviceDescriptors": [
@ -2942,6 +2943,7 @@
"r:id": "Uuid", "r:id": "Uuid",
"r:o:thingId": "Uuid", "r:o:thingId": "Uuid",
"r:params": "$ref:ParamList", "r:params": "$ref:ParamList",
"r:thingClassId": "Uuid",
"r:title": "String" "r:title": "String"
}, },
"ThingDescriptors": [ "ThingDescriptors": [