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

Author: lpbeliveau-silabs

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" ]

…ude/ElectricalPowerMeasurementDelegate.h …ElectricalPowerMeasurementDelegateImpl.hexamples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h renamed to examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegateImpl.h examples/energy-management/electrical-sensor/include/ElectricalPowerMeasurementDelegate.h renamed to 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>
 

…l-sensor/include/PowerTopologyDelegate.h …nsor/include/PowerTopologyDelegateImpl.hexamples/energy-management/electrical-sensor/include/PowerTopologyDelegate.h renamed to examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h examples/energy-management/electrical-sensor/include/PowerTopologyDelegate.h renamed to examples/energy-management/electrical-sensor/include/PowerTopologyDelegateImpl.h

@@ -16,8 +16,9 @@
  *    limitations under the License.
  */
 
-#include <ElectricalPowerMeasurementDelegate.h>
+#include <ElectricalPowerMeasurementDelegateImpl.h>
 #include <app/reporting/reporting.h>
+#include <clusters/ElectricalPowerMeasurement/Attributes.h>
 
 using namespace chip;
 using namespace chip::app;

…c/ElectricalPowerMeasurementDelegate.cpp …ectricalPowerMeasurementDelegateImpl.cppexamples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp renamed to examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegate.cpp renamed to examples/energy-management/electrical-sensor/src/ElectricalPowerMeasurementDelegateImpl.cpp

@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include <PowerTopologyDelegate.h>
+#include <PowerTopologyDelegateImpl.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;

…cal-sensor/src/PowerTopologyDelegate.cpp …sensor/src/PowerTopologyDelegateImpl.cppexamples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp renamed to examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp examples/energy-management/electrical-sensor/src/PowerTopologyDelegate.cpp renamed to examples/energy-management/electrical-sensor/src/PowerTopologyDelegateImpl.cpp

@@ -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 {

examples/evse-app/evse-common/include/EVSEManufacturerImpl.h

@@ -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>

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

@@ -218,7 +218,6 @@ void AppTask::AppTaskMain(void * pvParameter)
 
 void AppTask::EnergyManagementActionEventHandler(AppEvent * aEvent)
 {
-    bool initiated = false;
     int32_t actor;
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -232,13 +231,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)

examples/evse-app/silabs/src/AppTask.cpp

@@ -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>
 

src/app/clusters/power-topology-server/CodegenIntegration.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>