Skip to content

Commit 2535328

Browse files
emargolispull[bot]
emargolis
authored and
pull[bot]
committed
Updated Lighting App ZAP Files with Supported Events (#25025)
* Updated Lighting App ZAP Files with Supported Events Fixed Test Script ZAP file: - Removed SoftwareFault event from the Software Diagnostics Cluster, which is not implemented for this app. - Removed all Thread Network Diagnostics Cluster events, which are currently not implemented in the SDK at all. Added Supported Events to the Lighting App ZAP Example File * ZAP REGEN
1 parent 7a31e8d commit 2535328

File tree

4 files changed

+138
-40
lines changed

4 files changed

+138
-40
lines changed

‎examples/lighting-app/lighting-common/lighting-app.matter

+15
Original file line numberDiff line numberDiff line change
@@ -1846,6 +1846,8 @@ endpoint 0 {
18461846
}
18471847

18481848
server cluster AccessControl {
1849+
emits event AccessControlEntryChanged;
1850+
emits event AccessControlExtensionChanged;
18491851
callback attribute acl;
18501852
callback attribute extension;
18511853
callback attribute subjectsPerAccessControlEntry default = 4;
@@ -1857,6 +1859,9 @@ endpoint 0 {
18571859
}
18581860

18591861
server cluster BasicInformation {
1862+
emits event StartUp;
1863+
emits event ShutDown;
1864+
emits event Leave;
18601865
callback attribute dataModelRevision default = 10;
18611866
callback attribute vendorName;
18621867
callback attribute vendorID;
@@ -1882,6 +1887,9 @@ endpoint 0 {
18821887
}
18831888

18841889
server cluster OtaSoftwareUpdateRequestor {
1890+
emits event StateTransition;
1891+
emits event VersionApplied;
1892+
emits event DownloadError;
18851893
callback attribute defaultOTAProviders;
18861894
ram attribute updatePossible default = 1;
18871895
ram attribute updateState;
@@ -1934,6 +1942,10 @@ endpoint 0 {
19341942
}
19351943

19361944
server cluster GeneralDiagnostics {
1945+
emits event HardwareFaultChange;
1946+
emits event RadioFaultChange;
1947+
emits event NetworkFaultChange;
1948+
emits event BootReason;
19371949
callback attribute networkInterfaces;
19381950
callback attribute rebootCount;
19391951
callback attribute upTime;
@@ -2025,6 +2037,9 @@ endpoint 0 {
20252037
}
20262038

20272039
server cluster WiFiNetworkDiagnostics {
2040+
emits event Disconnection;
2041+
emits event AssociationFailure;
2042+
emits event ConnectionStatus;
20282043
callback attribute bssid;
20292044
callback attribute securityType;
20302045
callback attribute wiFiVersion;

‎examples/lighting-app/lighting-common/lighting-app.zap

+116-1
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,22 @@
11301130
"maxInterval": 65534,
11311131
"reportableChange": 0
11321132
}
1133+
],
1134+
"events": [
1135+
{
1136+
"name": "AccessControlEntryChanged",
1137+
"code": 0,
1138+
"mfgCode": null,
1139+
"side": "server",
1140+
"included": 1
1141+
},
1142+
{
1143+
"name": "AccessControlExtensionChanged",
1144+
"code": 1,
1145+
"mfgCode": null,
1146+
"side": "server",
1147+
"included": 1
1148+
}
11331149
]
11341150
},
11351151
{
@@ -1518,6 +1534,29 @@
15181534
"maxInterval": 65344,
15191535
"reportableChange": 0
15201536
}
1537+
],
1538+
"events": [
1539+
{
1540+
"name": "StartUp",
1541+
"code": 0,
1542+
"mfgCode": null,
1543+
"side": "server",
1544+
"included": 1
1545+
},
1546+
{
1547+
"name": "ShutDown",
1548+
"code": 1,
1549+
"mfgCode": null,
1550+
"side": "server",
1551+
"included": 1
1552+
},
1553+
{
1554+
"name": "Leave",
1555+
"code": 2,
1556+
"mfgCode": null,
1557+
"side": "server",
1558+
"included": 1
1559+
}
15211560
]
15221561
},
15231562
{
@@ -1804,6 +1843,29 @@
18041843
"maxInterval": 65344,
18051844
"reportableChange": 0
18061845
}
1846+
],
1847+
"events": [
1848+
{
1849+
"name": "StateTransition",
1850+
"code": 0,
1851+
"mfgCode": null,
1852+
"side": "server",
1853+
"included": 1
1854+
},
1855+
{
1856+
"name": "VersionApplied",
1857+
"code": 1,
1858+
"mfgCode": null,
1859+
"side": "server",
1860+
"included": 1
1861+
},
1862+
{
1863+
"name": "DownloadError",
1864+
"code": 2,
1865+
"mfgCode": null,
1866+
"side": "server",
1867+
"included": 1
1868+
}
18071869
]
18081870
},
18091871
{
@@ -2796,6 +2858,36 @@
27962858
"maxInterval": 65344,
27972859
"reportableChange": 0
27982860
}
2861+
],
2862+
"events": [
2863+
{
2864+
"name": "HardwareFaultChange",
2865+
"code": 0,
2866+
"mfgCode": null,
2867+
"side": "server",
2868+
"included": 1
2869+
},
2870+
{
2871+
"name": "RadioFaultChange",
2872+
"code": 1,
2873+
"mfgCode": null,
2874+
"side": "server",
2875+
"included": 1
2876+
},
2877+
{
2878+
"name": "NetworkFaultChange",
2879+
"code": 2,
2880+
"mfgCode": null,
2881+
"side": "server",
2882+
"included": 1
2883+
},
2884+
{
2885+
"name": "BootReason",
2886+
"code": 3,
2887+
"mfgCode": null,
2888+
"side": "server",
2889+
"included": 1
2890+
}
27992891
]
28002892
},
28012893
{
@@ -4310,6 +4402,29 @@
43104402
"maxInterval": 65344,
43114403
"reportableChange": 0
43124404
}
4405+
],
4406+
"events": [
4407+
{
4408+
"name": "Disconnection",
4409+
"code": 0,
4410+
"mfgCode": null,
4411+
"side": "server",
4412+
"included": 1
4413+
},
4414+
{
4415+
"name": "AssociationFailure",
4416+
"code": 1,
4417+
"mfgCode": null,
4418+
"side": "server",
4419+
"included": 1
4420+
},
4421+
{
4422+
"name": "ConnectionStatus",
4423+
"code": 2,
4424+
"mfgCode": null,
4425+
"side": "server",
4426+
"included": 1
4427+
}
43134428
]
43144429
},
43154430
{
@@ -8228,4 +8343,4 @@
82288343
}
82298344
],
82308345
"log": []
8231-
}
8346+
}

