From 9a9e5dbacfffc94e63c8da78123b7ca7e2f427a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Mon, 17 Feb 2020 15:27:44 +0100
Subject: [PATCH 1/2] Add newton, newton meter and rpm units

---
 libnymea/typeutils.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libnymea/typeutils.h b/libnymea/typeutils.h
index cb82b293..5d6dff0d 100644
--- a/libnymea/typeutils.h
+++ b/libnymea/typeutils.h
@@ -138,7 +138,10 @@ public:
         UnitVoltAmpereReactive,
         UnitAmpereHour,
         UnitMicroSiemensPerCentimeter,
-        UnitDuration
+        UnitDuration,
+        UnitNewton,
+        UnitNewtonMeter,
+        UnitRpm
     };
     Q_ENUM(Unit)
 

From 9e8301f6effef35a51b26f63e8be28b3e3633197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Mon, 17 Feb 2020 15:47:51 +0100
Subject: [PATCH 2/2] Bump JSON RPC version and plugin api version

---
 nymea.pro           | 4 ++--
 tests/auto/api.json | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nymea.pro b/nymea.pro
index 81a8c41a..99d2d228 100644
--- a/nymea.pro
+++ b/nymea.pro
@@ -5,10 +5,10 @@ NYMEA_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"
 
 # define protocol versions
 JSON_PROTOCOL_VERSION_MAJOR=4
-JSON_PROTOCOL_VERSION_MINOR=1
+JSON_PROTOCOL_VERSION_MINOR=2
 JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}"
 LIBNYMEA_API_VERSION_MAJOR=4
-LIBNYMEA_API_VERSION_MINOR=0
+LIBNYMEA_API_VERSION_MINOR=1
 LIBNYMEA_API_VERSION_PATCH=0
 LIBNYMEA_API_VERSION="$${LIBNYMEA_API_VERSION_MAJOR}.$${LIBNYMEA_API_VERSION_MINOR}.$${LIBNYMEA_API_VERSION_PATCH}"
 
diff --git a/tests/auto/api.json b/tests/auto/api.json
index 2fa78ed2..3a27e9b5 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1,4 +1,4 @@
-4.1
+4.2
 {
     "enums": {
         "BasicType": [
@@ -288,7 +288,10 @@
             "UnitVoltAmpereReactive",
             "UnitAmpereHour",
             "UnitMicroSiemensPerCentimeter",
-            "UnitDuration"
+            "UnitDuration",
+            "UnitNewton",
+            "UnitNewtonMeter",
+            "UnitRpm"
         ],
         "UserError": [
             "UserErrorNoError",