Skip to content

Commit 180ee0d

Browse files
jamesharrowPeterC1965andy31415
authored and
lazarkov
committed
Update energy management clusters xml for 1.4 (project-chip#33673)
* Updated device-energy-management-cluster.xml and energy-evse-cluster.xml using Alchemy and spec commit: dbf7c6dd7206fa4a4647f8a6218325fbe6c8ec6c Note more DEM PRs are yet to merge. * Regen_all checked in. * Added missing energy-management-app.matter * Updated with spec PR project-chip#9251 merged to master. * Updated with spec PR project-chip#9266 (change ForecastId -> ForecastID) * regen_all * Removed extra entryType="PowerAdjustStruct" which causes incorrect generation of a top-level list in the PowerAdjustmentCapability attribute. * Removed extra min="-4611686018427387904" max="4611686018427387903" which causes ZAP to complain about more than 2 byte length. * Updated after regen_all * Reverted max="86400" in RANDOMIZATION_DELAY_WINDOW which upsets some builds * Added missing autogen'd code for DEM changes. * Fix up compilation errors caused by change to forecastID and powerAdjustementCapability list moving one level below. * Added Water Heater Management cluster XML * Added Water Heater Management to controller-clusters.zap * Added Water Heater Management to zap_cluster_list.json * Added Water Heater Management cluster to all-clusters-app.zap * Tried to add apiMaturity="provisional" to silence deprecation warnings when running zap_regen_all.py. Also used Alchemy --featureXML. * Added all-clusters-app.matter and controller-clusters.matter after regen_all * Added output from regen_all.py * Updated .zap files after adding provisional flag. * Added Java matter controller now that apiMaturity=provisional has popped out. * Trying to remove Thread Border Router Management in controller-clusters.zap as a test. * Removed water-heater-management-server for now so compilers don't try to compile it. * Reverted all-clusters-app.zap (removed Water heater). Reverted controller-clusters.zap (put back Thread Border Router, removed Water Heater) * updated all-clusters-app.matter after removing WaterHeaterManagement cluster (to avoid compile failures). * Candidate fix for THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER which resolves the error. [Should be a duplicate of PR project-chip#34000 when that merges. * Addressing review comments from Boris * Regenerate files * Regenerate files correctly * Removal optional conformance fro DayOfWeekForSequence/ChargingTargets fields in ChargingTargetScheduleStruct + regen zap files * Updated energy-evse-cluster using Alchemy to match Spec PR:9317 based on review that DischargingCurrent was inconsistent. * Updated after regen_all --------- Co-authored-by: pcoleman <pcoleman@geotogether.com> Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent ae77f61 commit 180ee0d

File tree

56 files changed

+7026
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+7026
-131
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ jobs:
191191
src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
192192
src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
193193
src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml \
194+
src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml \
194195
src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \
195196
src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml \
196197
src/app/zap-templates/zcl/data-model/chip/window-covering.xml \

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Generally regenerate using one of:
7979
| 129 | 0x81 | ValveConfigurationAndControl |
8080
| 144 | 0x90 | ElectricalPowerMeasurement |
8181
| 145 | 0x91 | ElectricalEnergyMeasurement |
82+
| 148 | 0x94 | WaterHeaterManagement |
8283
| 150 | 0x96 | DemandResponseLoadControl |
8384
| 151 | 0x97 | Messages |
8485
| 152 | 0x98 | DeviceEnergyManagement |

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+7-4
Original file line numberDiff line numberDiff line change
@@ -4298,7 +4298,7 @@ provisional cluster DeviceEnergyManagement = 152 {
42984298

42994299
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
43004300
cluster EnergyEvse = 153 {
4301-
revision 2;
4301+
revision 4;
43024302

43034303
enum EnergyTransferStoppedReasonEnum : enum8 {
43044304
kEVStopped = 0;
@@ -4342,6 +4342,7 @@ cluster EnergyEvse = 153 {
43424342
kDischargingEnabled = 2;
43434343
kDisabledError = 3;
43444344
kDisabledDiagnostics = 4;
4345+
kEnabled = 5;
43454346
}
43464347

43474348
bitmap Feature : bitmap32 {
@@ -4389,13 +4390,15 @@ cluster EnergyEvse = 153 {
43894390
int32u sessionID = 0;
43904391
StateEnum state = 1;
43914392
amperage_ma maximumCurrent = 2;
4393+
optional amperage_ma maximumDischargeCurrent = 3;
43924394
}
43934395

43944396
info event EnergyTransferStopped = 3 {
43954397
int32u sessionID = 0;
43964398
StateEnum state = 1;
43974399
EnergyTransferStoppedReasonEnum reason = 2;
43984400
energy_mwh energyTransferred = 4;
4401+
optional energy_mwh energyDischarged = 5;
43994402
}
44004403

44014404
critical event Fault = 4 {
@@ -4460,15 +4463,15 @@ cluster EnergyEvse = 153 {
44604463

44614464
/** Allows a client to disable the EVSE from charging and discharging. */
44624465
timed command Disable(): DefaultSuccess = 1;
4463-
/** Allows a client to enable the EVSE to charge an EV. */
4466+
/** This command allows a client to enable the EVSE to charge an EV, */
44644467
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
4465-
/** Allows a client to enable the EVSE to discharge an EV. */
4468+
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
44664469
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
44674470
/** Allows a client to put the EVSE into a self-diagnostics mode. */
44684471
timed command StartDiagnostics(): DefaultSuccess = 4;
44694472
/** Allows a client to set the user specified charging targets. */
44704473
timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
4471-
/** Allows a client to retrieve the user specified charging targets. */
4474+
/** Allows a client to retrieve the current set of charging targets. */
44724475
timed command GetTargets(): GetTargetsResponse = 6;
44734476
/** Allows a client to clear all stored charging targets. */
44744477
timed command ClearTargets(): DefaultSuccess = 7;

‎examples/energy-management-app/energy-management-common/energy-management-app.matter

+7-4
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ provisional cluster DeviceEnergyManagement = 152 {
16511651

16521652
/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
16531653
cluster EnergyEvse = 153 {
1654-
revision 2;
1654+
revision 4;
16551655

16561656
enum EnergyTransferStoppedReasonEnum : enum8 {
16571657
kEVStopped = 0;
@@ -1695,6 +1695,7 @@ cluster EnergyEvse = 153 {
16951695
kDischargingEnabled = 2;
16961696
kDisabledError = 3;
16971697
kDisabledDiagnostics = 4;
1698+
kEnabled = 5;
16981699
}
16991700

17001701
bitmap Feature : bitmap32 {
@@ -1742,13 +1743,15 @@ cluster EnergyEvse = 153 {
17421743
int32u sessionID = 0;
17431744
StateEnum state = 1;
17441745
amperage_ma maximumCurrent = 2;
1746+
optional amperage_ma maximumDischargeCurrent = 3;
17451747
}
17461748

17471749
info event EnergyTransferStopped = 3 {
17481750
int32u sessionID = 0;
17491751
StateEnum state = 1;
17501752
EnergyTransferStoppedReasonEnum reason = 2;
17511753
energy_mwh energyTransferred = 4;
1754+
optional energy_mwh energyDischarged = 5;
17521755
}
17531756

17541757
critical event Fault = 4 {
@@ -1813,15 +1816,15 @@ cluster EnergyEvse = 153 {
18131816

18141817
/** Allows a client to disable the EVSE from charging and discharging. */
18151818
timed command Disable(): DefaultSuccess = 1;
1816-
/** Allows a client to enable the EVSE to charge an EV. */
1819+
/** This command allows a client to enable the EVSE to charge an EV, */
18171820
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
1818-
/** Allows a client to enable the EVSE to discharge an EV. */
1821+
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
18191822
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
18201823
/** Allows a client to put the EVSE into a self-diagnostics mode. */
18211824
timed command StartDiagnostics(): DefaultSuccess = 4;
18221825
/** Allows a client to set the user specified charging targets. */
18231826
timed command SetTargets(SetTargetsRequest): DefaultSuccess = 5;
1824-
/** Allows a client to retrieve the user specified charging targets. */
1827+
/** Allows a client to retrieve the current set of charging targets. */
18251828
timed command GetTargets(): GetTargetsResponse = 6;
18261829
/** Allows a client to clear all stored charging targets. */
18271830
timed command ClearTargets(): DefaultSuccess = 7;

‎scripts/rules.matterlint

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
100100
load "../src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml";
101101
load "../src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml";
102102
load "../src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml";
103+
load "../src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml";
103104
load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml";
104105
load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml";
105106
load "../src/app/zap-templates/zcl/data-model/chip/window-covering.xml";

0 commit comments

Comments
 (0)