Merge 50fb815 into a7ee9d4

Author: soares-sergio

examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp

@@ -26,6 +26,11 @@ static std::unique_ptr<EnergyEvseDelegate> gDelegate;
 static std::unique_ptr<EvseTargetsDelegate> gEvseTargetsDelegate;
 static std::unique_ptr<EnergyEvseManager> gInstance;
 
+EndpointId GetEnergyDeviceEndpointId()
+{
+    return chip::EndpointId(1);
+}
+
 void emberAfEnergyEvseClusterInitCallback(chip::EndpointId endpointId)
 {
     VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.

examples/all-clusters-app/linux/main-common.cpp

@@ -124,6 +124,7 @@ const Clusters::Descriptor::Structs::SemanticTagStruct::Type gEp3TagList[] = { {
                                                                                  .tag         = kTagSwitchesUp } };
 const Clusters::Descriptor::Structs::SemanticTagStruct::Type gEp4TagList[] = { { .namespaceID = kNamespaceSwitches,
                                                                                  .tag         = kTagSwitchesDown } };
+
 } // namespace
 
 #ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER
@@ -256,7 +257,7 @@ void ApplicationInit()
     Clusters::ValveConfigurationAndControl::SetDefaultDelegate(chip::EndpointId(1), &sValveDelegate);
     Clusters::TimeSynchronization::SetDefaultDelegate(&sTimeSyncDelegate);
 
-    Clusters::WaterHeaterManagement::WhmApplicationInit();
+    Clusters::WaterHeaterManagement::WhmApplicationInit(chip::EndpointId(1));
 
     SetTagList(/* endpoint= */ 0, Span<const Clusters::Descriptor::Structs::SemanticTagStruct::Type>(gEp0TagList));
     SetTagList(/* endpoint= */ 1, Span<const Clusters::Descriptor::Structs::SemanticTagStruct::Type>(gEp1TagList));

examples/energy-management-app/energy-management-common/device-energy-management/include/DEMDelegate.h renamed to examples/energy-management-app/energy-management-common/common/include/EnergyManagementAppCommonMain.h

@@ -19,5 +19,21 @@
 #pragma once
 
 #include <DeviceEnergyManagementDelegateImpl.h>
+#include <DeviceEnergyManagementManager.h>
+#include <ElectricalPowerMeasurementDelegate.h>
+#include <PowerTopologyDelegate.h>
+#include <lib/core/CHIPError.h>
 
+// This app is configured by default with EP1 for EVSE and EP2 for WaterHeater, with only one endpoint
+// enabled. On linux, there's a command line argument (--application) to dynamically enable
+// "evse|water-heater", i.e. EP1 or EP2. On other platforms, it's a build time definition (#define).
+chip::EndpointId GetEnergyDeviceEndpointId();
+
+// The DEM Delegate is used for the TestEventTriggers
 chip::app::Clusters::DeviceEnergyManagement::DeviceEnergyManagementDelegate * GetDEMDelegate();
+
+void EvseApplicationInit();
+void EvseApplicationShutdown();
+
+void WaterHeaterApplicationInit();
+void WaterHeaterApplicationShutdown();