Skip to content

[SL-UP] ES App Delegate Renamed to DelegateImpl #868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lpbeliveau-silabs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[SL-UP] ES App Delegate Renamed to DelegateImpl #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9e57c
Renamed electrical sensor files as they were the same as the cluster …
lpbeliveau-silabs Feb 16, 2026
140fbf0
f
lpbeliveau-silabs Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/energy-management/electrical-sensor/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion ...lude/ElectricalPowerMeasurementDelegate.h → .../ElectricalPowerMeasurementDelegateImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
0 ...al-sensor/include/PowerTopologyDelegate.h → ...ensor/include/PowerTopologyDelegateImpl.h
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...rc/ElectricalPowerMeasurementDelegate.cpp → ...lectricalPowerMeasurementDelegateImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...ical-sensor/src/PowerTopologyDelegate.cpp → ...-sensor/src/PowerTopologyDelegateImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

#include <PowerTopologyDelegate.h>
#include <PowerTopologyDelegateImpl.h>

namespace chip {
namespace app {
Expand Down
4 changes: 2 additions & 2 deletions examples/evse-app/evse-common/include/EVSEManufacturerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 2 additions & 4 deletions examples/evse-app/evse-common/src/EnergyEvseMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,21 @@
#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>

#include <app-common/zap-generated/ids/Attributes.h>
#include <app-common/zap-generated/ids/Clusters.h>
#include <app/ConcreteAttributePath.h>
#include <app/clusters/network-commissioning/network-commissioning.h>
#include <app/data-model/Nullable.h>
#include <app/server/Server.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/logging/CHIPLogging.h>
#include <platform/Linux/NetworkCommissioningDriver.h>

using namespace chip;
using namespace chip::app;
Expand Down
9 changes: 1 addition & 8 deletions examples/evse-app/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions examples/water-heater-app/water-heater-common/src/WaterHeaterMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/app/clusters/mode-base-server/mode-base-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
#include <app/InteractionModelEngine.h>
#include <app/SafeAttributePersistenceProvider.h>
#include <app/clusters/mode-base-server/mode-base-server.h>
#ifdef MATTER_DM_PLUGIN_ON_OFF_SERVER
#include <app/clusters/on-off-server/on-off-server.h>
#endif // MATTER_DM_PLUGIN_ON_OFF_SERVER
#include <app/reporting/reporting.h>
#include <app/util/attribute-storage.h>
#include <platform/DiagnosticDataProvider.h>
Expand Down
2 changes: 0 additions & 2 deletions src/app/clusters/power-topology-server/CodegenIntegration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/power-topology-server/power-topology-server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading