[evcc] Add channels for grid currents, grid energy and charging currents.

bundles/org.openhab.binding.evcc/README.md

@@ -55,20 +55,25 @@ These channels are dynamically added to the Thing during their initialization; t
 ### `demo.things` Example
 
 ```java
-Bridge evcc:server:demo-server "Demo" [scheme="https", url="demo.evcc.io", port=80, refreshInterval=30] {
+Bridge evcc:server:demo-server "Demo" [scheme="https", host="demo.evcc.io", port=443, refreshInterval=30] {
     // This thing will only exist once per evcc instance
-    Thing site demo-site "Site - evcc Demo"
+    Thing site
+    demo-site "Site - evcc Demo"
     // You can define as many Battery things as you have batteries configured in your evcc instance
-    Thing battery demo-battery1 "Battery - evcc Demo Battery 1"
+    Thing battery
+    demo-battery1 "Battery - evcc Demo Battery 1"[index=0]
     ..
     // You can define as many PV things as you have photovoltaics configured in your evcc instance
-    Thing pv demo-pv1 "PV - evcc Demo Photovoltaic 1"
+    Thing pv
+    demo-pv1 "PV - evcc Demo Photovoltaic 1"[index=0]
     ..
     // You can define as many Loadpoint things as you have loadpoints configured in your evcc instance
-    Thing loadpoint demo-loadpoint-carport "Loadpoint - evcc Demo Loadpoint 1"
+    Thing loadpoint
+    demo-loadpoint-carport "Loadpoint - evcc Demo Loadpoint 1"[index=0]
     ..
     // You can define as many Vehicle things as you have vehicles configured in your evcc instance
-    Thing vehicle demo-vehicle1 "Vehicle - evcc Demo Vehicle 1"
+    Thing vehicle
+    demo-vehicle1 "Vehicle - evcc Demo Vehicle 1"[id="vehicle_1"]
     ..
 }
 ```

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccBindingConstants.java

