Merge PR #463: Add energystorage interface

libnymea/interfaces/battery.json

@@ -20,13 +20,9 @@
             "optional": true
         },
         {
-            "name": "charging",
-            "type": "bool",
-            "optional": true
-        },
-        {
-            "name": "discharging",
-            "type": "bool",
+            "name": "chargingState",
+            "type": "QString",
+            "allowdValues": ["idle", "charging", "discharging"],
             "optional": true
         }
     ]

libnymea/interfaces/energystorage.json

@@ -0,0 +1,17 @@
+{
+    "description": "Interfaces for devices that store electrical energy and can return it at a later point, such as batteries. The currentPower state follows the usual convention that positive is 'consumed' energy and negative values represent 'produced' or in this case 'returned' energy.",
+    "extends": ["battery", "smartmeter"],
+    "states": [
+        {
+            "name": "currentPower",
+            "type": "double",
+            "unit": "Watt",
+            "logged": true
+        },
+        {
+            "name": "capacity",
+            "type": "double",
+            "unit": "KiloWattHour"
+        }
+    ]
+}

libnymea/interfaces/evcharger.json

@@ -1,6 +1,6 @@
 {
     "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",
+    "extends": ["smartmeterconsumer", "power"],
     "states": [
         {
             "name": "maxChargingCurrent",

libnymea/interfaces/interfaces.qrc

@@ -88,5 +88,6 @@
         <file>cleaningrobot.json</file>
         <file>airquality.json</file>
         <file>indoorairquality.json</file>
+        <file>energystorage.json</file>
     </qresource>
 </RCC>

libnymea/interfaces/smartmeterconsumer.json

@@ -5,13 +5,13 @@
         {
             "name": "totalEnergyConsumed",
             "type": "double",
-            "unit": "KiloWattHour"
+            "unit": "KiloWattHour",
+            "logged": true
         },
         {
             "name": "currentPower",
             "type": "double",
             "unit": "Watt",
-            "optional": true,
             "logged": true
         }
     ]

libnymea/interfaces/smartmeterproducer.json

@@ -5,13 +5,13 @@
         {
             "name": "totalEnergyProduced",
             "type": "double",
-            "unit": "KiloWattHour"
+            "unit": "KiloWattHour",
+            "logged": true
         },
         {
             "name": "currentPower",
             "type": "double",
             "unit": "Watt",
-            "optional": true,
             "logged": true
         }
     ]