From 30f69e619b009e42c379711d19ade4460209e5aa Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 11 Dec 2020 17:27:35 +0100 Subject: [PATCH] Add a UnitMilliSeconds --- libnymea/typeutils.h | 1 + nymea.pro | 2 +- tests/auto/api.json | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnymea/typeutils.h b/libnymea/typeutils.h index b76a5c6b..39f914b7 100644 --- a/libnymea/typeutils.h +++ b/libnymea/typeutils.h @@ -86,6 +86,7 @@ public: enum Unit { UnitNone, + UnitMilliSeconds, UnitSeconds, UnitMinutes, UnitHours, diff --git a/nymea.pro b/nymea.pro index 4a8c3cda..9f9e0cd3 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=2 +JSON_PROTOCOL_VERSION_MINOR=3 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 1a25139c..eafaf09f 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -5.2 +5.3 { "enums": { "BasicType": [ @@ -287,6 +287,7 @@ ], "Unit": [ "UnitNone", + "UnitMilliSeconds", "UnitSeconds", "UnitMinutes", "UnitHours",