Skip to content

Commit 21f6aeb

Browse files
jamesharrowjamesharrow
committed
Removed duplicate electrical-energy-measurement-stub.cpp and power-topology-stub.cpp in place of PowerTopologyDelegate which does similar things in example-energy-management-app in all-clusters-app.
1 parent 767a8a2 commit 21f6aeb

File tree

10 files changed

+54
-228
lines changed

10 files changed

+54
-228
lines changed

‎examples/all-clusters-app/linux/BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ source_set("chip-all-clusters-common") {
3535
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/boolcfg-stub.cpp",
3636
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
3737
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/concentration-measurement-instances.cpp",
38-
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/device-energy-management-stub.cpp",
3938
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/dishwasher-alarm-stub.cpp",
4039
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/dishwasher-mode.cpp",
41-
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/electrical-energy-measurement-stub.cpp",
42-
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/electrical-power-measurement-stub.cpp",
4340
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/energy-evse-stub.cpp",
4441
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/energy-preference-delegate.cpp",
4542
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp",
@@ -51,7 +48,6 @@ source_set("chip-all-clusters-common") {
5148
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/operational-state-delegate-impl.cpp",
5249
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/oven-modes.cpp",
5350
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/oven-operational-state-delegate.cpp",
54-
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/power-topology-stub.cpp",
5551
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/resource-monitoring-delegates.cpp",
5652
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp",
5753
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp",
@@ -73,6 +69,7 @@ source_set("chip-all-clusters-common") {
7369
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/energy-evse-mode.cpp",
7470
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/ElectricalPowerMeasurementDelegate.cpp",
7571
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/EnergyReportingMain.cpp",
72+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/PowerTopologyDelegate.cpp",
7673
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WhmDelegateImpl.cpp",
7774
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WhmInstance.cpp",
7875
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WhmMain.cpp",

‎examples/energy-management-app/energy-management-common/common/include/EnergyManagementAppCmdLineOptions.h

-34
This file was deleted.

‎examples/energy-management-app/energy-management-common/device-energy-management/include/DEMDelegate.h

+3
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ extern std::unique_ptr<chip::app::Clusters::DeviceEnergyManagement::DeviceEnergy
2828

2929
CHIP_ERROR DeviceEnergyManagementInit();
3030
CHIP_ERROR DeviceEnergyManagementShutdown();
31+
32+
chip::BitMask<chip::app::Clusters::DeviceEnergyManagement::Feature> GetDEMFeatureMap();
33+
void SetDEMFeatureMap(uint32_t);

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

+39-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818

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

2322
#include <app-common/zap-generated/ids/Attributes.h>
@@ -33,6 +32,44 @@ using namespace chip::app;
3332
using namespace chip::app::Clusters;
3433
using namespace chip::app::Clusters::DeviceEnergyManagement;
3534

35+
namespace chip {
36+
namespace app {
37+
namespace Clusters {
38+
namespace DeviceEnergyManagement {
39+
40+
// Keep track of the parsed featureMap option
41+
#if defined(CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING) && defined(CONFIG_DEM_SUPPORT_STATE_FORECAST_REPORTING)
42+
#error Cannot define CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING and CONFIG_DEM_SUPPORT_STATE_FORECAST_REPORTING
43+
#endif
44+
45+
#if defined(CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING)
46+
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment, Feature::kPowerForecastReporting,
47+
Feature::kStartTimeAdjustment, Feature::kPausable, Feature::kForecastAdjustment,
48+
Feature::kConstraintBasedAdjustment);
49+
#elif defined(CONFIG_DEM_SUPPORT_STATE_FORECAST_REPORTING)
50+
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment, Feature::kStateForecastReporting,
51+
Feature::kStartTimeAdjustment, Feature::kPausable, Feature::kForecastAdjustment,
52+
Feature::kConstraintBasedAdjustment);
53+
#else
54+
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment);
55+
#endif
56+
57+
} // namespace DeviceEnergyManagement
58+
} // namespace Clusters
59+
} // namespace app
60+
} // namespace chip
61+
62+
63+
chip::BitMask<chip::app::Clusters::DeviceEnergyManagement::Feature> GetDEMFeatureMap()
64+
{
65+
return sFeatureMap;
66+
}
67+
68+
void SetDEMFeatureMap(uint32_t featureMap)
69+
{
70+
sFeatureMap = BitMask<chip::app::Clusters::DeviceEnergyManagement::Feature>(featureMap);
71+
}
72+
3673
std::unique_ptr<DeviceEnergyManagementDelegate> gDEMDelegate;
3774
std::unique_ptr<DeviceEnergyManagementManager> gDEMInstance;
3875

@@ -65,7 +102,7 @@ CHIP_ERROR DeviceEnergyManagementInit()
65102
return CHIP_ERROR_NO_MEMORY;
66103
}
67104

68-
BitMask<DeviceEnergyManagement::Feature> featureMap = GetFeatureMapFromCmdLine();
105+
BitMask<DeviceEnergyManagement::Feature> featureMap = GetDEMFeatureMap();
69106

70107
/* Manufacturer may optionally not support all features, commands & attributes */
71108
gDEMInstance = std::make_unique<DeviceEnergyManagementManager>(EndpointId(DEM_ENDPOINT), *gDEMDelegate, featureMap);

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

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

19-
#include "EnergyManagementAppCmdLineOptions.h"
2019

2120
#include <DEMDelegate.h>
2221
#include <DeviceEnergyManagementManager.h>

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

-101
This file was deleted.

‎examples/energy-management-app/esp32/main/main.cpp

