Skip to content

Commit

Permalink
Implement Global EventList Support (#24862)
Browse files Browse the repository at this point in the history
* Global Event List Support: All Manually Updated Files

* Manually updated all *.zap files to include events for all clusters that have them.

For each ZAP file was running ./scripts/tools/zap/run_zaptool.sh manually.

* Automatically generated files.

By running ./scripts/tools/zap_regen_all.py script.

* Updated ZAP version to v2023.02.03-nightly

* Update src/app/util/ember-compatibility-functions.cpp

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Update src/app/util/ember-compatibility-functions.cpp

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Updated all-clusters-minimal-app.zap to Include Only Minimul Number of Required Event. Exclude all optional events.

* Updated TestAttributePathExpandIterator.cpp test

* Add voided use of generatedEvents to prevent unused variable error when array is empty

* Updated TestBasicInformation.yaml to support EventList

* Rerun ZAP REGEN

* Updated YAML tests to include EventList Attribute

* ZAP REGEN

* restyled

* Reverted Changes to ZAP files. Only updated the following ZAP files:

examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
examples/bridge-app/bridge-common/bridge-app.zap
examples/lock-app/lock-common/lock-app.zap
scripts/tools/zap/tests/inputs/all-clusters-app.zap
scripts/tools/zap/tests/inputs/lighting-app.zap

Note that all-clusters-minimal-app.zap enables only minimally required Events.
All other updated ZAP files enable all mandatory and optional Events required by
the defined Feature Map.

* ZAP REGEN

* Removed ReachableChanged Basic Information Cluster Event from all Apps Examples. This event is never emitted.

Also run ZAP REGEN.

---------

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
  • Loading branch information
2 people authored and pull[bot] committed Nov 23, 2023
1 parent aa474d6 commit 1d82fd5
Show file tree
Hide file tree
Showing 89 changed files with 21,590 additions and 1,323 deletions.
332 changes: 324 additions & 8 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 89,
"featureLevel": 90,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -1136,6 +1136,15 @@
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "AccessControlEntryChanged",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -1524,6 +1533,15 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "StartUp",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -1810,6 +1828,29 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "StateTransition",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "VersionApplied",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "DownloadError",
"code": 2,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -10242,6 +10283,22 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "StateChanged",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "ActionFailed",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -11882,6 +11939,15 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "SwitchLatched",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -12200,6 +12266,15 @@
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "StateChange",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -13254,6 +13329,29 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "DoorLockAlarm",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "LockOperation",
"code": 2,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "LockOperationError",
"code": 3,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -20896,6 +20994,22 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "TestEvent",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "TestFabricScopedEvent",
"code": 2,
"mfgCode": null,
"side": "server",
"included": 1
}
]
}
]
Expand Down Expand Up @@ -24872,5 +24986,6 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
]
],
"log": []
}
131 changes: 129 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 89,
"featureLevel": 90,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -444,6 +444,15 @@
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "AccessControlEntryChanged",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -896,6 +905,29 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "StartUp",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "ShutDown",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "Leave",
"code": 2,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -2336,6 +2368,36 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "HardwareFaultChange",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "RadioFaultChange",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "NetworkFaultChange",
"code": 2,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "BootReason",
"code": 3,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -2478,6 +2540,15 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "SoftwareFault",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -3528,6 +3599,22 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "ConnectionStatus",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "NetworkFaultChange",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -3804,6 +3891,29 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "Disconnection",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "AssociationFailure",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "ConnectionStatus",
"code": 2,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -5664,6 +5774,22 @@
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "StateChanged",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "ActionFailed",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
}
]
Expand Down Expand Up @@ -7543,5 +7669,6 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
]
],
"log": []
}
Loading

0 comments on commit 1d82fd5

Please sign in to comment.