Skip to content

Commit b1f742b

Browse files
restyled-commitsjamesharrow
authored andcommitted
Restyled by clang-format
1 parent 9aac8f0 commit b1f742b

File tree

7 files changed

+19
-29
lines changed

7 files changed

+19
-29
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818

1919
#include <DeviceEnergyManagementManager.h>
20-
#include <device-energy-management-modes.h>
2120
#include <EnergyManagementAppCmdLineOptions.h>
21+
#include <device-energy-management-modes.h>
2222

2323
#include <app-common/zap-generated/ids/Attributes.h>
2424
#include <app-common/zap-generated/ids/Clusters.h>

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
#include "EnergyManagementAppCmdLineOptions.h"
2020

21+
#include <DEMDelegate.h>
2122
#include <DeviceEnergyManagementManager.h>
2223
#include <EVSEManufacturerImpl.h>
2324
#include <ElectricalPowerMeasurementDelegate.h>
2425
#include <EnergyEvseManager.h>
26+
#include <EnergyReportingMain.h>
2527
#include <PowerTopologyDelegate.h>
2628
#include <device-energy-management-modes.h>
2729
#include <energy-evse-modes.h>
28-
#include <EnergyReportingMain.h>
29-
#include <DEMDelegate.h>
3030

3131
#include <app-common/zap-generated/ids/Attributes.h>
3232
#include <app-common/zap-generated/ids/Clusters.h>
@@ -56,14 +56,11 @@ static std::unique_ptr<EnergyEvseManager> gEvseInstance;
5656

5757
static std::unique_ptr<EVSEManufacturer> gEvseManufacturer;
5858

59-
6059
EVSEManufacturer * EnergyEvse::GetEvseManufacturer()
6160
{
6261
return gEvseManufacturer.get();
6362
}
6463

65-
66-
6764
/*
6865
* @brief Creates a Delegate and Instance for EVSE cluster
6966
*

examples/energy-management-app/energy-management-common/energy-reporting/include/EnergyReportingMain.h

-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@
2929
extern std::unique_ptr<chip::app::Clusters::PowerTopology::PowerTopologyDelegate> gPTDelegate;
3030
extern std::unique_ptr<chip::app::Clusters::PowerTopology::PowerTopologyInstance> gPTInstance;
3131

32-
3332
extern std::unique_ptr<chip::app::Clusters::ElectricalPowerMeasurement::ElectricalPowerMeasurementDelegate> gEPMDelegate;
3433
extern std::unique_ptr<chip::app::Clusters::ElectricalPowerMeasurement::ElectricalPowerMeasurementInstance> gEPMInstance;
3534

3635
// Electrical Energy Measurement cluster uses ember to initialise
3736
extern std::unique_ptr<chip::app::Clusters::ElectricalEnergyMeasurement::ElectricalEnergyMeasurementAttrAccess> gEEMAttrAccess;
3837

39-
4038
CHIP_ERROR PowerTopologyInit();
4139
CHIP_ERROR PowerTopologyShutdown();
4240

examples/energy-management-app/energy-management-common/energy-reporting/src/EnergyReportingMain.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include <lib/support/logging/CHIPLogging.h>
3535
#include <platform/Linux/NetworkCommissioningDriver.h>
3636

37-
static constexpr int POWER_TOPOLOGY_ENDPOINT=1;
38-
static constexpr int ENERGY_METER_ENDPOINT=1;
37+
static constexpr int POWER_TOPOLOGY_ENDPOINT = 1;
38+
static constexpr int ENERGY_METER_ENDPOINT = 1;
3939

4040
using namespace chip;
4141
using namespace chip::app;

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#pragma once
2020

21-
#include <DeviceEnergyManagementManager.h>
2221
#include <DEMManufacturerDelegate.h>
22+
#include <DeviceEnergyManagementManager.h>
2323
#include <ElectricalPowerMeasurementDelegate.h>
2424
#include <PowerTopologyDelegate.h>
2525

@@ -42,13 +42,12 @@ class WhmManufacturer : public DeviceEnergyManagement::DEMManufacturerDelegate
4242
public:
4343
WhmManufacturer(WaterHeaterManagementInstance * whmInstance,
4444
ElectricalPowerMeasurement::ElectricalPowerMeasurementInstance * aEPMInstance,
45-
PowerTopology::PowerTopologyInstance * aPTInstance,
46-
DeviceEnergyManagementManager * aDEMInstance)
45+
PowerTopology::PowerTopologyInstance * aPTInstance, DeviceEnergyManagementManager * aDEMInstance)
4746
{
4847
mWhmInstance = whmInstance;
49-
mEPMInstance = aEPMInstance;
50-
mPTInstance = aPTInstance;
51-
mDEMInstance = aDEMInstance;
48+
mEPMInstance = aEPMInstance;
49+
mPTInstance = aPTInstance;
50+
mDEMInstance = aDEMInstance;
5251
}
5352

5453
WaterHeaterManagementInstance * GetWhmInstance() { return mWhmInstance; }
@@ -63,7 +62,7 @@ class WhmManufacturer : public DeviceEnergyManagement::DEMManufacturerDelegate
6362
return nullptr;
6463
}
6564

66-
ElectricalPowerMeasurement::ElectricalPowerMeasurementDelegate * GetEPMDelegate()
65+
ElectricalPowerMeasurement::ElectricalPowerMeasurementDelegate * GetEPMDelegate()
6766
{
6867
if (mEPMInstance)
6968
{
@@ -180,9 +179,8 @@ class WhmManufacturer : public DeviceEnergyManagement::DEMManufacturerDelegate
180179
*/
181180
void BoostCommandFinished();
182181

