Skip to content

Commit cd36151

Browse files
jamesharrowpre-commit-ci[bot]
jamesharrow
and
pre-commit-ci[bot]
authored
[ENERGY] DEM PowerRangeAdjust command spec alignment (project-chip#73977)
* Regenerated XML using Alchemy against spec PR#13326 additional DEM constraints MinPower and MaxPower are now O.a+ * zap_regen_all update * Updated C++ code from Nullable to Optional * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Applied suggestion made by Simon to include a valid duration in Mock test --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent e054bb8 commit cd36151

28 files changed

Lines changed: 166 additions & 126 deletions

File tree

‎examples/all-clusters-app/realtek/data_model/all-clusters-app.matter‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4958,8 +4958,8 @@ cluster DeviceEnergyManagement = 152 {
49584958
}
49594959

49604960
request struct PowerRangeAdjustRequestRequest {
4961-
nullable power_mw minPower = 0;
4962-
nullable power_mw maxPower = 1;
4961+
optional power_mw minPower = 0;
4962+
optional power_mw maxPower = 1;
49634963
elapsed_s duration = 2;
49644964
AdjustmentCauseEnum cause = 3;
49654965
}

‎examples/all-devices-app/all-devices-common/device/types/device-energy-management/EnergyManagement.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ Protocols::InteractionModel::Status EnergyManagement::CancelRequest()
110110
return Protocols::InteractionModel::Status::Success;
111111
}
112112

113-
Protocols::InteractionModel::Status EnergyManagement::PowerRangeAdjustRequest(const DataModel::Nullable<int64_t> minPower,
114-
const DataModel::Nullable<int64_t> maxPower,
113+
Protocols::InteractionModel::Status EnergyManagement::PowerRangeAdjustRequest(const Optional<int64_t> minPower,
114+
const Optional<int64_t> maxPower,
115115
const uint32_t duration, AdjustmentCauseEnum cause)
116116
{
117117
return Protocols::InteractionModel::Status::Success;

‎examples/all-devices-app/all-devices-common/device/types/device-energy-management/EnergyManagement.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class EnergyManagement : public SingleEndpoint, public Clusters::DeviceEnergyMan
5151
Clusters::DeviceEnergyManagement::AdjustmentCauseEnum cause) override;
5252
Protocols::InteractionModel::Status CancelRequest() override;
5353
Protocols::InteractionModel::Status
54-
PowerRangeAdjustRequest(const DataModel::Nullable<int64_t> minPower, const DataModel::Nullable<int64_t> maxPower,
55-
const uint32_t duration, Clusters::DeviceEnergyManagement::AdjustmentCauseEnum cause) override;
54+
PowerRangeAdjustRequest(const Optional<int64_t> minPower, const Optional<int64_t> maxPower, const uint32_t duration,
55+
Clusters::DeviceEnergyManagement::AdjustmentCauseEnum cause) override;
5656
Protocols::InteractionModel::Status CancelPowerRangeAdjustRequest() override;
5757

5858
Clusters::DeviceEnergyManagement::ESATypeEnum GetESAType() override;

‎examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2129,8 +2129,8 @@ cluster DeviceEnergyManagement = 152 {
21292129
}
21302130

21312131
request struct PowerRangeAdjustRequestRequest {
2132-
nullable power_mw minPower = 0;
2133-
nullable power_mw maxPower = 1;
2132+
optional power_mw minPower = 0;
2133+
optional power_mw maxPower = 1;
21342134
elapsed_s duration = 2;
21352135
AdjustmentCauseEnum cause = 3;
21362136
}

‎examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,8 +2370,8 @@ cluster DeviceEnergyManagement = 152 {
23702370
}
23712371

23722372
request struct PowerRangeAdjustRequestRequest {
2373-
nullable power_mw minPower = 0;
2374-
nullable power_mw maxPower = 1;
2373+
optional power_mw minPower = 0;
2374+
optional power_mw maxPower = 1;
23752375
elapsed_s duration = 2;
23762376
AdjustmentCauseEnum cause = 3;
23772377
}

‎examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,8 +2279,8 @@ cluster DeviceEnergyManagement = 152 {
22792279
}
22802280

22812281
request struct PowerRangeAdjustRequestRequest {
2282-
nullable power_mw minPower = 0;
2283-
nullable power_mw maxPower = 1;
2282+
optional power_mw minPower = 0;
2283+
optional power_mw maxPower = 1;
22842284
elapsed_s duration = 2;
22852285
AdjustmentCauseEnum cause = 3;
22862286
}

‎examples/dishwasher-app/silabs/include/DishwasherManager.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ class DishwasherManager : public DEMManufacturerDelegate
8181
const DataModel::DecodableList<DeviceEnergyManagement::Structs::ConstraintsStruct::DecodableType> & constraints,
8282
AdjustmentCauseEnum cause) override;
8383

