Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
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
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
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
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
4 changes: 2 additions & 2 deletions examples/evse-app/evse-common/src/EnergyEvseMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 1 addition & 8 deletions examples/evse-app/silabs/src/AppTask.cpp
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
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: 0 additions & 2 deletions src/app/clusters/power-topology-server/CodegenIntegration.h
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
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