183-
184-
CHIP_ERROR SendPowerReading(EndpointId aEndpointId, Power_mW aActivePower_mW,
185-
Voltage_mV aVoltage_mV, Amperage_mA aActiveCurrent_mA);
182+
CHIP_ERROR SendPowerReading(EndpointId aEndpointId, Power_mW aActivePower_mW, Voltage_mV aVoltage_mV,
183+
Amperage_mA aActiveCurrent_mA);
186184

187185
/* Implement the DEMManufacturerDelegate interface */
188186

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
* limitations under the License.
1717
*/
1818

19+
#include <DEMDelegate.h>
20+
#include <EnergyReportingMain.h>
1921
#include <WhmInstance.h>
2022
#include <WhmManufacturer.h>
21-
#include <EnergyReportingMain.h>
22-
#include <DEMDelegate.h>
2323
#include <device-energy-management-modes.h>
2424
#include <water-heater-mode.h>
2525

@@ -141,8 +141,8 @@ CHIP_ERROR WhmManufacturerInit()
141141
}
142142

143143
/* Now create WhmManufacturer */
144-
gWhmManufacturer = std::make_unique<WhmManufacturer>(gWhmInstance.get(), gEPMInstance.get(),
145-
gPTInstance.get(), gDEMInstance.get());
144+
gWhmManufacturer =
145+
std::make_unique<WhmManufacturer>(gWhmInstance.get(), gEPMInstance.get(), gPTInstance.get(), gDEMInstance.get());
146146
if (!gWhmManufacturer)
147147
{
148148
ChipLogError(AppServer, "Failed to allocate memory for WhmManufacturer");
@@ -196,7 +196,7 @@ CHIP_ERROR WhmApplicationInit()
196196
}
197197

198198
err = PowerTopologyInit();
199-
if( err != CHIP_NO_ERROR)
199+
if (err != CHIP_NO_ERROR)
200200
{
201201
DeviceEnergyManagementShutdown();
202202
WhmShutdown();

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ WaterHeaterManagementDelegate * GetWhmDelegate()
162162
return wg;
163163
}
164164

165-
166165
/**
167166
* @brief Allows a client application to send in power readings into the system
168167
*
@@ -171,9 +170,7 @@ WaterHeaterManagementDelegate * GetWhmDelegate()
171170
* @param[in] aVoltage_mV - Voltage measured in milli-volts
172171
* @param[in] aActiveCurrent_mA - ActiveCurrent measured in milli-amps
173172
*/
174-
CHIP_ERROR WhmManufacturer::SendPowerReading(EndpointId aEndpointId,
175-
Power_mW aActivePower_mW,
176-
Voltage_mV aVoltage_mV,
173+
CHIP_ERROR WhmManufacturer::SendPowerReading(EndpointId aEndpointId, Power_mW aActivePower_mW, Voltage_mV aVoltage_mV,
177174
Amperage_mA aActiveCurrent_mA)
178175
{
179176
WhmManufacturer * mn = GetWhmManufacturer();

0 commit comments

Comments
 (0)