From 1c49a568a058a245bcf73e78de35a6cc9dbc6d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Josefsen?= <69624991+ReneJosefsen@users.noreply.github.com> Date: Mon, 5 Dec 2022 16:09:33 +0100 Subject: [PATCH] Updated relevant zap files to latest and zap_cluster_list.py (#23907) --- .../all-clusters-common/all-clusters-app.zap | 27 ++++++++++--------- .../all-clusters-minimal-app.zap | 27 ++++++++++--------- .../thermostat-common/thermostat.zap | 24 ++++++++--------- examples/tv-app/tv-common/tv-app.zap | 27 ++++++++++--------- src/app/zap_cluster_list.py | 4 +-- .../data_model/controller-clusters.zap | 23 ++++++++-------- 6 files changed, 68 insertions(+), 64 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 186bc91f1c688e..ed35bec1d79b9d 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": 81, + "featureLevel": 87, "creator": "zap", "keyValuePairs": [ { @@ -16,12 +16,6 @@ } ], "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", @@ -29,6 +23,12 @@ "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": [ @@ -8058,7 +8058,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -8110,7 +8110,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -9709,7 +9709,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "LevelControlOptions", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -19162,7 +19162,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -19334,7 +19334,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 1, "commands": [ @@ -24740,5 +24740,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 b15e878d9821c7..c79516f63b4df4 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": 81, + "featureLevel": 87, "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.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -8058,7 +8058,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -8110,7 +8110,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -9559,7 +9559,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "LevelControlOptions", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -18954,7 +18954,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -19126,7 +19126,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 1, "commands": [ @@ -24516,5 +24516,6 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 36f576ddfe0d50..f7e23ce844fd4e 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1,5 +1,5 @@ { - "featureLevel": 85, + "featureLevel": 87, "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.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -7014,7 +7014,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -7066,7 +7066,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -8335,7 +8335,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "LevelControlOptions", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14132,7 +14132,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -14176,7 +14176,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index cd1dd1a4086bc0..72f8bfe4df751b 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 81, + "featureLevel": 87, "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.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -6924,7 +6924,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -6976,7 +6976,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -9222,7 +9222,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -9274,7 +9274,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -9977,7 +9977,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "LevelControlOptions", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -12364,5 +12364,6 @@ "endpointVersion": 1, "deviceIdentifier": 36 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index 9ef42c9b79b156..1515eee90d2bad 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -78,7 +78,7 @@ 'SWITCH_CLUSTER': ['switch-server'], 'TARGET_NAVIGATOR_CLUSTER': ['target-navigator-server'], 'TEMPERATURE_MEASUREMENT_CLUSTER': [], - 'TEST_CLUSTER': ['test-cluster-server'], + 'UNIT_TESTING_CLUSTER': ['test-cluster-server'], 'THERMOSTAT_CLUSTER': ['thermostat-server'], 'THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER': ['thermostat-user-interface-configuration-server'], 'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': ['thread-network-diagnostics-server'], @@ -164,7 +164,7 @@ 'SWITCH_CLUSTER': [], 'TARGET_NAVIGATOR_CLUSTER': [], 'TEMPERATURE_MEASUREMENT_CLUSTER': [], - 'TEST_CLUSTER': [], + 'UNIT_TESTING_CLUSTER': [], 'THERMOSTAT_CLUSTER': ['thermostat-client'], 'THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER': [], 'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': [], diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 73ce6039c09532..217d7aefafe6bb 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -1,5 +1,5 @@ { - "featureLevel": 81, + "featureLevel": 87, "creator": "zap", "keyValuePairs": [ { @@ -16,6 +16,12 @@ } ], "package": [ + { + "pathRelativity": "relativeToZap", + "path": "../../app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" + }, { "pathRelativity": "relativeToZap", "path": "../../app/zap-templates/zcl/zcl.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -1383,7 +1383,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "LevelControlOptions", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -17766,7 +17766,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -17954,7 +17954,7 @@ "name": "Unit Testing", "code": 4294048773, "mfgCode": null, - "define": "TEST_CLUSTER", + "define": "UNIT_TESTING_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -19557,5 +19557,6 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ] + ], + "log": [] } \ No newline at end of file