Get DEM and EEM tests passing when running combined app in WHM mode

Author: PeterC1965

examples/energy-management-app/energy-management-common/device-energy-management/src/DEMTestEventTriggers.cpp

@@ -18,6 +18,7 @@
 
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <EVSEManufacturerImpl.h>
+#include <DEMDelegate.h>
 #include <app/clusters/device-energy-management-server/DeviceEnergyManagementTestEventTriggerHandler.h>
 
 #include <EnergyTimeUtils.h>
@@ -41,16 +42,6 @@ static chip::app::Clusters::DeviceEnergyManagement::Structs::PowerAdjustCapabili
 static chip::app::DataModel::Nullable<chip::app::Clusters::DeviceEnergyManagement::Structs::PowerAdjustCapabilityStruct::Type>
     sPowerAdjustmentCapability;
 
-DeviceEnergyManagementDelegate * GetDEMDelegate()
-{
-    EVSEManufacturer * mn = GetEvseManufacturer();
-    VerifyOrDieWithMsg(mn != nullptr, AppServer, "EVSEManufacturer is null");
-    DeviceEnergyManagementDelegate * dg = mn->GetDEMDelegate();
-    VerifyOrDieWithMsg(dg != nullptr, AppServer, "DEM Delegate is null");
-
-    return dg;
-}
-
 CHIP_ERROR ConfigureForecast(uint16_t numSlots)
 {
     uint32_t chipEpoch = 0;
@@ -134,10 +125,9 @@ CHIP_ERROR ConfigureForecast(uint16_t numSlots)
 
     sForecastStruct.slots = DataModel::List<const DeviceEnergyManagement::Structs::SlotStruct::Type>(sSlots, numSlots);
 
-    EVSEManufacturer * mn = GetEvseManufacturer();
-    mn->GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
-    mn->GetDEMDelegate()->SetAbsMinPower(1000);
-    mn->GetDEMDelegate()->SetAbsMaxPower(256 * 2000 * 1000);
+    GetDEMDelegate()->SetForecast(DataModel::MakeNullable(sForecastStruct));
+    GetDEMDelegate()->SetAbsMinPower(1000);
+    GetDEMDelegate()->SetAbsMaxPower(256 * 2000 * 1000);
 
     return CHIP_NO_ERROR;
 }

examples/energy-management-app/energy-management-common/energy-evse/src/EnergyEvseMain.cpp

@@ -67,6 +67,13 @@ EVSEManufacturer * EnergyEvse::GetEvseManufacturer()
     return gEvseManufacturer.get();
 }
 
+DeviceEnergyManagement::DeviceEnergyManagementDelegate *GetDEMDelegate()
+{
+    VerifyOrDieWithMsg(gDEMDelegate.get() != nullptr, AppServer, "DEM Delegate is null");
+
+    return gDEMDelegate.get();
+}
+
 /*
  *  @brief  Creates a Delegate and Instance for DEM
  *

examples/energy-management-app/energy-management-common/water-heater/include/WhmManufacturer.h

@@ -20,6 +20,7 @@
 
 #include <WhmDelegate.h>
 #include <WhmInstance.h>
+#include <DEMManufacturerDelegate.h>
 
 namespace chip {
 namespace app {
@@ -32,7 +33,7 @@ namespace WaterHeaterManagement {
  * Helps with handling the test triggers.
  */
 
-class WhmManufacturer
+class WhmManufacturer: public DeviceEnergyManagement::DEMManufacturerDelegate
 {
 public:
     WhmManufacturer(WaterHeaterManagementInstance * whmInstance) { mWhmInstance = whmInstance; }
@@ -139,6 +140,13 @@ class WhmManufacturer
      */
     void BoostCommandFinished();
 
+    /* Implement the DEMManufacturerDelegate interface */
+
+    /**
+     * @brief The PowerAdjustEnd event needs to report the approximate energy used by the ESA during the session.
+     */
+    int64_t GetApproxEnergyDuringSession() override;
+
 private:
     WaterHeaterManagementInstance * mWhmInstance;
 };

examples/energy-management-app/energy-management-common/water-heater/src/WaterHeaterMain.cpp

@@ -19,10 +19,12 @@
 #include "EnergyManagementAppCmdLineOptions.h"
 
 #include <DeviceEnergyManagementManager.h>
+#include <DeviceEnergyManagementDelegateImpl.h>
 #include <ElectricalPowerMeasurementDelegate.h>
 #include <PowerTopologyDelegate.h>
 #include <device-energy-management-modes.h>
 #include <water-heater-mode.h>
+#include <WhmManufacturer.h>
 
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
@@ -36,6 +38,7 @@
 
 #include <EnergyEvseMain.h>
 #include <WhmMain.h>
+#include <DEMDelegate.h>
 
 namespace chip {
 namespace app {
@@ -66,6 +69,11 @@ void FullWhmApplicationInit()
         WhmApplicationShutdown();
         return;
     }
+
+    /* For Device Energy Management we need the ESA to be Online and ready to accept commands */
+
+    GetDEMDelegate()->SetESAState(ESAStateEnum::kOnline);
+    GetDEMDelegate()->SetDEMManufacturerDelegate(*GetWhmManufacturer());
 }
 
 void FullWhmApplicationShutdown()

examples/energy-management-app/energy-management-common/water-heater/src/WhmManufacturer.cpp

@@ -160,6 +160,12 @@ WaterHeaterManagementDelegate * GetWhmDelegate()
     return wg;
 }
 
+// The PowerAdjustEnd event needs to report the approximate energy used by the ESA during the session.
+int64_t WhmManufacturer::GetApproxEnergyDuringSession()
+{
+    return 300;
+}
+
 void SetTestEventTrigger_BasicInstallationTestEvent()
 {
     WaterHeaterManagementDelegate * dg = GetWhmDelegate();