From 354e874c28236aad40e3acc1b9aa3193d2ebd994 Mon Sep 17 00:00:00 2001
From: Christian Lehne <51822163+clehne@users.noreply.github.com>
Date: Thu, 25 Feb 2021 17:36:34 +0100
Subject: [PATCH] Evcs cluster SelfConsumption Patch

- Added missing event handler to EvcsClusterSelfConsumption
- Removed ess from configuration

- Simulator: BatteryDummy - added missing StartStoppable channels
---
 .../io/openems/edge/evcs/cluster/ConfigSelfConsumption.java    | 3 ---
 .../io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java   | 2 +-
 .../openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java  | 3 ++-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigSelfConsumption.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigSelfConsumption.java
index f886150cf11..568153c2c58 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigSelfConsumption.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/ConfigSelfConsumption.java
@@ -28,9 +28,6 @@
 	@AttributeDefinition(name = "Evcs target filter", description = "This is auto-generated by 'Evcs-IDs'.")
 	String Evcs_target() default "";
 
-	@AttributeDefinition(name = "Ess-ID", description = "ID of Ess device.")
-	String ess_id() default "ess0";
-
 	String webconsole_configurationFactory_nameHint() default "EVCS Cluster Self Consumption [{id}]";
 
 }
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
index 13aff2efcce..d3d4678aaaf 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterPeakShaving.java
@@ -105,7 +105,7 @@ void activate(ComponentContext context, ConfigPeakShaving config) throws Openems
 
 		this.config = config;
 
-		// update filter for 'evcss' component
+		// update filter for 'evcs' component
 		if (OpenemsComponent.updateReferenceFilter(this.cm, this.servicePid(), "Evcs", config.evcs_ids())) {
 			return;
 		}
diff --git a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
index d293c997386..bdf92e8e478 100644
--- a/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
+++ b/io.openems.edge.evcs.cluster/src/io/openems/edge/evcs/cluster/EvcsClusterSelfConsumption.java
@@ -23,6 +23,7 @@
 import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
 import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +38,7 @@
 				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_AFTER_CONTROLLERS, //
 				EventConstants.EVENT_TOPIC + "=" + EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE //
 		})
-public class EvcsClusterSelfConsumption extends AbstractEvcsCluster implements OpenemsComponent, Evcs {
+public class EvcsClusterSelfConsumption extends AbstractEvcsCluster implements OpenemsComponent, Evcs, EventHandler  {
 
 	private final Logger log = LoggerFactory.getLogger(EvcsClusterSelfConsumption.class);