@@ -59,12 +59,31 @@ public class EvccBindingConstants {
     public static final String PROPERTY_TYPE_STATISTICS = "statistics";
     public static final String PROPERTY_TYPE_VEHICLE = "vehicle";
 
-    public static final String JSON_MEMBER_BATTERY = "battery";
-    public static final String JSON_MEMBER_LOADPOINTS = "loadpoints";
-    public static final String JSON_MEMBER_PV = "pv";
-    public static final String JSON_MEMBER_STATISTICS = "statistics";
-    public static final String JSON_MEMBER_VEHICLES = "vehicles";
-    public static final String JSON_MEMBER_CHARGER_FEATURE_HEATING = "chargerFeatureHeating";
+    public static final String JSON_KEY_BATTERY = "battery";
+    public static final String JSON_KEY_CHARGE_CURRENT = "chargeCurrent";
+    public static final String JSON_KEY_CHARGE_CURRENTS = "chargeCurrents";
+    public static final String JSON_KEY_CHARGE_VOLTAGES = "chargeVoltages";
+    public static final String JSON_KEY_CHARGER_FEATURE_HEATING = "chargerFeatureHeating";
+    public static final String JSON_KEY_CHARGING = "charging";
+    public static final String JSON_KEY_CONNECTED = "connected";
+    public static final String JSON_KEY_EFFECTIVE_LIMIT_SOC = "effectiveLimitSoc";
+    public static final String JSON_KEY_EFFECTIVE_PLAN_SOC = "effectivePlanSoc";
+    public static final String JSON_KEY_ENABLED = "enabled";
+    public static final String JSON_KEY_GRID = "grid";
+    public static final String JSON_KEY_GRID_CONFIGURED = "gridConfigured";
+    public static final String JSON_KEY_LIMIT_SOC = "limitSoc";
+    public static final String JSON_KEY_LOADPOINTS = "loadpoints";
+    public static final String JSON_KEY_OFFERED_CURRENT = "offeredCurrent";
+    public static final String JSON_KEY_PHASES = "phases";
+    public static final String JSON_KEY_PHASES_CONFIGURED = "phasesConfigured";
+    public static final String JSON_KEY_PV = "pv";
+    public static final String JSON_KEY_SMART_COST_TYPE = "smartCostType";
+    public static final String JSON_KEY_STATISTICS = "statistics";
+    public static final String JSON_KEY_TITLE = "title";
+    public static final String JSON_KEY_VEHICLE_LIMIT_SOC = "vehicleLimitSoc";
+    public static final String JSON_KEY_VEHICLE_PRESENT = "vehiclePresent";
+    public static final String JSON_KEY_VEHICLE_SOC = "vehicleSoc";
+    public static final String JSON_KEY_VEHICLES = "vehicles";
 
     public static final String NUMBER_CURRENCY = CoreItemFactory.NUMBER + ":Currency";
     public static final String NUMBER_DIMENSIONLESS = CoreItemFactory.NUMBER + ":Dimensionless";

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccConfiguration.java → bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/EvccBridgeConfiguration.java

@@ -15,13 +15,13 @@
 import org.eclipse.jdt.annotation.NonNullByDefault;
 
 /**
- * The {@link EvccConfiguration} class contains fields mapping thing configuration parameters.
+ * The {@link EvccBridgeConfiguration} class contains fields mapping thing configuration parameters.
  *
  * @author Florian Hotze - Initial contribution
  * @author Marcel Goerentz - Rework the binding
  */
 @NonNullByDefault
-public class EvccConfiguration {
+public class EvccBridgeConfiguration {
     public String host = "";
     public int pollInterval = 30;
     public int port = 7070;

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/EvccDiscoveryService.java

@@ -67,7 +67,7 @@ public EvccDiscoveryService() {
     @Override
     protected void startScan() {
         logger.debug("Starting evcc Discover");
-        JsonObject state = thingHandler.getCachedEvccState();
+        JsonObject state = thingHandler.getCachedEvccState().deepCopy();
         if (!state.isEmpty()) {
             for (EvccDiscoveryMapper mapper : mappers) {
                 mapper.discover(state, thingHandler).forEach(thing -> {

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/mapper/BatteryDiscoveryMapper.java

@@ -41,21 +41,21 @@ public class BatteryDiscoveryMapper implements EvccDiscoveryMapper {
     @Override
     public Collection<DiscoveryResult> discover(JsonObject state, EvccBridgeHandler bridgeHandler) {
         List<DiscoveryResult> results = new ArrayList<>();
-        JsonArray batteries = state.getAsJsonArray(JSON_MEMBER_BATTERY);
+        JsonArray batteries = state.getAsJsonArray(JSON_KEY_BATTERY);
         if (batteries == null) {
             return results;
         }
         for (int i = 0; i < batteries.size(); i++) {
             JsonObject battery = batteries.get(i).getAsJsonObject();
-            String title = battery.has("title") ? battery.get("title").getAsString().toLowerCase(Locale.ROOT)
-                    : "battery" + i;
+            String title = battery.has(JSON_KEY_TITLE)
+                    ? battery.get(JSON_KEY_TITLE).getAsString().toLowerCase(Locale.ROOT)
+                    : JSON_KEY_BATTERY + i;
 
             ThingUID uid = new ThingUID(EvccBindingConstants.THING_TYPE_BATTERY, bridgeHandler.getThing().getUID(),
                     Utils.sanitizeName(title));
             DiscoveryResult result = DiscoveryResultBuilder.create(uid).withLabel(title)
                     .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_INDEX, i)
-                    .withProperty(PROPERTY_TYPE, PROPERTY_TYPE_BATTERY).withProperty(PROPERTY_TITLE, title)
-                    .withRepresentationProperty(PROPERTY_TITLE).build();
+                    .withProperty(PROPERTY_TITLE, title).withRepresentationProperty(PROPERTY_TITLE).build();
             results.add(result);
         }
         return results;

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/mapper/LoadpointDiscoveryMapper.java

@@ -43,28 +43,26 @@ public class LoadpointDiscoveryMapper implements EvccDiscoveryMapper {
     @Override
     public Collection<DiscoveryResult> discover(JsonObject state, EvccBridgeHandler bridgeHandler) {
         List<DiscoveryResult> results = new ArrayList<>();
-        JsonArray loadpoints = state.getAsJsonArray(JSON_MEMBER_LOADPOINTS);
+        JsonArray loadpoints = state.getAsJsonArray(JSON_KEY_LOADPOINTS);
         if (loadpoints == null) {
             return results;
         }
         for (int i = 0; i < loadpoints.size(); i++) {
             JsonObject lp = loadpoints.get(i).getAsJsonObject();
-            String title = lp.has("title") ? lp.get("title").getAsString().toLowerCase(Locale.ROOT) : "loadpoint" + i;
+            String title = lp.has(JSON_KEY_TITLE) ? lp.get(JSON_KEY_TITLE).getAsString().toLowerCase(Locale.ROOT)
+                    : "loadpoint" + i;
 
             ThingUID uid = new ThingUID("DUMMY:DUMMY:DUMMY");
             Map<String, Object> properties = new HashMap<>();
             properties.put(PROPERTY_INDEX, i);
             properties.put(PROPERTY_TITLE, title);
 
-            if (lp.has(JSON_MEMBER_CHARGER_FEATURE_HEATING)
-                    && lp.get(JSON_MEMBER_CHARGER_FEATURE_HEATING).getAsBoolean()) {
+            if (lp.has(JSON_KEY_CHARGER_FEATURE_HEATING) && lp.get(JSON_KEY_CHARGER_FEATURE_HEATING).getAsBoolean()) {
                 uid = new ThingUID(EvccBindingConstants.THING_TYPE_HEATING, bridgeHandler.getThing().getUID(),
                         Utils.sanitizeName(title));
-                properties.put(PROPERTY_TYPE, PROPERTY_TYPE_HEATING);
             } else {
                 uid = new ThingUID(EvccBindingConstants.THING_TYPE_LOADPOINT, bridgeHandler.getThing().getUID(),
                         Utils.sanitizeName(title));
-                properties.put(PROPERTY_TYPE, PROPERTY_TYPE_LOADPOINT);
             }
 
             DiscoveryResult result = DiscoveryResultBuilder.create(uid).withLabel(title)

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/mapper/PvDiscoveryMapper.java

@@ -41,20 +41,20 @@ public class PvDiscoveryMapper implements EvccDiscoveryMapper {
     @Override
     public Collection<DiscoveryResult> discover(JsonObject state, EvccBridgeHandler bridgeHandler) {
         List<DiscoveryResult> results = new ArrayList<>();
-        JsonArray pvs = state.getAsJsonArray(JSON_MEMBER_PV);
+        JsonArray pvs = state.getAsJsonArray(JSON_KEY_PV);
         if (pvs == null) {
             return results;
         }
         for (int i = 0; i < pvs.size(); i++) {
             JsonObject pv = pvs.get(i).getAsJsonObject();
-            String title = pv.has("title") ? pv.get("title").getAsString().toLowerCase(Locale.ROOT) : "pv" + i;
+            String title = pv.has(JSON_KEY_TITLE) ? pv.get(JSON_KEY_TITLE).getAsString().toLowerCase(Locale.ROOT)
+                    : JSON_KEY_PV + i;
 
             ThingUID uid = new ThingUID(EvccBindingConstants.THING_TYPE_PV, bridgeHandler.getThing().getUID(),
                     Utils.sanitizeName(title));
             DiscoveryResult result = DiscoveryResultBuilder.create(uid).withLabel(title)
                     .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_INDEX, i)
-                    .withProperty(PROPERTY_TYPE, PROPERTY_TYPE_PV).withProperty(PROPERTY_TITLE, title)
-                    .withRepresentationProperty(PROPERTY_TITLE).build();
+                    .withProperty(PROPERTY_TITLE, title).withRepresentationProperty(PROPERTY_TITLE).build();
 
             results.add(result);
         }

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/mapper/SiteDiscoveryMapper.java

@@ -44,8 +44,8 @@ public Collection<DiscoveryResult> discover(JsonObject state, EvccBridgeHandler
         String siteTitle = state.get("siteTitle").getAsString();
         ThingUID uid = new ThingUID(EvccBindingConstants.THING_TYPE_SITE, bridgeHandler.getThing().getUID(), "site");
         DiscoveryResult result = DiscoveryResultBuilder.create(uid).withLabel(siteTitle)
-                .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_TYPE, PROPERTY_TYPE_SITE)
-                .withProperty(PROPERTY_SITE_TITLE, siteTitle).withRepresentationProperty(PROPERTY_SITE_TITLE).build();
+                .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_SITE_TITLE, siteTitle)
+                .withRepresentationProperty(PROPERTY_SITE_TITLE).build();
         results.add(result);
         return results;
     }

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/mapper/StatisticsDiscoveryMapper.java

@@ -38,12 +38,12 @@ public class StatisticsDiscoveryMapper implements EvccDiscoveryMapper {
     @Override
     public Collection<DiscoveryResult> discover(JsonObject state, EvccBridgeHandler bridgeHandler) {
         List<DiscoveryResult> results = new ArrayList<>();
-        JsonObject statistics = state.getAsJsonObject(JSON_MEMBER_STATISTICS);
+        JsonObject statistics = state.getAsJsonObject(JSON_KEY_STATISTICS);
         if (statistics == null) {
             return results;
         }
         ThingUID uid = new ThingUID(EvccBindingConstants.THING_TYPE_STATISTICS, bridgeHandler.getThing().getUID(),
-                "statistics");
+                JSON_KEY_STATISTICS);
         DiscoveryResult result = DiscoveryResultBuilder.create(uid).withLabel("Statistics")
                 .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_TYPE, PROPERTY_TYPE_STATISTICS)
                 .withRepresentationProperty(PROPERTY_TYPE).build();

bundles/org.openhab.binding.evcc/src/main/java/org/openhab/binding/evcc/internal/discovery/mapper/VehicleDiscoveryMapper.java

@@ -12,10 +12,7 @@
  */
 package org.openhab.binding.evcc.internal.discovery.mapper;
 
-import static org.openhab.binding.evcc.internal.EvccBindingConstants.JSON_MEMBER_VEHICLES;
-import static org.openhab.binding.evcc.internal.EvccBindingConstants.PROPERTY_ID;
-import static org.openhab.binding.evcc.internal.EvccBindingConstants.PROPERTY_TYPE;
-import static org.openhab.binding.evcc.internal.EvccBindingConstants.PROPERTY_TYPE_VEHICLE;
+import static org.openhab.binding.evcc.internal.EvccBindingConstants.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,20 +41,20 @@ public class VehicleDiscoveryMapper implements EvccDiscoveryMapper {
     @Override
     public Collection<DiscoveryResult> discover(JsonObject state, EvccBridgeHandler bridgeHandler) {
         List<DiscoveryResult> results = new ArrayList<>();
-        JsonObject vehicles = state.getAsJsonObject(JSON_MEMBER_VEHICLES);
+        JsonObject vehicles = state.getAsJsonObject(JSON_KEY_VEHICLES);
         if (vehicles == null) {
             return results;
         }
         for (Map.Entry<String, JsonElement> entry : vehicles.entrySet()) {
             JsonObject v = entry.getValue().getAsJsonObject();
             String id = entry.getKey();
-            String title = v.has("title") ? v.get("title").getAsString() : id;
+            String title = v.has(JSON_KEY_TITLE) ? v.get(JSON_KEY_TITLE).getAsString() : id;
 
             ThingUID uid = new ThingUID(EvccBindingConstants.THING_TYPE_VEHICLE, bridgeHandler.getThing().getUID(),
                     Utils.sanitizeName(title));
             DiscoveryResult result = DiscoveryResultBuilder.create(uid).withLabel(title)
-                    .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_TYPE, PROPERTY_TYPE_VEHICLE)
-                    .withProperty(PROPERTY_ID, id).withRepresentationProperty(PROPERTY_ID).build();
+                    .withBridge(bridgeHandler.getThing().getUID()).withProperty(PROPERTY_ID, id)
+                    .withRepresentationProperty(PROPERTY_ID).build();
 
             results.add(result);
         }