ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename forgotten deviceParams in ThingDescriptor

Browse Source
This commit is contained in:
Michael Zanetti 2021-03-16 17:57:00 +01:00
parent 96ae3cd01a
commit 394e3cc615
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-core/jsonrpc/devicehandler.h
View File

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

3
libnymea/integrations/thingdescriptor.h
View File

@ -44,7 +44,8 @@ class LIBNYMEA_EXPORT ThingDescriptor
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)
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: public:
ThingDescriptor(); ThingDescriptor();

2
nymea.pro
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=4 JSON_PROTOCOL_VERSION_MINOR=5
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

7
tests/auto/api.json
View File

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