84-
CHIP_ERROR HandleDeviceEnergyManagementPowerRangeAdjustRequest(const DataModel::Nullable<int64_t> minPower,
85-
const DataModel::Nullable<int64_t> maxPower,
86-
const uint32_t durationS, AdjustmentCauseEnum cause) override;
84+
CHIP_ERROR HandleDeviceEnergyManagementPowerRangeAdjustRequest(const Optional<int64_t> minPower,
85+
const Optional<int64_t> maxPower, const uint32_t durationS,
86+
AdjustmentCauseEnum cause) override;
8787

8888
CHIP_ERROR HandleDeviceEnergyManagementPowerRangeAdjustCompletion() override;
8989
CHIP_ERROR HandleDeviceEnergyManagementCancelPowerRangeAdjustRequest(CauseEnum cause) override;

‎examples/dishwasher-app/silabs/src/DishwasherManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ CHIP_ERROR DishwasherManager::RequestConstraintBasedForecast(
208208
return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
209209
}
210210

211-
CHIP_ERROR DishwasherManager::HandleDeviceEnergyManagementPowerRangeAdjustRequest(const DataModel::Nullable<int64_t> minPower,
212-
const DataModel::Nullable<int64_t> maxPower,
211+
CHIP_ERROR DishwasherManager::HandleDeviceEnergyManagementPowerRangeAdjustRequest(const Optional<int64_t> minPower,
212+
const Optional<int64_t> maxPower,
213213
const uint32_t durationS,
214214
AdjustmentCauseEnum cause)
215215
{

‎examples/energy-management/device-energy-management/include/DEMManufacturerDelegate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ class DEMManufacturerDelegate
8181
return CHIP_NO_ERROR;
8282
}
8383

84-
virtual CHIP_ERROR HandleDeviceEnergyManagementPowerRangeAdjustRequest(const DataModel::Nullable<int64_t> minPower,
85-
const DataModel::Nullable<int64_t> maxPower,
84+
virtual CHIP_ERROR HandleDeviceEnergyManagementPowerRangeAdjustRequest(const Optional<int64_t> minPower,
85+
const Optional<int64_t> maxPower,
8686
const uint32_t durationS, AdjustmentCauseEnum cause)
8787
{
8888
return CHIP_NO_ERROR;

‎examples/energy-management/device-energy-management/include/DeviceEnergyManagementDelegateImpl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ class DeviceEnergyManagementDelegate : public DeviceEnergyManagement::Delegate
180180
* @param cause Who (Grid/local) is triggering this change.
181181
* @return Success if the power range adjustment is accepted; otherwise the command SHALL be rejected with appropriate error.
182182
*/
183-
chip::Protocols::InteractionModel::Status PowerRangeAdjustRequest(const DataModel::Nullable<int64_t> minPower,
184-
const DataModel::Nullable<int64_t> maxPower,
185-
uint32_t duration, AdjustmentCauseEnum cause) override;
183+
chip::Protocols::InteractionModel::Status PowerRangeAdjustRequest(const Optional<int64_t> minPower,
184+
const Optional<int64_t> maxPower, uint32_t duration,
185+
AdjustmentCauseEnum cause) override;
186186

187187
/**
188188
* @brief Handler for CancelPowerRangeAdjustRequest

0 commit comments

Comments
 (0)