From 00b365be81683383499f3a52df091f08889aad83 Mon Sep 17 00:00:00 2001 From: Evgeni Margolis Date: Sat, 11 Feb 2023 23:18:11 -0800 Subject: [PATCH 1/2] Fixed All Clusters App ZAP Test Script File - Removed all Thread Network Diagnostics Cluster events, which are currently not implemented in the SDK at all. - Removed all Actions Cluster events, which are currently not implemented in the SDK. - Removed BatFaultChange event of the Power Source Cluster, which is not implemented in the SDK.. - Removed StateChange event of the Boolean State Cluster, which is not implemented for the All Clusters App. - Removed all events of the Pump Configuration and Control Cluster, which are currently not implemented in the SDK. --- .../zap/tests/inputs/all-clusters-app.zap | 136 ------------------ 1 file changed, 136 deletions(-) diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 5a3a5e1c355389..b5077303e73ced 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -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 - } ] }, { @@ -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 - } ] }, { @@ -11664,15 +11632,6 @@ "maxInterval": 65344, "reportableChange": 0 } - ], - "events": [ - { - "name": "BatFaultChange", - "code": 1, - "mfgCode": null, - "side": "server", - "included": 1 - } ] }, { @@ -12524,15 +12483,6 @@ "maxInterval": 65534, "reportableChange": 0 } - ], - "events": [ - { - "name": "StateChange", - "code": 0, - "mfgCode": null, - "side": "server", - "included": 1 - } ] }, { @@ -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 - } ] }, { From ad5bc0dd921147b1f8db59679382af38ce375b81 Mon Sep 17 00:00:00 2001 From: Evgeni Margolis Date: Sat, 11 Feb 2023 23:29:39 -0800 Subject: [PATCH 2/2] ZAP REGEN --- .../app-templates/endpoint_config.h | 66 ++++++------------- 1 file changed, 19 insertions(+), 47 deletions(-) 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 7ebc33a8868b8c..e1fcdae36ccdfb 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 @@ -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) */ \ @@ -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 */ \ } @@ -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) */ \ @@ -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, \ },\ { \ @@ -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) */ \ @@ -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) */ \ @@ -2491,7 +2463,7 @@ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 21 ), \ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 16 ), \ .eventCount = 1, \ },\ { \ @@ -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) */ \ @@ -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, \ },\ { \ @@ -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) */ \ @@ -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, \ },\ { \