From b12878fea8ecfa05b4e7bd3f094c24ee178f386d Mon Sep 17 00:00:00 2001 From: Boernsman Date: Sat, 16 Jan 2021 20:24:21 +0100 Subject: [PATCH 1/4] changed extendedevcharger from milliAmpere (uint) to Ampere (double) --- libnymea/interfaces/extendedevcharger.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnymea/interfaces/extendedevcharger.json b/libnymea/interfaces/extendedevcharger.json index 1a13b2dc..b9d422b2 100644 --- a/libnymea/interfaces/extendedevcharger.json +++ b/libnymea/interfaces/extendedevcharger.json @@ -4,9 +4,9 @@ "states": [ { "name": "maxChargingCurrent", - "type": "uint", + "type": "double", "writable": true, - "unit": "MilliAmpere" + "unit": "Ampere" } ] } From cff600b8777bbbc9cf7d7e56f665e60daa6f09a9 Mon Sep 17 00:00:00 2001 From: Boernsman Date: Mon, 15 Feb 2021 16:35:07 +0100 Subject: [PATCH 2/4] removed extendedevcharger and added percentage to evcharger interface --- libnymea/interfaces/evcharger.json | 12 ++++++++++-- libnymea/interfaces/extendedevcharger.json | 12 ------------ 2 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 libnymea/interfaces/extendedevcharger.json diff --git a/libnymea/interfaces/evcharger.json b/libnymea/interfaces/evcharger.json index 77179e60..87b182ca 100644 --- a/libnymea/interfaces/evcharger.json +++ b/libnymea/interfaces/evcharger.json @@ -1,4 +1,12 @@ { - "description": "An EV-charger. Extends the power interface for charging/not charging an electric vehicle.", - "extends": "power" + "description": "An EV-charger. Extends the power interface for charging/not charging an electric vehicle. Supports regulation of percentage in addition to be powered on or off.", + "extends": "power", + "states": [ + { + "name": "maxChargingCurrent", + "type": "double", + "writable": true, + "unit": "Ampere" + } + ] } diff --git a/libnymea/interfaces/extendedevcharger.json b/libnymea/interfaces/extendedevcharger.json deleted file mode 100644 index b9d422b2..00000000 --- a/libnymea/interfaces/extendedevcharger.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "description": "An extended version of the EV-charger interface. Supports regulation of percentage in addition ot be powered on or off.", - "extends": "evcharger", - "states": [ - { - "name": "maxChargingCurrent", - "type": "double", - "writable": true, - "unit": "Ampere" - } - ] -} From 0ada24de34f4a588dcb1027e10f872fbea258a9d Mon Sep 17 00:00:00 2001 From: Boernsman Date: Mon, 15 Feb 2021 16:37:17 +0100 Subject: [PATCH 3/4] changed evcharger description --- libnymea/interfaces/evcharger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnymea/interfaces/evcharger.json b/libnymea/interfaces/evcharger.json index 87b182ca..2ada69b1 100644 --- a/libnymea/interfaces/evcharger.json +++ b/libnymea/interfaces/evcharger.json @@ -1,5 +1,5 @@ { - "description": "An EV-charger. Extends the power interface for charging/not charging an electric vehicle. Supports regulation of percentage in addition to be powered on or off.", + "description": "An EV-charger. Extends the power interface for charging/not charging an electric vehicle. Supports regulation of the max. charging current in addition to be powered on or off.", "extends": "power", "states": [ { From fadb5c8896f57ae5cb0838c9aeb1d3602213d9de Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 17 Feb 2021 11:55:54 +0100 Subject: [PATCH 4/4] Fix interfaces.qrc --- libnymea/interfaces/interfaces.qrc | 1 - 1 file changed, 1 deletion(-) diff --git a/libnymea/interfaces/interfaces.qrc b/libnymea/interfaces/interfaces.qrc index c0fe0fb8..2826aa85 100644 --- a/libnymea/interfaces/interfaces.qrc +++ b/libnymea/interfaces/interfaces.qrc @@ -67,7 +67,6 @@ heating.json extendedheating.json evcharger.json - extendedevcharger.json noisesensor.json windspeedsensor.json co2sensor.json