Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fixed All Clusters App ZAP Test Script File #25045

Merged
merged 3 commits into from
Feb 15, 2023
Merged

Fixed All Clusters App ZAP Test Script File #25045

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00b365b
Fixed All Clusters App ZAP Test Script File
emargolis Feb 12, 2023
ad5bc0d
ZAP REGEN
emargolis Feb 12, 2023
a5468b5
Merge branch 'master' into emargolis/feature/fix-scripts-all-clusters…
emargolis Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 0 additions & 136 deletions scripts/tools/zap/tests/inputs/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4885,22 +4885,6 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "ConnectionStatus",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "NetworkFaultChange",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -10532,22 +10516,6 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "StateChanged",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
},
{
"name": "ActionFailed",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -11664,15 +11632,6 @@
"maxInterval": 65344,
"reportableChange": 0
}
],
"events": [
{
"name": "BatFaultChange",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -12524,15 +12483,6 @@
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "StateChange",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down Expand Up @@ -14745,92 +14695,6 @@
"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
}
]
},
{
Expand Down
66 changes: 19 additions & 47 deletions scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,7 @@
#define ZAP_GENERATED_COMMANDS_INDEX(index) (&generatedCommands[index])

// clang-format off
#define GENERATED_EVENT_COUNT 41
#define GENERATED_EVENT_COUNT 23
#define GENERATED_EVENTS { \
/* Endpoint: 0, Cluster: Access Control (server) */ \
/* EventList (index=0) */ \
Expand All @@ -1517,50 +1517,22 @@
/* 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) */ \
/* EventList (index=13) */ \
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) */ \
/* EventList (index=16) */ \
0x00000000, /* SwitchLatched */ \
/* Endpoint: 1, Cluster: Boolean State (server) */ \
/* EventList (index=22) */ \
0x00000000, /* StateChange */ \
/* Endpoint: 1, Cluster: Door Lock (server) */ \
/* EventList (index=23) */ \
/* EventList (index=17) */ \
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) */ \
/* EventList (index=21) */ \
0x00000001, /* TestEvent */ \
0x00000002, /* TestFabricScopedEvent */ \
}
Expand Down Expand Up @@ -2218,8 +2190,8 @@
.functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 13 ), \
.eventCount = 2, \
.eventList = nullptr, \
.eventCount = 0, \
},\
{ \
/* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \
Expand All @@ -2231,7 +2203,7 @@
.functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 15 ), \
.eventList = ZAP_GENERATED_EVENTS_INDEX( 13 ), \
.eventCount = 3, \
},\
{ \
Expand Down Expand Up @@ -2465,8 +2437,8 @@
.functions = NULL, \
.acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 18 ), \
.eventCount = 2, \
.eventList = nullptr, \
.eventCount = 0, \
},\
{ \
/* Endpoint: 1, Cluster: Power Source (server) */ \
Expand All @@ -2478,8 +2450,8 @@
.functions = NULL, \
.acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 20 ), \
.eventCount = 1, \
.eventList = nullptr, \
.eventCount = 0, \
},\
{ \
/* Endpoint: 1, Cluster: Switch (server) */ \
Expand All @@ -2491,7 +2463,7 @@
.functions = NULL, \
.acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 21 ), \
.eventList = ZAP_GENERATED_EVENTS_INDEX( 16 ), \
.eventCount = 1, \
},\
{ \
Expand Down Expand Up @@ -2530,8 +2502,8 @@
.functions = NULL, \
.acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 22 ), \
.eventCount = 1, \
.eventList = nullptr, \
.eventCount = 0, \
},\
{ \
/* Endpoint: 1, Cluster: Mode Select (server) */ \
Expand All @@ -2556,7 +2528,7 @@
.functions = chipFuncArrayDoorLockServer, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 127 ) ,\
.generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 142 ) ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 23 ), \
.eventList = ZAP_GENERATED_EVENTS_INDEX( 17 ), \
.eventCount = 4, \
},\
{ \
Expand Down Expand Up @@ -2595,8 +2567,8 @@
.functions = chipFuncArrayPumpConfigurationAndControlServer, \
.acceptedCommandList = nullptr ,\
.generatedCommandList = nullptr ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 27 ), \
.eventCount = 12, \
.eventList = nullptr, \
.eventCount = 0, \
},\
{ \
/* Endpoint: 1, Cluster: Thermostat (server) */ \
Expand Down Expand Up @@ -2907,7 +2879,7 @@
.functions = NULL, \
.acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 196 ) ,\
.generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 215 ) ,\
.eventList = ZAP_GENERATED_EVENTS_INDEX( 39 ), \
.eventList = ZAP_GENERATED_EVENTS_INDEX( 21 ), \
.eventCount = 2, \
},\
{ \
Expand Down