From 1d82fd52c06d898e8e25add46417b1be7e89fe6c Mon Sep 17 00:00:00 2001 From: Evgeny Margolis Date: Tue, 7 Feb 2023 15:12:46 -0800 Subject: [PATCH] Implement Global EventList Support (#24862) * 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 * Update src/app/util/ember-compatibility-functions.cpp Co-authored-by: Boris Zbarsky * 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 --- .../all-clusters-common/all-clusters-app.zap | 332 +- .../all-clusters-minimal-app.zap | 119 +- .../bridge-app/bridge-common/bridge-app.zap | 131 +- examples/lock-app/lock-common/lock-app.zap | 198 +- .../docker/images/chip-cert-bins/Dockerfile | 2 +- .../zap/tests/inputs/all-clusters-app.zap | 338 +- .../tools/zap/tests/inputs/lighting-app.zap | 145 +- .../app-templates/endpoint_config.h | 234 + .../app-templates/endpoint_config.h | 99 + scripts/tools/zap/zap_execution.py | 2 +- scripts/zap.json | 2 +- src/app/GlobalAttributes.h | 3 +- .../tests/TestAttributePathExpandIterator.cpp | 20 + .../tests/suites/TestBasicInformation.yaml | 1 + .../suites/certification/Test_TC_ACL_1_1.yaml | 2 +- .../suites/certification/Test_TC_ACT_1_1.yaml | 2 +- .../certification/Test_TC_ALOGIN_1_12.yaml | 2 +- .../certification/Test_TC_APBSC_1_10.yaml | 3 +- .../Test_TC_APPLAUNCHER_1_3.yaml | 2 +- .../Test_TC_AUDIOOUTPUT_1_8.yaml | 2 +- .../certification/Test_TC_BIND_1_1.yaml | 2 +- .../certification/Test_TC_BOOL_1_1.yaml | 2 +- .../certification/Test_TC_BRBINFO_1_1.yaml | 2 +- .../suites/certification/Test_TC_CC_1_1.yaml | 14 +- .../certification/Test_TC_CGEN_1_1.yaml | 3 +- .../certification/Test_TC_CHANNEL_1_6.yaml | 2 +- .../certification/Test_TC_CNET_1_3.yaml | 2 +- .../Test_TC_CONTENTLAUNCHER_1_11.yaml | 2 +- .../certification/Test_TC_DESC_1_1.yaml | 2 +- .../certification/Test_TC_DGETH_1_1.yaml | 2 +- .../certification/Test_TC_DGGEN_1_1.yaml | 2 +- .../certification/Test_TC_DGSW_1_1.yaml | 2 +- .../certification/Test_TC_DGWIFI_1_1.yaml | 3 +- .../certification/Test_TC_DLOG_1_1.yaml | 2 +- .../certification/Test_TC_DRLK_1_1.yaml | 3 +- .../certification/Test_TC_FLABEL_1_1.yaml | 2 +- .../suites/certification/Test_TC_FLW_1_1.yaml | 2 +- .../suites/certification/Test_TC_G_1_1.yaml | 2 +- .../suites/certification/Test_TC_ILL_1_1.yaml | 2 +- .../suites/certification/Test_TC_I_1_1.yaml | 2 +- .../Test_TC_KEYPADINPUT_1_2.yaml | 2 +- .../certification/Test_TC_LCFG_1_1.yaml | 2 +- .../certification/Test_TC_LOWPOWER_1_1.yaml | 2 +- .../certification/Test_TC_LTIME_1_2.yaml | 2 +- .../certification/Test_TC_LUNIT_1_2.yaml | 2 +- .../suites/certification/Test_TC_LVL_1_1.yaml | 2 +- .../certification/Test_TC_MEDIAINPUT_1_4.yaml | 2 +- .../Test_TC_MEDIAPLAYBACK_1_7.yaml | 2 +- .../suites/certification/Test_TC_MOD_1_1.yaml | 2 +- .../suites/certification/Test_TC_OCC_1_1.yaml | 2 +- .../suites/certification/Test_TC_OO_1_1.yaml | 2 +- .../suites/certification/Test_TC_PCC_1_1.yaml | 16 +- .../suites/certification/Test_TC_PRS_1_1.yaml | 2 +- .../certification/Test_TC_PSCFG_1_1.yaml | 2 +- .../suites/certification/Test_TC_PS_1_1.yaml | 2 +- .../suites/certification/Test_TC_RH_1_1.yaml | 2 +- .../certification/Test_TC_SWTCH_1_1.yaml | 4 +- .../certification/Test_TC_TGTNAV_1_9.yaml | 2 +- .../suites/certification/Test_TC_TMP_1_1.yaml | 2 +- .../certification/Test_TC_TSTAT_1_1.yaml | 2 +- .../certification/Test_TC_TSUIC_1_1.yaml | 2 +- .../certification/Test_TC_ULABEL_1_1.yaml | 2 +- .../certification/Test_TC_WAKEONLAN_1_5.yaml | 2 +- .../certification/Test_TC_WNCV_1_1.yaml | 3 +- src/app/util/af-types.h | 11 + src/app/util/attribute-storage.cpp | 6 +- .../util/ember-compatibility-functions.cpp | 19 +- .../templates/app/endpoint_config.zapt | 7 + .../zcl/data-model/chip/global-attributes.xml | 6 +- .../python/chip/clusters/Objects.py | 1306 ++++- src/controller/tests/TestEventChunking.cpp | 8 +- src/controller/tests/TestReadChunking.cpp | 20 +- .../MTRAttributeTLVValueDecoder.mm | 1742 +++++- .../CHIP/zap-generated/MTRBaseClusters.h | 780 +++ .../CHIP/zap-generated/MTRBaseClusters.mm | 2796 ++++++++++ .../CHIP/zap-generated/MTRCallbackBridge.h | 2244 +++++++- .../CHIP/zap-generated/MTRCallbackBridge.mm | 4754 +++++++++++++---- .../CHIP/zap-generated/MTRClusterConstants.h | 106 + .../CHIP/zap-generated/MTRClusters.h | 130 + .../CHIP/zap-generated/MTRClusters.mm | 521 ++ .../zap-generated/cluster-objects.cpp | 216 + .../zap-generated/cluster-objects.h | 516 ++ .../app-common/zap-generated/ids/Attributes.h | 292 + .../zap-generated/cluster/Commands.h | 360 ++ .../cluster/logging/DataModelLogger.cpp | 330 ++ .../chip-tool/zap-generated/test/Commands.h | 70 +- .../zap-generated/cluster/Commands.h | 4705 ++++++++++++++++ .../zap-generated/test/Commands.h | 68 +- .../zap-generated/endpoint_config.h | 141 + 89 files changed, 21590 insertions(+), 1323 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index d5703ab2ecefdc..45bb2735b9c794 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 89, + "featureLevel": 90, "creator": "zap", "keyValuePairs": [ { @@ -16,6 +16,12 @@ } ], "package": [ + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" + }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -1136,6 +1136,22 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "AccessControlEntryChanged", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "AccessControlExtensionChanged", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -1524,6 +1540,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 + } ] }, { @@ -1810,6 +1849,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 + } ] }, { @@ -3574,6 +3636,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 + } ] }, { @@ -3716,6 +3808,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SoftwareFault", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -4784,6 +4885,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 + } ] }, { @@ -5070,6 +5187,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 + } ] }, { @@ -10606,6 +10746,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 + } ] }, { @@ -11722,6 +11878,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "BatFaultChange", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -12246,6 +12411,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SwitchLatched", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -12564,6 +12738,15 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "StateChange", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -13634,6 +13817,36 @@ "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 + }, + { + "name": "LockUserChange", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -14746,6 +14959,92 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SupplyVoltageLow", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SupplyVoltageHigh", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "PowerMissingPhase", + "code": 2, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SystemPressureLow", + "code": 3, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SystemPressureHigh", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "DryRunning", + "code": 5, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "MotorTemperatureHigh", + "code": 6, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "PumpMotorFatalFailure", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "ElectronicTemperatureHigh", + "code": 8, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "PumpBlocked", + "code": 9, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SensorFailure", + "code": 10, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "ElectronicNonFatalFailure", + "code": 11, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -21334,6 +21633,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 + } ] } ] @@ -25310,5 +25625,6 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index dbdda93fb5af79..454bef48226a70 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 89, + "featureLevel": 90, "creator": "zap", "keyValuePairs": [ { @@ -1136,6 +1136,15 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "AccessControlEntryChanged", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -1524,6 +1533,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "StartUp", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -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 + } ] }, { @@ -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 + } ] }, { @@ -11882,6 +11939,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SwitchLatched", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -12200,6 +12266,15 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "StateChange", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -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 + } ] }, { @@ -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 + } ] } ] @@ -24872,5 +24986,6 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 63842b374dc5a8..6c4a31721482fa 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 89, + "featureLevel": 90, "creator": "zap", "keyValuePairs": [ { @@ -444,6 +444,15 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "AccessControlEntryChanged", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -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 + } ] }, { @@ -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 + } ] }, { @@ -2478,6 +2540,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SoftwareFault", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -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 + } ] }, { @@ -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 + } ] }, { @@ -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 + } ] } ] @@ -7543,5 +7669,6 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 3d19bfcfd7a655..8d7475f77f87a0 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 89, + "featureLevel": 90, "creator": "zap", "keyValuePairs": [ { @@ -878,6 +878,22 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "AccessControlEntryChanged", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "AccessControlExtensionChanged", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -1266,6 +1282,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 + } ] }, { @@ -1552,6 +1591,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 + } ] }, { @@ -1978,6 +2040,22 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "WiredFaultChange", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "BatFaultChange", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 0 + } ] }, { @@ -2724,6 +2802,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 + } ] }, { @@ -2866,6 +2974,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SoftwareFault", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -3952,6 +4069,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 + } ] }, { @@ -4238,6 +4371,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 + } ] }, { @@ -7634,6 +7790,43 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "DoorLockAlarm", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "DoorStateChange", + "code": 1, + "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 + }, + { + "name": "LockUserChange", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -7758,5 +7951,6 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 3b27fdfabeca11..d124ec9f98febe 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb # ZAP Development install, so that it runs on both x64 and arm64 # Generally this should match with the ZAP version that is used for codegen within the # specified SHA -ARG ZAP_VERSION=v2023.01.31-nightly +ARG ZAP_VERSION=v2023.02.03-nightly # Ensure TARGETPLATFORM is set RUN case ${TARGETPLATFORM} in \ diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 8f2340b57687a9..5a3a5e1c355389 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 89, + "featureLevel": 90, "creator": "zap", "keyValuePairs": [ { @@ -16,6 +16,12 @@ } ], "package": [ + { + "pathRelativity": "relativeToZap", + "path": "../../../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" + }, { "pathRelativity": "relativeToZap", "path": "../../../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -1136,6 +1136,22 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "AccessControlEntryChanged", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "AccessControlExtensionChanged", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -1524,6 +1540,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 + } ] }, { @@ -1810,6 +1849,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 + } ] }, { @@ -3574,6 +3636,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 + } ] }, { @@ -3716,6 +3808,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SoftwareFault", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -4784,6 +4885,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 + } ] }, { @@ -5070,6 +5187,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 + } ] }, { @@ -10392,6 +10532,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 + } ] }, { @@ -11508,6 +11664,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "BatFaultChange", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -12032,6 +12197,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SwitchLatched", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -12350,6 +12524,15 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "StateChange", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -13420,6 +13603,36 @@ "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 + }, + { + "name": "LockUserChange", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -14532,6 +14745,92 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SupplyVoltageLow", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SupplyVoltageHigh", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "PowerMissingPhase", + "code": 2, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SystemPressureLow", + "code": 3, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SystemPressureHigh", + "code": 4, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "DryRunning", + "code": 5, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "MotorTemperatureHigh", + "code": 6, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "PumpMotorFatalFailure", + "code": 7, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "ElectronicTemperatureHigh", + "code": 8, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "PumpBlocked", + "code": 9, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "SensorFailure", + "code": 10, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "ElectronicNonFatalFailure", + "code": 11, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -17741,7 +18040,7 @@ "outgoing": 1 }, { - "name": "StopPlayback", + "name": "Stop", "code": 2, "mfgCode": null, "source": "client", @@ -17885,7 +18184,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "PlaybackPosition", + "type": "PlaybackPositionStruct", "included": 0, "storageOption": "External", "singleton": 0, @@ -18611,7 +18910,7 @@ "code": 1, "mfgCode": null, "side": "server", - "type": "ApplicationEP", + "type": "ApplicationEPStruct", "included": 0, "storageOption": "External", "singleton": 0, @@ -20764,6 +21063,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 + } ] } ] @@ -24740,5 +25055,6 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 7c763422285ad8..ea68dc1a323d2b 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 89, + "featureLevel": 90, "creator": "zap", "keyValuePairs": [ { @@ -1130,6 +1130,22 @@ "maxInterval": 65534, "reportableChange": 0 } + ], + "events": [ + { + "name": "AccessControlEntryChanged", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + }, + { + "name": "AccessControlExtensionChanged", + "code": 1, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -1518,6 +1534,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 + } ] }, { @@ -1804,6 +1843,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 + } ] }, { @@ -2796,6 +2858,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 + } ] }, { @@ -2938,6 +3030,15 @@ "maxInterval": 65344, "reportableChange": 0 } + ], + "events": [ + { + "name": "SoftwareFault", + "code": 0, + "mfgCode": null, + "side": "server", + "included": 1 + } ] }, { @@ -4024,6 +4125,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 + } ] }, { @@ -4310,6 +4427,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 + } ] }, { @@ -8194,5 +8334,6 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 4004a32947a321..7ebc33a8868b8c 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -1491,6 +1491,84 @@ #define ZAP_GENERATED_COMMANDS_INDEX(index) (&generatedCommands[index]) +// clang-format off +#define GENERATED_EVENT_COUNT 41 +#define GENERATED_EVENTS { \ + /* Endpoint: 0, Cluster: Access Control (server) */ \ + /* EventList (index=0) */ \ + 0x00000000, /* AccessControlEntryChanged */ \ + 0x00000001, /* AccessControlExtensionChanged */ \ + /* Endpoint: 0, Cluster: Basic Information (server) */ \ + /* EventList (index=2) */ \ + 0x00000000, /* StartUp */ \ + 0x00000001, /* ShutDown */ \ + 0x00000002, /* Leave */ \ + /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ + /* EventList (index=5) */ \ + 0x00000000, /* StateTransition */ \ + 0x00000001, /* VersionApplied */ \ + 0x00000002, /* DownloadError */ \ + /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + /* EventList (index=8) */ \ + 0x00000000, /* HardwareFaultChange */ \ + 0x00000001, /* RadioFaultChange */ \ + 0x00000002, /* NetworkFaultChange */ \ + 0x00000003, /* BootReason */ \ + /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + /* EventList (index=12) */ \ + 0x00000000, /* SoftwareFault */ \ + /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + /* EventList (index=13) */ \ + 0x00000000, /* ConnectionStatus */ \ + 0x00000001, /* NetworkFaultChange */ \ + /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + /* EventList (index=15) */ \ + 0x00000000, /* Disconnection */ \ + 0x00000001, /* AssociationFailure */ \ + 0x00000002, /* ConnectionStatus */ \ + /* Endpoint: 1, Cluster: Actions (server) */ \ + /* EventList (index=18) */ \ + 0x00000000, /* StateChanged */ \ + 0x00000001, /* ActionFailed */ \ + /* Endpoint: 1, Cluster: Power Source (server) */ \ + /* EventList (index=20) */ \ + 0x00000001, /* BatFaultChange */ \ + /* Endpoint: 1, Cluster: Switch (server) */ \ + /* EventList (index=21) */ \ + 0x00000000, /* SwitchLatched */ \ + /* Endpoint: 1, Cluster: Boolean State (server) */ \ + /* EventList (index=22) */ \ + 0x00000000, /* StateChange */ \ + /* Endpoint: 1, Cluster: Door Lock (server) */ \ + /* EventList (index=23) */ \ + 0x00000000, /* DoorLockAlarm */ \ + 0x00000002, /* LockOperation */ \ + 0x00000003, /* LockOperationError */ \ + 0x00000004, /* LockUserChange */ \ + /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ + /* EventList (index=27) */ \ + 0x00000000, /* SupplyVoltageLow */ \ + 0x00000001, /* SupplyVoltageHigh */ \ + 0x00000002, /* PowerMissingPhase */ \ + 0x00000003, /* SystemPressureLow */ \ + 0x00000004, /* SystemPressureHigh */ \ + 0x00000005, /* DryRunning */ \ + 0x00000006, /* MotorTemperatureHigh */ \ + 0x00000007, /* PumpMotorFatalFailure */ \ + 0x00000008, /* ElectronicTemperatureHigh */ \ + 0x00000009, /* PumpBlocked */ \ + 0x0000000A, /* SensorFailure */ \ + 0x0000000B, /* ElectronicNonFatalFailure */ \ + /* Endpoint: 1, Cluster: Unit Testing (server) */ \ + /* EventList (index=39) */ \ + 0x00000001, /* TestEvent */ \ + 0x00000002, /* TestFabricScopedEvent */ \ +} + +// clang-format on + +#define ZAP_GENERATED_EVENTS_INDEX(index) (&generatedEvents[index]) + // Cluster function static arrays #define GENERATED_FUNCTION_ARRAYS \ const EmberAfGenericClusterFunction chipFuncArrayIdentifyServer[] = { \ @@ -1906,6 +1984,8 @@ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Groups (server) */ \ @@ -1917,6 +1997,8 @@ .functions = chipFuncArrayGroupsServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -1928,6 +2010,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Binding (server) */ \ @@ -1939,6 +2023,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Access Control (server) */ \ @@ -1950,6 +2036,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 0 ), \ + .eventCount = 2, \ },\ { \ /* Endpoint: 0, Cluster: Basic Information (server) */ \ @@ -1961,6 +2049,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 2 ), \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ @@ -1972,6 +2062,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ @@ -1983,6 +2075,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 5 ), \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ @@ -1994,6 +2088,8 @@ .functions = chipFuncArrayLocalizationConfigurationServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ @@ -2005,6 +2101,8 @@ .functions = chipFuncArrayTimeFormatLocalizationServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Unit Localization (server) */ \ @@ -2016,6 +2114,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Power Source Configuration (server) */ \ @@ -2027,6 +2127,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Power Source (server) */ \ @@ -2038,6 +2140,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Commissioning (server) */ \ @@ -2049,6 +2153,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ @@ -2060,6 +2166,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ @@ -2071,6 +2179,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ @@ -2082,6 +2192,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 8 ), \ + .eventCount = 4, \ },\ { \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ @@ -2093,6 +2205,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 12 ), \ + .eventCount = 1, \ },\ { \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ @@ -2104,6 +2218,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 13 ), \ + .eventCount = 2, \ },\ { \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ @@ -2115,6 +2231,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 15 ), \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ @@ -2126,6 +2244,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ @@ -2137,6 +2257,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ @@ -2148,6 +2270,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -2159,6 +2283,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ @@ -2170,6 +2296,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: User Label (server) */ \ @@ -2181,6 +2309,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ @@ -2192,6 +2322,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fault Injection (server) */ \ @@ -2203,6 +2335,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Identify (server) */ \ @@ -2214,6 +2348,8 @@ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -2225,6 +2361,8 @@ .functions = chipFuncArrayGroupsServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ @@ -2236,6 +2374,8 @@ .functions = chipFuncArrayScenesServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 102 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ @@ -2247,6 +2387,8 @@ .functions = chipFuncArrayOnOffServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/off Switch Configuration (server) */ \ @@ -2258,6 +2400,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Level Control (server) */ \ @@ -2269,6 +2413,8 @@ .functions = chipFuncArrayLevelControlServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 116 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Binary Input (Basic) (server) */ \ @@ -2280,6 +2426,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ @@ -2291,6 +2439,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Binding (server) */ \ @@ -2302,6 +2452,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Actions (server) */ \ @@ -2313,6 +2465,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 18 ), \ + .eventCount = 2, \ },\ { \ /* Endpoint: 1, Cluster: Power Source (server) */ \ @@ -2324,6 +2478,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 20 ), \ + .eventCount = 1, \ },\ { \ /* Endpoint: 1, Cluster: Switch (server) */ \ @@ -2335,6 +2491,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 21 ), \ + .eventCount = 1, \ },\ { \ /* Endpoint: 1, Cluster: Fixed Label (server) */ \ @@ -2346,6 +2504,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: User Label (server) */ \ @@ -2357,6 +2517,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Boolean State (server) */ \ @@ -2368,6 +2530,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 22 ), \ + .eventCount = 1, \ },\ { \ /* Endpoint: 1, Cluster: Mode Select (server) */ \ @@ -2379,6 +2543,8 @@ .functions = chipFuncArrayModeSelectServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 125 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ @@ -2390,6 +2556,8 @@ .functions = chipFuncArrayDoorLockServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 127 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 142 ) ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 23 ), \ + .eventCount = 4, \ },\ { \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ @@ -2401,6 +2569,8 @@ .functions = chipFuncArrayWindowCoveringServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 148 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Barrier Control (server) */ \ @@ -2412,6 +2582,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 156 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ @@ -2423,6 +2595,8 @@ .functions = chipFuncArrayPumpConfigurationAndControlServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 27 ), \ + .eventCount = 12, \ },\ { \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ @@ -2434,6 +2608,8 @@ .functions = chipFuncArrayThermostatServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 159 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ @@ -2445,6 +2621,8 @@ .functions = chipFuncArrayFanControlServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ @@ -2456,6 +2634,8 @@ .functions = chipFuncArrayThermostatUserInterfaceConfigurationServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Color Control (server) */ \ @@ -2467,6 +2647,8 @@ .functions = chipFuncArrayColorControlServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 161 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ @@ -2478,6 +2660,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ @@ -2489,6 +2673,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ @@ -2500,6 +2686,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ @@ -2511,6 +2699,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ @@ -2522,6 +2712,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ @@ -2533,6 +2725,8 @@ .functions = chipFuncArrayOccupancySensingServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ @@ -2544,6 +2738,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Channel (server) */ \ @@ -2555,6 +2751,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ @@ -2566,6 +2764,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 181 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 183 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ @@ -2577,6 +2777,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Media Input (server) */ \ @@ -2588,6 +2790,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 185 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Low Power (server) */ \ @@ -2599,6 +2803,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 190 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Keypad Input (server) */ \ @@ -2610,6 +2816,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ @@ -2621,6 +2829,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Audio Output (server) */ \ @@ -2632,6 +2842,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ @@ -2643,6 +2855,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ @@ -2654,6 +2868,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Account Login (server) */ \ @@ -2665,6 +2881,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ @@ -2676,6 +2894,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ @@ -2687,6 +2907,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 196 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 215 ) ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 39 ), \ + .eventCount = 2, \ },\ { \ /* Endpoint: 2, Cluster: Groups (server) */ \ @@ -2698,6 +2920,8 @@ .functions = chipFuncArrayGroupsServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 225 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 232 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ @@ -2709,6 +2933,8 @@ .functions = chipFuncArrayOnOffServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 237 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ @@ -2720,6 +2946,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: Power Source (server) */ \ @@ -2731,6 +2959,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ @@ -2742,6 +2972,8 @@ .functions = chipFuncArrayOccupancySensingServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \ @@ -2753,6 +2985,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 241 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 248 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ } diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index 492a6faf116f7c..16670c0d7a9957 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -548,6 +548,47 @@ #define ZAP_GENERATED_COMMANDS_INDEX(index) (&generatedCommands[index]) +// clang-format off +#define GENERATED_EVENT_COUNT 18 +#define GENERATED_EVENTS { \ + /* Endpoint: 0, Cluster: Access Control (server) */ \ + /* EventList (index=0) */ \ + 0x00000000, /* AccessControlEntryChanged */ \ + 0x00000001, /* AccessControlExtensionChanged */ \ + /* Endpoint: 0, Cluster: Basic Information (server) */ \ + /* EventList (index=2) */ \ + 0x00000000, /* StartUp */ \ + 0x00000001, /* ShutDown */ \ + 0x00000002, /* Leave */ \ + /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ + /* EventList (index=5) */ \ + 0x00000000, /* StateTransition */ \ + 0x00000001, /* VersionApplied */ \ + 0x00000002, /* DownloadError */ \ + /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + /* EventList (index=8) */ \ + 0x00000000, /* HardwareFaultChange */ \ + 0x00000001, /* RadioFaultChange */ \ + 0x00000002, /* NetworkFaultChange */ \ + 0x00000003, /* BootReason */ \ + /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ + /* EventList (index=12) */ \ + 0x00000000, /* SoftwareFault */ \ + /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ + /* EventList (index=13) */ \ + 0x00000000, /* ConnectionStatus */ \ + 0x00000001, /* NetworkFaultChange */ \ + /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ + /* EventList (index=15) */ \ + 0x00000000, /* Disconnection */ \ + 0x00000001, /* AssociationFailure */ \ + 0x00000002, /* ConnectionStatus */ \ +} + +// clang-format on + +#define ZAP_GENERATED_EVENTS_INDEX(index) (&generatedEvents[index]) + // Cluster function static arrays #define GENERATED_FUNCTION_ARRAYS \ const EmberAfGenericClusterFunction chipFuncArrayGroupsServer[] = { \ @@ -766,6 +807,8 @@ .functions = chipFuncArrayGroupsServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 7 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -777,6 +820,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Access Control (server) */ \ @@ -788,6 +833,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 0 ), \ + .eventCount = 2, \ },\ { \ /* Endpoint: 0, Cluster: Basic Information (server) */ \ @@ -799,6 +846,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 2 ), \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ @@ -810,6 +859,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ @@ -821,6 +872,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 12 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 5 ), \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ @@ -832,6 +885,8 @@ .functions = chipFuncArrayLocalizationConfigurationServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Time Format Localization (server) */ \ @@ -843,6 +898,8 @@ .functions = chipFuncArrayTimeFormatLocalizationServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Commissioning (server) */ \ @@ -854,6 +911,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 14 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ @@ -865,6 +924,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 22 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 29 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ @@ -876,6 +937,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ @@ -887,6 +950,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 8 ), \ + .eventCount = 4, \ },\ { \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ @@ -898,6 +963,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 12 ), \ + .eventCount = 1, \ },\ { \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ @@ -909,6 +976,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 13 ), \ + .eventCount = 2, \ },\ { \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ @@ -920,6 +989,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 15 ), \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ @@ -931,6 +1002,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Switch (server) */ \ @@ -942,6 +1015,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ @@ -953,6 +1028,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ @@ -964,6 +1041,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -975,6 +1054,8 @@ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ @@ -986,6 +1067,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: User Label (server) */ \ @@ -997,6 +1080,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Identify (server) */ \ @@ -1008,6 +1093,8 @@ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -1019,6 +1106,8 @@ .functions = chipFuncArrayGroupsServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ @@ -1030,6 +1119,8 @@ .functions = chipFuncArrayOnOffServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Level Control (server) */ \ @@ -1041,6 +1132,8 @@ .functions = chipFuncArrayLevelControlServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ @@ -1052,6 +1145,8 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Color Control (server) */ \ @@ -1063,6 +1158,8 @@ .functions = chipFuncArrayColorControlServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ @@ -1074,6 +1171,8 @@ .functions = chipFuncArrayOccupancySensingServer, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ + .eventList = nullptr, \ + .eventCount = 0, \ },\ } diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 5fd71df91d0bec..d81441a69ab836 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2023.1.31' +MIN_ZAP_VERSION = '2023.2.3' class ZapTool: diff --git a/scripts/zap.json b/scripts/zap.json index ef22bdaceecd91..0ad4e76eb5121d 100644 --- a/scripts/zap.json +++ b/scripts/zap.json @@ -8,7 +8,7 @@ "mac-arm64", "windows-amd64" ], - "tags": ["version:2@v2023.01.31-nightly.1"] + "tags": ["version:2@v2023.02.03-nightly.1"] } ] } diff --git a/src/app/GlobalAttributes.h b/src/app/GlobalAttributes.h index 82980a798d2072..8f35d2e93e9ee1 100644 --- a/src/app/GlobalAttributes.h +++ b/src/app/GlobalAttributes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Project CHIP Authors + * Copyright (c) 2022-2023 Project CHIP Authors * All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,6 +31,7 @@ namespace app { constexpr AttributeId GlobalAttributesNotInMetadata[] = { Clusters::Globals::Attributes::GeneratedCommandList::Id, Clusters::Globals::Attributes::AcceptedCommandList::Id, + Clusters::Globals::Attributes::EventList::Id, Clusters::Globals::Attributes::AttributeList::Id, }; diff --git a/src/app/tests/TestAttributePathExpandIterator.cpp b/src/app/tests/TestAttributePathExpandIterator.cpp index 5daaec172efabc..fa2d5d62462028 100644 --- a/src/app/tests/TestAttributePathExpandIterator.cpp +++ b/src/app/tests/TestAttributePathExpandIterator.cpp @@ -49,17 +49,20 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext) { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint1, MockClusterId(2), MockAttributeId(1) }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id }, @@ -67,6 +70,7 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext) { kMockEndpoint2, MockClusterId(2), MockAttributeId(2) }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id }, @@ -75,12 +79,14 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext) { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint3, MockClusterId(1), MockAttributeId(1) }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id }, @@ -90,16 +96,19 @@ void TestAllWildcard(nlTestSuite * apSuite, void * apContext) { kMockEndpoint3, MockClusterId(2), MockAttributeId(4) }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AttributeList::Id }, }; @@ -205,6 +214,7 @@ void TestWildcardAttribute(nlTestSuite * apSuite, void * apContext) { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id }, }; @@ -277,17 +287,20 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext) { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint1, MockClusterId(2), MockAttributeId(1) }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id }, @@ -295,6 +308,7 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext) { kMockEndpoint2, MockClusterId(2), MockAttributeId(2) }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id }, @@ -303,12 +317,14 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext) { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint3, MockClusterId(1), MockAttributeId(1) }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id }, @@ -318,16 +334,19 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext) { kMockEndpoint3, MockClusterId(2), MockAttributeId(4) }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::ClusterRevision::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::FeatureMap::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) }, { kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id }, @@ -341,6 +360,7 @@ void TestMultipleClusInfo(nlTestSuite * apSuite, void * apContext) { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id }, + { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id }, { kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id }, { kMockEndpoint2, MockClusterId(3), MockAttributeId(3) }, }; diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml index 8dce39f49b6d89..9b38f7e69b2773 100644 --- a/src/app/tests/suites/TestBasicInformation.yaml +++ b/src/app/tests/suites/TestBasicInformation.yaml @@ -79,6 +79,7 @@ tests: 19, 0xFFF8, # GeneratedCommandList 0xFFF9, # AcceptedCommandList + 0xFFFA, # EventList 0xFFFB, # AttributeList 0xFFFC, # FeatureMap 0xFFFD, # ClusterRevision diff --git a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml index ed79c6ef263ded..c8836e4620e4fa 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 2, 3, 4, 65528, 65529, 65531, 65532, 65533] + contains: [0, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads optional attribute (Extension) in AttributeList" PICS: ACL.S.A0001 diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml index 45f9364ace4ea5..cd0880cf1a5b3d 100644 --- a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(SetupURL) in AttributeList" PICS: ACT.S.A0002 diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml index b9db40f6d33ab9..7440d2a8a9098d 100644 --- a/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml +++ b/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml @@ -55,7 +55,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml index 1eb85ffb059845..47970831c32c33 100644 --- a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml @@ -55,7 +55,8 @@ tests: response: constraints: type: list - contains: [2, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533] + contains: + [2, 4, 5, 6, 7, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(VendorName) in AttributeList" PICS: APBSC.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml index f0d4f63cd9fc45..566a735ad7fa5d 100644 --- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml @@ -65,7 +65,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(CatalogList) in AttributeList" PICS: APPLAUNCHER.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml index 24dd9c6273e427..9543f3cc8cc298 100644 --- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml @@ -56,7 +56,7 @@ tests: response: constraints: type: list - contains: [0, 1, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml index b8370f8312d0a9..8dec6a7b04c437 100644 --- a/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads AcceptedCommandList from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml index 0c4111d8f07561..12261b41dc4d5d 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml index 0ce8cfd2aa1e26..1d8cbf43c4e39e 100644 --- a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml @@ -56,7 +56,7 @@ tests: response: constraints: type: list - contains: [17, 65528, 65529, 65531, 65532, 65533] + contains: [17, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads optional attribute(VendorName) in AttributeList" PICS: BRBINFO.S.A0001 diff --git a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml index 5c642d522257a0..010aae36f29182 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml @@ -99,7 +99,19 @@ tests: response: constraints: type: list - contains: [8, 15, 16385, 16394, 65528, 65529, 65531, 65532, 65533] + contains: + [ + 8, + 15, + 16385, + 16394, + 65528, + 65529, + 65530, + 65531, + 65532, + 65533, + ] - label: "Read the optional attribute(CurrentHue) in AttributeList" PICS: CC.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml index e73e45a1efcaad..26c8b279b34f08 100644 --- a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml @@ -53,7 +53,8 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533] + contains: + [0, 1, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml index f9bd3c06a3128f..32ad56b3ccb316 100644 --- a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml @@ -73,7 +73,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(ChannelList): AttributeList" PICS: CHANNEL.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml index 8e167b434b01b1..c27a40506f57b8 100644 --- a/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CNET_1_3.yaml @@ -75,7 +75,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read mandatory attributes in AttributeList if diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml index 5de7f13e19c1e7..2858274c4d1ba8 100644 --- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml @@ -76,7 +76,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(AcceptHeader): AttributeList" PICS: CONTENTLAUNCHER.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml index 17462b1eea9258..5f35602d0c5a80 100644 --- a/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml @@ -54,7 +54,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 3, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml index 99d74ea965b7de..cf966979f6411d 100644 --- a/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGETH_1_1.yaml @@ -73,7 +73,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads optional attribute(PHYRate) in AttributeList" PICS: DGETH.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml index 805bdf4065ab20..4a1ff09d284b30 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml @@ -54,7 +54,7 @@ tests: response: constraints: type: list - contains: [0, 1, 8, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 8, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read optional attribute(UpTime) in AttributeList" PICS: DGGEN.S.A0002 diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml index 50ea61770b6227..a2b9949e88860b 100644 --- a/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGSW_1_1.yaml @@ -66,7 +66,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads optional attribute(ThreadMetrics) in AttributeList" PICS: DGSW.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml index a8e578cbbe51af..9c313ce9449e2d 100644 --- a/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_1_1.yaml @@ -76,7 +76,8 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533] + contains: + [0, 1, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads Feature dependent(DGWIFI.S.F00) attributes in attributeList diff --git a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml index 76dbc6c3572ba7..6f8eddabf720c6 100644 --- a/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DLOG_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads AcceptedCommandList from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_1_1.yaml index f511e3e07b82d2..e71b55d128e863 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_1_1.yaml @@ -148,7 +148,8 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 37, 38, 65528, 65529, 65531, 65532, 65533] + contains: + [0, 1, 2, 37, 38, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads Feature dependent(DRLK.S.F05) attributes in AttributeList" diff --git a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml index 11a5dfb3d8af40..895cca8c2d460b 100644 --- a/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLABEL_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads AcceptedCommandList from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml index 5b89e14c602d67..be340de67be713 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(Tolerance) in AttributeList" PICS: FLW.S.A0003 diff --git a/src/app/tests/suites/certification/Test_TC_G_1_1.yaml b/src/app/tests/suites/certification/Test_TC_G_1_1.yaml index 8fa6363308a33d..1265a60c53cca8 100644 --- a/src/app/tests/suites/certification/Test_TC_G_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_G_1_1.yaml @@ -63,7 +63,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads AcceptedCommandList from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml index 1a3061d7480f1d..5d471452e145ed 100644 --- a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(Tolerance) in AttributeList" PICS: ILL.S.A0003 diff --git a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml index 9bfd93eb98c13e..f2905bdc2cd539 100644 --- a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml @@ -63,7 +63,7 @@ tests: response: constraints: type: list - contains: [0, 1, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml index e763745f1a8d63..d1227301f92061 100644 --- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml @@ -83,7 +83,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml index 3322dbbe613ffe..91a3cb570fe151 100644 --- a/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LCFG_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads AcceptedCommandList from DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml index 512da9be8ed091..4db273ddbeda48 100644 --- a/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml @@ -53,7 +53,7 @@ tests: command: "readAttribute" attribute: "AttributeList" response: - value: [65528, 65529, 65531, 65532, 65533] + value: [65528, 65529, 65530, 65531, 65532, 65533] constraints: type: list diff --git a/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml b/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml index 8e994af41e62d5..68d92701675d02 100644 --- a/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_LTIME_1_2.yaml @@ -57,7 +57,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads optional attribute(ActiveCalendarType) in AttributeList from diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml index d2711b06749927..7b005bd8c195ef 100644 --- a/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_LUNIT_1_2.yaml @@ -65,7 +65,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads Feature dependent(LUNIT.S.F00) attribute in AttributeList" diff --git a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml index 3d03e15942daab..8a2de9aa8962d6 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml @@ -81,7 +81,7 @@ tests: response: constraints: type: list - contains: [0, 15, 17, 65528, 65529, 65531, 65532, 65533] + contains: [0, 15, 17, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(StartUpCurrentLevel and RemainingTime) in diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml index 797e74b9fb52a7..8c40d2e7c92c59 100644 --- a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml @@ -65,7 +65,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65532, 65533] + contains: [65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(InputList) in AttributeList" PICS: MEDIAINPUT.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml index 908fa66a1be126..23b5d235d46f1f 100644 --- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml @@ -76,7 +76,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(StartTime) in AttributeList" PICS: MEDIAPLAYBACK.S.A0001 diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml index 7d3ee7e38b1055..974bdd021d0994 100644 --- a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml @@ -63,7 +63,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 3, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads the optional attribute(StartUpMode) in AttributeList from diff --git a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml index 04faf9b7de593f..89d9e7e425d357 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml index b8973da1a275d5..43682ed94c0925 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml @@ -63,7 +63,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the feature dependent(OO.S.F00) attribute in AttributeList" PICS: OO.S.F00 diff --git a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml index d8805c991eee8c..76a25e562cddb8 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml @@ -122,7 +122,21 @@ tests: constraints: type: list contains: - [0, 1, 2, 17, 18, 19, 32, 65528, 65529, 65531, 65532, 65533] + [ + 0, + 1, + 2, + 17, + 18, + 19, + 32, + 65528, + 65529, + 65530, + 65531, + 65532, + 65533, + ] - label: "TH reads optional attribute(MinConstPressure) attribute in diff --git a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml index 1469e777eb197a..e1840300630698 100644 --- a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml @@ -63,7 +63,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(ScaledValue) in AttributeList" PICS: PRS.S.A0010 diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml index 0de2b658fba249..77370100b26906 100644 --- a/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads the AcceptedCommandList attribute from the DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml index 144b370114db90..b5ca42104a5ed3 100644 --- a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml @@ -90,7 +90,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the Feature dependent(PS.S.F00-WIRED) attribute in AttributeList" diff --git a/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml index 3d7c44a987f486..3e79f5985a0662 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(Tolerance) in AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml index 838dd800a7ee60..96d7c64a476937 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_1_1.yaml @@ -109,7 +109,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AttributeList" PICS: "!SWTCH.S.F04" @@ -118,7 +118,7 @@ tests: response: constraints: type: list - contains: [0, 1, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml b/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml index ce8925c828e004..18e83e529e5219 100644 --- a/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml @@ -55,7 +55,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(CurrentTarget) in AttributeList" PICS: TGTNAV.S.A0001 diff --git a/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml index cfbc4c77511948..45a5ae525a243e 100644 --- a/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the optional attribute(Tolerance) in AttributeList" PICS: TMP.S.A0003 diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml index 649a147f1ea291..a71ef13b038c23 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml @@ -110,7 +110,7 @@ tests: response: constraints: type: list - contains: [0, 27, 28, 65528, 65529, 65531, 65532, 65533] + contains: [0, 27, 28, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the Feature dependent(TSTAT.S.F00(HEAT)) attribute in diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml index 179d9c7257ff6f..44afa84031bdbe 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533] + contains: [0, 1, 2, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml index 71b8f58ae16a24..7e2382e9a0310c 100644 --- a/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml @@ -53,7 +53,7 @@ tests: response: constraints: type: list - contains: [0, 65528, 65529, 65531, 65532, 65533] + contains: [0, 65528, 65529, 65530, 65531, 65532, 65533] - label: "Read the global attribute: AcceptedCommandList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml index 827e6309c19ac5..d781600ddf35c4 100644 --- a/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml @@ -55,7 +55,7 @@ tests: response: constraints: type: list - contains: [65528, 65529, 65531, 65531, 65533] + contains: [65528, 65529, 65530, 65531, 65531, 65533] - label: "Read the optional attribute(MACAddress) in AttributeList" PICS: WAKEONLAN.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml index bf080c6971aad8..de7108dea74454 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml @@ -107,7 +107,8 @@ tests: response: constraints: type: list - contains: [0, 7, 10, 13, 23, 65528, 65529, 65531, 65532, 65533] + contains: + [0, 7, 10, 13, 23, 65528, 65529, 65530, 65531, 65532, 65533] - label: "TH reads optional attribute(SafetyStatus) in AttributeList" PICS: WNCV.S.Afffb && WNCV.S.A001a diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h index 74a7dd426dd611..d284d93961dd0d 100644 --- a/src/app/util/af-types.h +++ b/src/app/util/af-types.h @@ -108,6 +108,17 @@ typedef struct * is a response to client command request. Can be nullptr or terminated by 0xFFFF_FFFF. */ const chip::CommandId * generatedCommandList; + + /** + * Pointer to an array of event IDs of the events supported by the cluster instance. + * Can be nullptr. + */ + const chip::EventId * eventList; + + /** + * Total number of events supported by the cluster instance (in eventList array). + */ + uint16_t eventCount; } EmberAfCluster; /** diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp index 3c9fac5a09a5b6..1b5f9659ae96e4 100644 --- a/src/app/util/attribute-storage.cpp +++ b/src/app/util/attribute-storage.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (c) 2020 Project CHIP Authors + * Copyright (c) 2020-2023 Project CHIP Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -82,6 +82,10 @@ GENERATED_FUNCTION_ARRAYS constexpr const chip::CommandId generatedCommands[] = GENERATED_COMMANDS; #endif // GENERATED_COMMANDS +#if (defined(GENERATED_EVENTS) && (GENERATED_EVENT_COUNT > 0)) +constexpr const chip::EventId generatedEvents[] = GENERATED_EVENTS; +#endif // GENERATED_EVENTS + constexpr const EmberAfAttributeMetadata generatedAttributes[] = GENERATED_ATTRIBUTES; constexpr const EmberAfCluster generatedClusters[] = GENERATED_CLUSTERS; constexpr const EmberAfEndpointType generatedEmberAfEndpointTypes[] = GENERATED_ENDPOINT_TYPES; diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp index b4852caa022429..ff9bff7a2ddc38 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2021 Project CHIP Authors + * Copyright (c) 2021-2023 Project CHIP Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -383,12 +383,9 @@ CHIP_ERROR GlobalAttributeReader::Read(const ConcreteReadAttributePath & aPath, AttributeId id = mCluster->attributes[i].attributeId; constexpr auto lastGlobalId = GlobalAttributesNotInMetadata[ArraySize(GlobalAttributesNotInMetadata) - 1]; // We are relying on GlobalAttributesNotInMetadata not having - // any gaps in their ids here, but for now they do because we - // have no EventList support. So this assert is not quite - // right. There should be a "- 1" on the right-hand side of the - // equals sign. - static_assert(lastGlobalId - GlobalAttributesNotInMetadata[0] == ArraySize(GlobalAttributesNotInMetadata), - "Ids in GlobalAttributesNotInMetadata not consecutive (except EventList)"); + // any gaps in their ids here. + static_assert(lastGlobalId - GlobalAttributesNotInMetadata[0] == ArraySize(GlobalAttributesNotInMetadata) - 1, + "Ids in GlobalAttributesNotInMetadata not consecutive"); if (!addedExtraGlobals && id > lastGlobalId) { for (const auto & globalId : GlobalAttributesNotInMetadata) @@ -408,6 +405,14 @@ CHIP_ERROR GlobalAttributeReader::Read(const ConcreteReadAttributePath & aPath, } return CHIP_NO_ERROR; }); + case EventList::Id: + return aEncoder.EncodeList([this](const auto & encoder) { + for (size_t i = 0; i < mCluster->eventCount; ++i) + { + ReturnErrorOnFailure(encoder.Encode(mCluster->eventList[i])); + } + return CHIP_NO_ERROR; + }); case AcceptedCommandList::Id: return EncodeCommandList(aPath, aEncoder, &CommandHandlerInterface::EnumerateAcceptedCommands, mCluster->acceptedCommandList); diff --git a/src/app/zap-templates/templates/app/endpoint_config.zapt b/src/app/zap-templates/templates/app/endpoint_config.zapt index 3f8938766fcba2..92574b71fa912e 100644 --- a/src/app/zap-templates/templates/app/endpoint_config.zapt +++ b/src/app/zap-templates/templates/app/endpoint_config.zapt @@ -39,6 +39,13 @@ #define ZAP_GENERATED_COMMANDS_INDEX(index) (&generatedCommands[index]) +// clang-format off +#define GENERATED_EVENT_COUNT {{ chip_endpoint_generated_event_count }} +#define GENERATED_EVENTS {{ chip_endpoint_generated_event_list }} +// clang-format on + +#define ZAP_GENERATED_EVENTS_INDEX(index) (&generatedEvents[index]) + // Cluster function static arrays #define GENERATED_FUNCTION_ARRAYS {{chip_endpoint_generated_functions}} diff --git a/src/app/zap-templates/zcl/data-model/chip/global-attributes.xml b/src/app/zap-templates/zcl/data-model/chip/global-attributes.xml index 9705e4bdb235bb..4b473a8ea26037 100644 --- a/src/app/zap-templates/zcl/data-model/chip/global-attributes.xml +++ b/src/app/zap-templates/zcl/data-model/chip/global-attributes.xml @@ -1,6 +1,6 @@