Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update energy management clusters xml for 1.4 #33673

Merged
merged 39 commits into from
Jul 9, 2024
Merged

Update energy management clusters xml for 1.4 #33673

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
cf2e8ab
Updated device-energy-management-cluster.xml and energy-evse-cluster.…
jamesharrow May 29, 2024
1b9021e
Regen_all checked in.
jamesharrow May 29, 2024
c508af5
Added missing energy-management-app.matter
jamesharrow May 29, 2024
2ed3c01
Updated with spec PR #9251 merged to master.
jamesharrow May 30, 2024
f34083f
Updated with spec PR #9266 (change ForecastId -> ForecastID)
jamesharrow May 30, 2024
824f90b
regen_all
jamesharrow May 30, 2024
6ca83b4
Removed extra entryType="PowerAdjustStruct" which causes incorrect ge…
jamesharrow Jun 3, 2024
c9c27a5
Removed extra min="-4611686018427387904" max="4611686018427387903" wh…
jamesharrow Jun 3, 2024
59c5802
Updated after regen_all
jamesharrow Jun 3, 2024
26d3030
Reverted max="86400" in RANDOMIZATION_DELAY_WINDOW which upsets some …
jamesharrow Jun 3, 2024
6ce2430
Added missing autogen'd code for DEM changes.
jamesharrow Jun 3, 2024
2380b98
Fix up compilation errors caused by change to forecastID and powerAdj…
jamesharrow Jun 3, 2024
9bd8e16
Merge branch 'upstream-master' into Update_Energy_Cluster_XML_For_1_4
jamesharrow Jun 18, 2024
482a6af
Added Water Heater Management cluster XML
jamesharrow Jun 18, 2024
f53bfeb
Added Water Heater Management to controller-clusters.zap
jamesharrow Jun 18, 2024
7e510b1
Added Water Heater Management to zap_cluster_list.json
jamesharrow Jun 18, 2024
749636e
Added Water Heater Management cluster to all-clusters-app.zap
jamesharrow Jun 18, 2024
6c7c308
Tried to add apiMaturity="provisional" to silence deprecation warning…
jamesharrow Jun 18, 2024
f5c4f62
Added all-clusters-app.matter and controller-clusters.matter after re…
jamesharrow Jun 18, 2024
81f7009
Added output from regen_all.py
jamesharrow Jun 18, 2024
61668a3
Merge branch 'master' into Update_Energy_Cluster_XML_For_1_4
jamesharrow Jun 18, 2024
df7ad2b
Updated .zap files after adding provisional flag.
jamesharrow Jun 18, 2024
aa58bed
Added Java matter controller now that apiMaturity=provisional has pop…
jamesharrow Jun 18, 2024
ad27399
Trying to remove Thread Border Router Management in controller-cluste…
jamesharrow Jun 18, 2024
50308fd
Removed water-heater-management-server for now so compilers don't try…
jamesharrow Jun 18, 2024
5330712
Reverted all-clusters-app.zap (removed Water heater). Reverted contro…
jamesharrow Jun 18, 2024
2cbeab7
updated all-clusters-app.matter after removing WaterHeaterManagement …
jamesharrow Jun 18, 2024
4944127
Candidate fix for THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER which resol…
jamesharrow Jun 18, 2024
dfb81db
Merge branch 'project-chip:master' into Update_Energy_Cluster_XML_For…
jamesharrow Jun 18, 2024
f8b35c2
Merge branch 'upstream-master' into Update_Energy_Cluster_XML_For_1_4
jamesharrow Jun 19, 2024
3c3af3a
Addressing review comments from Boris
PeterC1965 Jun 26, 2024
3ba3ff9
Regenerate files
PeterC1965 Jun 26, 2024
dec0b2e
Merge branch 'master' into Update_Energy_Cluster_XML_For_1_4
PeterC1965 Jun 26, 2024
3fbdfec
Regenerate files correctly
PeterC1965 Jun 26, 2024
e43ff1e
Removal optional conformance fro DayOfWeekForSequence/ChargingTargets…
PeterC1965 Jun 27, 2024
88a1ba1
Merge branch 'master' into Update_Energy_Cluster_XML_For_1_4
andy31415 Jul 3, 2024
b7b7631
Merge branch 'upstream-master' into Update_Energy_Cluster_XML_For_1_4
jamesharrow Jul 8, 2024
35d9aac
Updated energy-evse-cluster using Alchemy to match Spec PR:9317 based…
jamesharrow Jul 8, 2024
e9a80de
Updated after regen_all
jamesharrow Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/window-covering.xml \
Expand Down
1 change: 1 addition & 0 deletions docs/zap_clusters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Generally regenerate using one of:
| 129 | 0x81 | ValveConfigurationAndControl |
| 144 | 0x90 | ElectricalPowerMeasurement |
| 145 | 0x91 | ElectricalEnergyMeasurement |
| 148 | 0x94 | WaterHeaterManagement |
| 150 | 0x96 | DemandResponseLoadControl |
| 151 | 0x97 | Messages |
| 152 | 0x98 | DeviceEnergyManagement |
Expand Down
9 changes: 6 additions & 3 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4291,7 +4291,7 @@ provisional cluster DeviceEnergyManagement = 152 {

/** 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. */
cluster EnergyEvse = 153 {
revision 2;
revision 4;

enum EnergyTransferStoppedReasonEnum : enum8 {
kEVStopped = 0;
Expand Down Expand Up @@ -4335,6 +4335,7 @@ cluster EnergyEvse = 153 {
kDischargingEnabled = 2;
kDisabledError = 3;
kDisabledDiagnostics = 4;
kEnabled = 5;
}

bitmap Feature : bitmap32 {
Expand Down Expand Up @@ -4362,8 +4363,8 @@ cluster EnergyEvse = 153 {
}

struct ChargingTargetScheduleStruct {
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
ChargingTargetStruct chargingTargets[] = 1;
optional TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
optional ChargingTargetStruct chargingTargets[] = 1;
}

info event EVConnected = 0 {
Expand All @@ -4382,13 +4383,15 @@ cluster EnergyEvse = 153 {
int32u sessionID = 0;
StateEnum state = 1;
amperage_ma maximumCurrent = 2;
optional amperage_ma maximumDischargingCurrent = 3;
}

info event EnergyTransferStopped = 3 {
int32u sessionID = 0;
StateEnum state = 1;
EnergyTransferStoppedReasonEnum reason = 2;
energy_mwh energyTransferred = 4;
optional energy_mwh energyDischarged = 5;
}

critical event Fault = 4 {
Expand Down
9 changes: 6 additions & 3 deletions examples/energy-management-app/energy-management-common/energy-management-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,7 @@ provisional cluster DeviceEnergyManagement = 152 {

/** 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. */
cluster EnergyEvse = 153 {
revision 2;
revision 4;

enum EnergyTransferStoppedReasonEnum : enum8 {
kEVStopped = 0;
Expand Down Expand Up @@ -1695,6 +1695,7 @@ cluster EnergyEvse = 153 {
kDischargingEnabled = 2;
kDisabledError = 3;
kDisabledDiagnostics = 4;
kEnabled = 5;
}

bitmap Feature : bitmap32 {
Expand Down Expand Up @@ -1722,8 +1723,8 @@ cluster EnergyEvse = 153 {
}

struct ChargingTargetScheduleStruct {
TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
ChargingTargetStruct chargingTargets[] = 1;
optional TargetDayOfWeekBitmap dayOfWeekForSequence = 0;
optional ChargingTargetStruct chargingTargets[] = 1;
}

info event EVConnected = 0 {
Expand All @@ -1742,13 +1743,15 @@ cluster EnergyEvse = 153 {
int32u sessionID = 0;
StateEnum state = 1;
amperage_ma maximumCurrent = 2;
optional amperage_ma maximumDischargingCurrent = 3;
}

info event EnergyTransferStopped = 3 {
int32u sessionID = 0;
StateEnum state = 1;
EnergyTransferStoppedReasonEnum reason = 2;
energy_mwh energyTransferred = 4;
optional energy_mwh energyDischarged = 5;
}

critical event Fault = 4 {
Expand Down
1 change: 1 addition & 0 deletions scripts/rules.matterlint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
load "../src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/window-covering.xml";
Expand Down
Loading
Loading