From 7bd7e41ff220ec660d1f1d1cc784a5859a26c38b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 2 Nov 2021 11:39:04 +0100 Subject: [PATCH] Add unit Ohm --- 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 a3da3cda..e8719799 100644 --- a/libnymea/typeutils.h +++ b/libnymea/typeutils.h @@ -136,6 +136,7 @@ public: UnitVoltAmpere, UnitVoltAmpereReactive, UnitAmpereHour, + UnitOhm, UnitMicroSiemensPerCentimeter, UnitDuration, UnitNewton, diff --git a/nymea.pro b/nymea.pro index 0794868b..d7a63840 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=7 +JSON_PROTOCOL_VERSION_MINOR=8 JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}" LIBNYMEA_API_VERSION_MAJOR=7 LIBNYMEA_API_VERSION_MINOR=2 diff --git a/tests/auto/api.json b/tests/auto/api.json index 9d6b39ad..5a7ed961 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -5.7 +5.8 { "enums": { "BasicType": [ @@ -372,6 +372,7 @@ "UnitVoltAmpere", "UnitVoltAmpereReactive", "UnitAmpereHour", + "UnitOhm", "UnitMicroSiemensPerCentimeter", "UnitDuration", "UnitNewton",