Skip to content

Commit 1a9f59d

Browse files
jamesharrowPeterC1965andy31415
authored andcommittedJul 18, 2024
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 7c34592 commit 1a9f59d

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 |

0 commit comments

Comments
 (0)