‎scripts/tools/zap/tests/inputs/lighting-app.zap

-25
Original file line numberDiff line numberDiff line change
@@ -3030,15 +3030,6 @@
30303030
"maxInterval": 65344,
30313031
"reportableChange": 0
30323032
}
3033-
],
3034-
"events": [
3035-
{
3036-
"name": "SoftwareFault",
3037-
"code": 0,
3038-
"mfgCode": null,
3039-
"side": "server",
3040-
"included": 1
3041-
}
30423033
]
30433034
},
30443035
{
@@ -4125,22 +4116,6 @@
41254116
"maxInterval": 65344,
41264117
"reportableChange": 0
41274118
}
4128-
],
4129-
"events": [
4130-
{
4131-
"name": "ConnectionStatus",
4132-
"code": 0,
4133-
"mfgCode": null,
4134-
"side": "server",
4135-
"included": 1
4136-
},
4137-
{
4138-
"name": "NetworkFaultChange",
4139-
"code": 1,
4140-
"mfgCode": null,
4141-
"side": "server",
4142-
"included": 1
4143-
}
41444119
]
41454120
},
41464121
{

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h

+7-14
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@
549549
#define ZAP_GENERATED_COMMANDS_INDEX(index) (&generatedCommands[index])
550550

551551
// clang-format off
552-
#define GENERATED_EVENT_COUNT 18
552+
#define GENERATED_EVENT_COUNT 15
553553
#define GENERATED_EVENTS { \
554554
/* Endpoint: 0, Cluster: Access Control (server) */ \
555555
/* EventList (index=0) */ \
@@ -571,15 +571,8 @@
571571
0x00000001, /* RadioFaultChange */ \
572572
0x00000002, /* NetworkFaultChange */ \
573573
0x00000003, /* BootReason */ \
574-
/* Endpoint: 0, Cluster: Software Diagnostics (server) */ \
575-
/* EventList (index=12) */ \
576-
0x00000000, /* SoftwareFault */ \
577-
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
578-
/* EventList (index=13) */ \
579-
0x00000000, /* ConnectionStatus */ \
580-
0x00000001, /* NetworkFaultChange */ \
581574
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
582-
/* EventList (index=15) */ \
575+
/* EventList (index=12) */ \
583576
0x00000000, /* Disconnection */ \
584577
0x00000001, /* AssociationFailure */ \
585578
0x00000002, /* ConnectionStatus */ \
@@ -963,8 +956,8 @@
963956
.functions = NULL, \
964957
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\
965958
.generatedCommandList = nullptr ,\
966-
.eventList = ZAP_GENERATED_EVENTS_INDEX( 12 ), \
967-
.eventCount = 1, \
959+
.eventList = nullptr, \
960+
.eventCount = 0, \
968961
},\
969962
{ \
970963
/* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \
@@ -976,8 +969,8 @@
976969
.functions = NULL, \
977970
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\
978971
.generatedCommandList = nullptr ,\
979-
.eventList = ZAP_GENERATED_EVENTS_INDEX( 13 ), \
980-
.eventCount = 2, \
972+
.eventList = nullptr, \
973+
.eventCount = 0, \
981974
},\
982975
{ \
983976
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
@@ -989,7 +982,7 @@
989982
.functions = NULL, \
990983
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\
991984
.generatedCommandList = nullptr ,\
992-
.eventList = ZAP_GENERATED_EVENTS_INDEX( 15 ), \
985+
.eventList = ZAP_GENERATED_EVENTS_INDEX( 12 ), \
993986
.eventCount = 3, \
994987
},\
995988
{ \

0 commit comments

Comments
 (0)