-31
Original file line numberDiff line numberDiff line change
@@ -119,37 +119,6 @@ chip::Credentials::DeviceAttestationCredentialsProvider * get_dac_provider(void)
119119

120120
} // namespace
121121

122-
namespace chip {
123-
namespace app {
124-
namespace Clusters {
125-
namespace DeviceEnergyManagement {
126-
127-
// Keep track of the parsed featureMap option
128-
#if defined(CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING) && defined(CONFIG_DEM_SUPPORT_STATE_FORECAST_REPORTING)
129-
#error Cannot define CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING and CONFIG_DEM_SUPPORT_STATE_FORECAST_REPORTING
130-
#endif
131-
132-
#ifdef CONFIG_DEM_SUPPORT_POWER_FORECAST_REPORTING
133-
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment, Feature::kPowerForecastReporting,
134-
Feature::kStartTimeAdjustment, Feature::kPausable, Feature::kForecastAdjustment,
135-
Feature::kConstraintBasedAdjustment);
136-
#elif CONFIG_DEM_SUPPORT_STATE_FORECAST_REPORTING
137-
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment, Feature::kStateForecastReporting,
138-
Feature::kStartTimeAdjustment, Feature::kPausable, Feature::kForecastAdjustment,
139-
Feature::kConstraintBasedAdjustment);
140-
#else
141-
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment);
142-
#endif
143-
144-
chip::BitMask<Feature> GetFeatureMapFromCmdLine()
145-
{
146-
return sFeatureMap;
147-
}
148-
149-
} // namespace DeviceEnergyManagement
150-
} // namespace Clusters
151-
} // namespace app
152-
} // namespace chip
153122

154123
// Check we are not trying to build in both app types simultaneously
155124
#if defined(CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE) && defined(CONFIG_ENABLE_EXAMPLE_WATER_HEATER_DEVICE)

‎examples/energy-management-app/linux/main.cpp

+3-20
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <AppMain.h>
2020
#include <EnergyEvseMain.h>
2121
#include <WhmMain.h>
22+
#include <DEMDelegate.h>
2223

2324
#include <app-common/zap-generated/cluster-objects.h>
2425
#include <lib/support/BitMask.h>
@@ -59,29 +60,11 @@ static chip::ArgParser::OptionSet sCmdLineOptions = { EnergyAppOptionHandler, //
5960
"-a, --application <evse|water-heater>\n"
6061
"-f, --featureSet <value>\n" };
6162

62-
namespace chip {
63-
namespace app {
64-
namespace Clusters {
65-
namespace DeviceEnergyManagement {
6663

67-
// Keep track of the parsed featureMap option
68-
static chip::BitMask<Feature> sFeatureMap(Feature::kPowerAdjustment, Feature::kPowerForecastReporting,
69-
Feature::kStateForecastReporting, Feature::kStartTimeAdjustment, Feature::kPausable,
70-
Feature::kForecastAdjustment, Feature::kConstraintBasedAdjustment);
7164

7265
// Make EVSE the default app
7366
static const char * spApp = kEvseApp;
7467

75-
chip::BitMask<Feature> GetFeatureMapFromCmdLine()
76-
{
77-
return sFeatureMap;
78-
}
79-
80-
} // namespace DeviceEnergyManagement
81-
} // namespace Clusters
82-
} // namespace app
83-
} // namespace chip
84-
8568
static uint32_t ParseNumber(const char * pString)
8669
{
8770
uint32_t num = 0;
@@ -150,8 +133,8 @@ static bool EnergyAppOptionHandler(const char * aProgram, chip::ArgParser::Optio
150133
}
151134
break;
152135
case kOptionFeatureMap:
153-
sFeatureMap = BitMask<chip::app::Clusters::DeviceEnergyManagement::Feature>(ParseNumber(aValue));
154-
ChipLogDetail(Support, "Using FeatureMap 0x%04x", sFeatureMap.Raw());
136+
SetDEMFeatureMap(ParseNumber(aValue));
137+
ChipLogDetail(Support, "Using FeatureMap 0x%04x", GetDEMFeatureMap().Raw());
155138
break;
156139
default:
157140
ChipLogError(Support, "%s: INTERNAL ERROR: Unhandled option: %s\n", aProgram, aName);

‎examples/energy-management-app/silabs/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ silabs_executable("energy-management-app") {
167167

168168
sources = [
169169
"${chip_root}/examples/energy-management-app/energy-management-common/common/src/EnergyTimeUtils.cpp",
170+
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DEMDelegate.cpp",
170171
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DEMTestEventTriggers.cpp",
171172
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DeviceEnergyManagementDelegateImpl.cpp",
172173
"${chip_root}/examples/energy-management-app/energy-management-common/device-energy-management/src/DeviceEnergyManagementManager.cpp",
@@ -181,9 +182,9 @@ silabs_executable("energy-management-app") {
181182
"${chip_root}/examples/energy-management-app/energy-management-common/energy-evse/src/energy-evse-mode.cpp",
182183
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/ElectricalPowerMeasurementDelegate.cpp",
183184
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/EnergyReportingEventTriggers.cpp",
185+
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/EnergyReportingMain.cpp",
184186
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/FakeReadings.cpp",
185187
"${chip_root}/examples/energy-management-app/energy-management-common/energy-reporting/src/PowerTopologyDelegate.cpp",
186-
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WaterHeaterMain.cpp",
187188
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WhmDelegateImpl.cpp",
188189
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WhmInstance.cpp",
189190
"${chip_root}/examples/energy-management-app/energy-management-common/water-heater/src/WhmMain.cpp",

0 commit comments

Comments
 (0)