Skip to content

Commit 0ac11b7

Browse files
PeterC1965PeterC1965
committed
Address JamesH review comments
1 parent c683503 commit 0ac11b7

File tree

12 files changed

+24
-25
lines changed

12 files changed

+24
-25
lines changed

‎examples/all-clusters-app/ameba/chip_main.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ list(
187187

188188
${chip_dir}/examples/microwave-oven-app/microwave-oven-common/src/microwave-oven-device.cpp
189189

190+
${chip_dir}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp
190191
${chip_dir}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp
191192
${chip_dir}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp
192193
${chip_dir}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp
193194
${chip_dir}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp
194195
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp
195196
${chip_dir}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp
196-
${chip_dir}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp
197197

198198
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
199199
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ ti_simplelink_executable("all-clusters-app") {
7272
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
7373
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
7474
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
75+
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
7576
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
7677
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
78+
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
7779
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
7880
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
7981
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
80-
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
81-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
8282
"${chip_root}/examples/providers/DeviceInfoProviderImpl.cpp",
8383
"${project_dir}/main/AppTask.cpp",
8484
"${project_dir}/main/ClusterManager.cpp",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ source_set("chip-all-clusters-common") {
5858
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
5959
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/tcc-mode.cpp",
6060
"${chip_root}/examples/all-clusters-app/linux/diagnostic-logs-provider-delegate-impl.cpp",
61+
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
6162
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
6263
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
6364
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
@@ -66,7 +67,6 @@ source_set("chip-all-clusters-common") {
6667
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
6768
"${chip_root}/examples/energy-management-app/energy-management-common/src/device-energy-management-mode.cpp",
6869
"${chip_root}/examples/energy-management-app/energy-management-common/src/energy-evse-mode.cpp",
69-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
7070
"AllClustersCommandDelegate.cpp",
7171
"AppOptions.cpp",
7272
"ValveControlDelegate.cpp",

‎examples/all-clusters-app/mbed/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ target_sources(${APP_TARGET} PRIVATE
7272
${ALL_CLUSTERS_COMMON}/src/smco-stub.cpp
7373
${ALL_CLUSTERS_COMMON}/src/static-supported-modes-manager.cpp
7474
${ALL_CLUSTERS_COMMON}/src/static-supported-temperature-levels.cpp
75-
${ENERGY_MANAGEMENT_COMMON}/src/ElectricalPowerMeasurementDelegate.cpp
76-
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseDelegateImpl.cpp
77-
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseManager.cpp
75+
${ENERGY_MANAGEMENT_COMMON}/src/DEMUtils.cpp
7876
${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementDelegateImpl.cpp
7977
${ENERGY_MANAGEMENT_COMMON}/src/DeviceEnergyManagementManager.cpp
8078
${ENERGY_MANAGEMENT_COMMON}/src/EVSEManufacturerImpl.cpp
81-
${ENERGY_MANAGEMENT_COMMON}/src/utils.cpp
79+
${ENERGY_MANAGEMENT_COMMON}/src/ElectricalPowerMeasurementDelegate.cpp
80+
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseDelegateImpl.cpp
81+
${ENERGY_MANAGEMENT_COMMON}/src/EnergyEvseManager.cpp
8282
)
8383

8484
chip_configure_data_model(${APP_TARGET}

‎examples/all-clusters-app/nrfconnect/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
5050
target_include_directories(app PRIVATE
5151
main/include
5252
${ALL_CLUSTERS_COMMON_DIR}/include
53-
${ENERGY_MANAGEMENT_COMMON_DIR}/include
53+
${ENERGY_MANAGEMENT_COMMON_DIR}/include
5454
${GEN_DIR}/app-common
5555
${GEN_DIR}/all-clusters-app
5656
${NRFCONNECT_COMMON}/util/include)
@@ -65,15 +65,15 @@ target_sources(app PRIVATE
6565
${ALL_CLUSTERS_COMMON_DIR}/src/fan-stub.cpp
6666
${ALL_CLUSTERS_COMMON_DIR}/src/oven-modes.cpp
6767
${ALL_CLUSTERS_COMMON_DIR}/src/energy-evse-stub.cpp
68-
${ALL_CLUSTERS_COMMON_DIR}/src/device-energy-management-stub.cpp
68+
${ALL_CLUSTERS_COMMON_DIR}/src/device-energy-management-stub.cpp
6969
${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
7070
${ALL_CLUSTERS_COMMON_DIR}/src/air-quality-instance.cpp
7171
${ALL_CLUSTERS_COMMON_DIR}/src/concentration-measurement-instances.cpp
7272
${ALL_CLUSTERS_COMMON_DIR}/src/resource-monitoring-delegates.cpp
73+
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DEMUtils.cpp
7374
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementDelegateImpl.cpp
7475
${ENERGY_MANAGEMENT_COMMON_DIR}/src/DeviceEnergyManagementManager.cpp
7576
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EVSEManufacturerImpl.cpp
76-
${ENERGY_MANAGEMENT_COMMON_DIR}/src/utils.cpp
7777
${ENERGY_MANAGEMENT_COMMON_DIR}/src/ElectricalPowerMeasurementDelegate.cpp
7878
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseDelegateImpl.cpp
7979
${ENERGY_MANAGEMENT_COMMON_DIR}/src/EnergyEvseManager.cpp

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ source_set("chip-all-clusters-common") {
3838
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
3939
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
4040
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
41+
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
4142
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
4243
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
4344
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
4445
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
4546
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
4647
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
47-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
4848
]
4949

5050
deps = [

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
*
3-
* Copyright (c) 2023 Project CHIP Authors
3+
* Copyright (c) 2024 Project CHIP Authors
44
* All rights reserved.
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch);
4444
* @return bitmap value for day of week
4545
* Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
4646
*/
47-
uint8_t UtilsGetDayOfWeekUnixEpoch(time_t unixEpoch);
47+
uint8_t UtilsGetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
4848

4949
/**
5050
* @brief Helper function to get current timestamp and work out the day of week based on localtime
@@ -53,4 +53,4 @@ uint8_t UtilsGetDayOfWeekUnixEpoch(time_t unixEpoch);
5353
*
5454
* Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
5555
*/
56-
CHIP_ERROR UtilsGetDayOfWeekNow(uint8_t & dayOfWeekMap);
56+
CHIP_ERROR UtilsGetLocalDayOfWeekNow(uint8_t & dayOfWeekMap);

‎examples/energy-management-app/energy-management-common/src/DEMTestEventTriggers.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ void SetTestEventTrigger_ConstraintBasedAdjustment()
310310

311311
bool HandleDeviceEnergyManagementTestEventTrigger(uint64_t eventTrigger)
312312
{
313-
ChipLogError(Zcl,"HandleDeviceEnergyManagementTestEventTrigger");
314313
DeviceEnergyManagementTrigger trigger = static_cast<DeviceEnergyManagementTrigger>(eventTrigger);
315314

316315
switch (trigger)

‎examples/energy-management-app/energy-management-common/src/DEMUtils.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ using chip::Protocols::InteractionModel::Status;
3434
/**
3535
* @brief Helper function to get current timestamp in Epoch format
3636
*
37-
* @param chipEpoch reference to hold return timestamp
37+
* @param[out] chipEpoch reference to hold return timestamp. Set to 0 if an error occurs.
3838
*/
3939
CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch)
4040
{
@@ -59,7 +59,7 @@ CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch)
5959
auto unixEpoch = std::chrono::duration_cast<System::Clock::Seconds32>(cTMs).count();
6060
if (!UnixEpochToChipEpochTime(unixEpoch, chipEpoch))
6161
{
62-
ChipLogError(Zcl, "EVSE: unable to convert Unix Epoch time to Matter Epoch Time");
62+
ChipLogError(Zcl, "Unable to convert Unix Epoch time to Matter Epoch Time");
6363
return err;
6464
}
6565

@@ -78,7 +78,7 @@ CHIP_ERROR UtilsGetEpochTS(uint32_t & chipEpoch)
7878
* @return bitmap value for day of week
7979
* Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
8080
*/
81-
uint8_t UtilsGetDayOfWeekUnixEpoch(time_t unixEpoch)
81+
uint8_t UtilsGetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
8282
{
8383
// Define a timezone structure and initialize it to the local timezone
8484
// This will capture any daylight saving time changes
@@ -100,17 +100,17 @@ uint8_t UtilsGetDayOfWeekUnixEpoch(time_t unixEpoch)
100100
*
101101
* Sunday = 0x01, Monday = 0x01 ... Saturday = 0x40 (1<<6)
102102
*/
103-
CHIP_ERROR UtilsGetDayOfWeekNow(uint8_t & dayOfWeekMap)
103+
CHIP_ERROR UtilsGetLocalDayOfWeekNow(uint8_t & dayOfWeekMap)
104104
{
105105
chip::System::Clock::Milliseconds64 cTMs;
106106
CHIP_ERROR err = chip::System::SystemClock().GetClock_RealTimeMS(cTMs);
107107
if (err != CHIP_NO_ERROR)
108108
{
109-
ChipLogError(Zcl, "EVSE: unable to get current time to check user schedules error=%" CHIP_ERROR_FORMAT, err.Format());
109+
ChipLogError(Zcl, "Uable to get current time. error=%" CHIP_ERROR_FORMAT, err.Format());
110110
return err;
111111
}
112112
time_t unixEpoch = std::chrono::duration_cast<chip::System::Clock::Seconds32>(cTMs).count();
113-
dayOfWeekMap = UtilsGetDayOfWeekUnixEpoch(unixEpoch);
113+
dayOfWeekMap = UtilsGetLocalDayOfWeekFromUnixEpoch(unixEpoch);
114114

115115
return CHIP_NO_ERROR;
116116
}

‎examples/shell/shell_common/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ static_library("shell_common") {
7070
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp",
7171
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
7272
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp",
73+
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
7374
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementDelegateImpl.cpp",
7475
"${chip_root}/examples/energy-management-app/energy-management-common/src/DeviceEnergyManagementManager.cpp",
7576
"${chip_root}/examples/energy-management-app/energy-management-common/src/EVSEManufacturerImpl.cpp",
7677
"${chip_root}/examples/energy-management-app/energy-management-common/src/ElectricalPowerMeasurementDelegate.cpp",
7778
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseDelegateImpl.cpp",
7879
"${chip_root}/examples/energy-management-app/energy-management-common/src/EnergyEvseManager.cpp",
79-
"${chip_root}/examples/energy-management-app/energy-management-common/src/DEMUtils.cpp",
8080
]
8181

8282
include_dirs = [

‎src/python_testing/matter_testing_support.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ def wait_for_event_report(self, expected_event: ClusterObjects.ClusterEvent, tim
266266
return res.Data
267267

268268
def wait_for_no_event_report(self, timeout: int = 10):
269-
"""This function allows a test script to block waiting for the specific event to arrive with a timeout.
270-
It returns the event data so that the values can be checked."""
269+
"""This function succceeds/returns if an event does not arrive within the timeout.
270+
If an event does arrive, an assert is called."""
271271
try:
272272
res = self._q.get(block=True, timeout=timeout)
273273
except queue.Empty:

0 commit comments

Comments
 (0)