Renamed electrical sensor files as they were the same as the cluster files

lpbeliveau-silabs · lpbeliveau-silabs · commit 5a3a9f6f7c4f · 2026-02-24T15:03:51.000-05:00
diff --git a/examples/energy-management/electrical-sensor/BUILD.gn b/examples/energy-management/electrical-sensor/BUILD.gn
@@ -21,8 +21,8 @@ config("config") {
 
 static_library("electrical-sensor") {
   sources = [
-    "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp",
-    "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp",
+    "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp",
+    "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp",
   ]
 
   public_configs = [ ":config" ]
diff --git a/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h b/examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h
@@ -17,7 +17,7 @@
  */
 #pragma once
 
-#include <app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.h>
+#include <app/clusters/electrical-power-measurement-server/CodegenIntegration.h>
 #include <app/util/af-types.h>
 #include <lib/core/CHIPError.h>
 
diff --git a/examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h b/examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h
diff --git a/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp b/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp
@@ -16,8 +16,9 @@
  *    limitations under the License.
  */
 
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <app/reporting/reporting.h>
+#include <clusters/ElectricalPowerMeasurement/Attributes.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp b/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 namespace chip {
 namespace app {
diff --git a/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h b/examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
@@ -20,9 +20,9 @@
 
 #include <DEMManufacturerDelegate.h>
 #include <DeviceEnergyManagementManager.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyEvseManager.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 using chip::Protocols::InteractionModel::Status;
 namespace chip {
diff --git a/examples/evse-app/evse-common/src/EnergyEvseMain.cpp b/examples/evse-app/evse-common/src/EnergyEvseMain.cpp
@@ -21,10 +21,10 @@
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <DeviceEnergyManagementManager.h>
 #include <EVSEManufacturerImpl.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyEvseManager.h>
 #include <EnergyManagementAppCmdLineOptions.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 #include <app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.h>
 #include <device-energy-management-modes.h>
 #include <energy-evse-modes.h>
diff --git a/examples/evse-app/silabs/src/AppTask.cpp b/examples/evse-app/silabs/src/AppTask.cpp
@@ -217,7 +217,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 
 void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
 {
-    bool initiated = false;
     int32_t actor;
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -231,13 +230,7 @@ void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
         err = APP_ERROR_UNHANDLED_EVENT;
     }
 
-    if (err == CHIP_NO_ERROR)
-    {
-        if (!initiated)
-        {
-            SILABS_LOG("Action is already in progress or active.");
-        }
-    }
+    // TODO: Implement evse action here (ex: Simulate car just plugged in or call event trigger)
 }
 
 void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
diff --git a/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp b/examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
@@ -23,9 +23,9 @@
 
 #include <DeviceEnergyManagementDelegateImpl.h>
 #include <DeviceEnergyManagementManager.h>
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <EnergyManagementAppCmdLineOptions.h>
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 #include <WaterHeaterInstance.h>
 #include <WaterHeaterMain.h>
 #include <WaterHeaterManufacturer.h>
diff --git a/src/app/clusters/power-topology-server/CodegenIntegration.h b/src/app/clusters/power-topology-server/CodegenIntegration.h
@@ -17,8 +17,6 @@
  */
 #pragma once
 
-#include <lib/core/Optional.h>
-
 #include <app/clusters/power-topology-server/PowerTopologyCluster.h>
 #include <app/clusters/power-topology-server/PowerTopologyDelegate.h>
 
diff --git a/src/app/clusters/power-topology-server/power-topology-server.h b/src/app/clusters/power-topology-server/power-topology-server.h
@@ -15,4 +15,4 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include "CodegenIntegration.h"
+#include <app/clusters/power-topology-server/CodegenIntegration.h>

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ config("config") {`
`21`	`21`
`22`	`22`	`static_library("electrical-sensor") {`
`23`	`23`	`sources = [`
`24`		`- "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp",`
`25`		`- "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp",`
	`24`	`+ "${chip_root}/examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp",`
	`25`	`+ "${chip_root}/examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp",`
`26`	`26`	`]`
`27`	`27`
`28`	`28`	`public_configs = [ ":config" ]`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ void AppTask::AppTaskMain(void * pvParameter)`
`217`	`217`
`218`	`218`	`void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)`
`219`	`219`	`{`
`220`		`- bool initiated = false;`
`221`	`220`	`int32_t actor;`
`222`	`221`	`CHIP_ERROR err = CHIP_NO_ERROR;`
`223`	`222`
`@@ -231,13 +230,7 @@ void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)`
`231`	`230`	`err = APP_ERROR_UNHANDLED_EVENT;`
`232`	`231`	`}`
`233`	`232`
`234`		`- if (err == CHIP_NO_ERROR)`
`235`		`- {`
`236`		`- if (!initiated)`
`237`		`- {`
`238`		`- SILABS_LOG("Action is already in progress or active.");`
`239`		`- }`
`240`		`- }`
	`233`	`+ // TODO: Implement evse action here (ex: Simulate car just plugged in or call event trigger)`
`241`	`234`	`}`
`242`	`235`
`243`	`236`	`void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)`