diff --git a/nymea.pro b/nymea.pro index cecb7ecd..fcf3eea8 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=3 +JSON_PROTOCOL_VERSION_MINOR=4 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 c6cdbf91..1c5f22d6 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -5.3 +5.4 { "enums": { "BasicType": [ @@ -244,6 +244,10 @@ "StateOperatorAnd", "StateOperatorOr" ], + "StateValueFilter": [ + "StateValueFilterNone", + "StateValueFilterAdaptive" + ], "TagError": [ "TagErrorNoError", "TagErrorThingNotFound", @@ -1215,6 +1219,17 @@ "thingError": "$ref:ThingError" } }, + "Integrations.SetEventLogging": { + "description": "Enable/disable logging for the given event type on the given thing.", + "params": { + "enabled": "Bool", + "eventTypeId": "Uuid", + "thingId": "Uuid" + }, + "returns": { + "thingError": "$ref:ThingError" + } + }, "Integrations.SetPluginConfiguration": { "description": "Set a plugin's params.", "params": { @@ -1225,6 +1240,17 @@ "thingError": "$ref:ThingError" } }, + "Integrations.SetStateFilter": { + "description": "Set the filter for the given state on the given thing.", + "params": { + "filter": "$ref:StateValueFilter", + "stateTypeId": "Uuid", + "thingId": "Uuid" + }, + "returns": { + "thingError": "$ref:ThingError" + } + }, "Integrations.SetThingSettings": { "description": "Change the settings of a thing.", "params": { @@ -2521,6 +2547,9 @@ "o:settings": "$ref:ParamList", "r:deviceClassId": "Uuid", "r:id": "Uuid", + "r:o:loggedEventTypeIds": [ + "Uuid" + ], "r:o:parentId": "Uuid", "r:o:setupDisplayMessage": "String", "r:params": "$ref:ParamList", @@ -2774,6 +2803,7 @@ "sslEnabled": "Bool" }, "State": { + "r:filter": "$ref:StateValueFilter", "r:stateTypeId": "Uuid", "r:value": "Variant" }, @@ -2833,6 +2863,9 @@ "o:name": "String", "o:settings": "$ref:ParamList", "r:id": "Uuid", + "r:o:loggedEventTypeIds": [ + "Uuid" + ], "r:o:parentId": "Uuid", "r:o:setupDisplayMessage": "String", "r:params": "$ref:ParamList",