From 3333bc7ab7ba6ba64c08106a3b9e39e70cfd307d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szablowski?= Date: Mon, 18 Aug 2025 12:33:57 +0200 Subject: [PATCH] matter: update data model and enable mandatory cmds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update matter samples data model. * enable VID verification commands. * set identify cluster revision to 6 Signed-off-by: Michał Szablowski --- .../snippets/onoff_plug/bridge.matter | 9 +- .../snippets/onoff_plug/bridge.zap | 30 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../onoff_plug/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 65 +- .../onoff_plug/zap-generated/gen_config.h | 2 + .../src/default_zap/bridge.matter | 7 +- .../matter_bridge/src/default_zap/bridge.zap | 28 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 39 +- .../default_zap/zap-generated/gen_config.h | 2 + .../src/default_zap/weather-station.matter | 9 +- .../src/default_zap/weather-station.zap | 30 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 33 +- .../default_zap/zap-generated/gen_config.h | 2 + .../thread_certification.matter | 2 +- .../thread_platform/thread_certification.zap | 2 +- .../zap-generated/endpoint_config.h | 2 +- .../src/default_zap/light_bulb.matter | 5 +- .../light_bulb/src/default_zap/light_bulb.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 37 +- .../default_zap/zap-generated/gen_config.h | 2 + .../snippets/lit_icd/light_switch.matter | 5 +- .../snippets/lit_icd/light_switch.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../snippets/lit_icd/zap-generated/access.h | 6 + .../lit_icd/zap-generated/endpoint_config.h | 37 +- .../lit_icd/zap-generated/gen_config.h | 2 + .../src/default_zap/light_switch.matter | 5 +- .../src/default_zap/light_switch.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 29 +- .../default_zap/zap-generated/gen_config.h | 2 + .../lock/snippets/schedules/lock.matter | 5 +- .../matter/lock/snippets/schedules/lock.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../snippets/schedules/zap-generated/access.h | 6 + .../schedules/zap-generated/endpoint_config.h | 29 +- .../schedules/zap-generated/gen_config.h | 2 + .../matter/lock/src/default_zap/lock.matter | 5 +- samples/matter/lock/src/default_zap/lock.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 29 +- .../default_zap/zap-generated/gen_config.h | 2 + .../default_zap/manufacturer_specific.matter | 88 +-- .../src/default_zap/manufacturer_specific.zap | 259 +------ .../zap-generated/IMClusterCommandHandler.cpp | 120 +--- .../PluginApplicationCallbacks.h | 4 +- .../src/default_zap/zap-generated/access.h | 12 +- .../zap-generated/callback-stub.cpp | 8 - .../zap-generated/endpoint_config.h | 635 ++++++++---------- .../default_zap/zap-generated/gen_config.h | 19 +- .../src/default_zap/smoke_co_alarm.matter | 5 +- .../src/default_zap/smoke_co_alarm.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 33 +- .../default_zap/zap-generated/gen_config.h | 2 + .../template/src/default_zap/template.matter | 3 + .../template/src/default_zap/template.zap | 24 + .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 15 +- .../default_zap/zap-generated/gen_config.h | 2 + .../src/default_zap/thermostat.matter | 5 +- .../thermostat/src/default_zap/thermostat.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 33 +- .../default_zap/zap-generated/gen_config.h | 2 + .../src/default_zap/window-app.matter | 5 +- .../src/default_zap/window-app.zap | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 21 + .../src/default_zap/zap-generated/access.h | 6 + .../zap-generated/endpoint_config.h | 25 +- .../default_zap/zap-generated/gen_config.h | 2 + scripts/quarantine.yaml | 7 + 84 files changed, 1277 insertions(+), 1021 deletions(-) diff --git a/applications/matter_bridge/snippets/onoff_plug/bridge.matter b/applications/matter_bridge/snippets/onoff_plug/bridge.matter index 55a1172044c2..6f0cb5061b25 100644 --- a/applications/matter_bridge/snippets/onoff_plug/bridge.matter +++ b/applications/matter_bridge/snippets/onoff_plug/bridge.matter @@ -2491,6 +2491,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2523,7 +2526,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } @@ -2551,7 +2554,7 @@ endpoint 2 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; handle command TriggerEffect; @@ -2646,7 +2649,7 @@ endpoint 3 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; handle command TriggerEffect; diff --git a/applications/matter_bridge/snippets/onoff_plug/bridge.zap b/applications/matter_bridge/snippets/onoff_plug/bridge.zap index ed3ee0fba3c1..5fbcea5644f7 100644 --- a/applications/matter_bridge/snippets/onoff_plug/bridge.zap +++ b/applications/matter_bridge/snippets/onoff_plug/bridge.zap @@ -2537,6 +2537,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -3077,7 +3101,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -3402,7 +3426,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -4382,7 +4406,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/applications/matter_bridge/snippets/onoff_plug/zap-generated/IMClusterCommandHandler.cpp b/applications/matter_bridge/snippets/onoff_plug/zap-generated/IMClusterCommandHandler.cpp index 9e8b20ecc855..a83f455b63a4 100644 --- a/applications/matter_bridge/snippets/onoff_plug/zap-generated/IMClusterCommandHandler.cpp +++ b/applications/matter_bridge/snippets/onoff_plug/zap-generated/IMClusterCommandHandler.cpp @@ -543,6 +543,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h b/applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h index 4614864f182c..8b5ccf537e6e 100644 --- a/applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h +++ b/applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h @@ -156,6 +156,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -195,6 +197,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -234,6 +238,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/applications/matter_bridge/snippets/onoff_plug/zap-generated/endpoint_config.h b/applications/matter_bridge/snippets/onoff_plug/zap-generated/endpoint_config.h index 92df714aa9cd..a953917e34b4 100644 --- a/applications/matter_bridge/snippets/onoff_plug/zap-generated/endpoint_config.h +++ b/applications/matter_bridge/snippets/onoff_plug/zap-generated/endpoint_config.h @@ -307,7 +307,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -328,7 +328,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -375,7 +375,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -567,35 +567,38 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=43)*/ \ + /* GeneratedCommandList (index=45)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=48) */ \ + /* AcceptedCommandList (index=51) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=53)*/ \ + /* GeneratedCommandList (index=56)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=56) */ \ + /* AcceptedCommandList (index=59) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* Identify */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=61) */ \ + /* AcceptedCommandList (index=64) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -603,14 +606,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=68)*/ \ + /* GeneratedCommandList (index=71)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=73) */ \ + /* AcceptedCommandList (index=76) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -619,7 +622,7 @@ 0x00000042 /* OnWithTimedOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Scenes Management (server) */\ - /* AcceptedCommandList (index=80) */ \ + /* AcceptedCommandList (index=83) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -628,7 +631,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=88)*/ \ + /* GeneratedCommandList (index=91)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -637,12 +640,12 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 3, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=95) */ \ + /* AcceptedCommandList (index=98) */ \ 0x00000000 /* Identify */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 3, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=98) */ \ + /* AcceptedCommandList (index=101) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -650,14 +653,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=105)*/ \ + /* GeneratedCommandList (index=108)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 3, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=110) */ \ + /* AcceptedCommandList (index=113) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -838,7 +841,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -850,8 +853,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -863,7 +866,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -889,7 +892,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -902,8 +905,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -915,7 +918,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -941,8 +944,8 @@ .clusterSize = 8, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayScenesManagementServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 80 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 91 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -967,7 +970,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -980,8 +983,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 101 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -1006,7 +1009,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 110 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 113 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/applications/matter_bridge/snippets/onoff_plug/zap-generated/gen_config.h b/applications/matter_bridge/snippets/onoff_plug/zap-generated/gen_config.h index 7d430610fbed..41148b3f1534 100644 --- a/applications/matter_bridge/snippets/onoff_plug/zap-generated/gen_config.h +++ b/applications/matter_bridge/snippets/onoff_plug/zap-generated/gen_config.h @@ -502,6 +502,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ScenesManagement Cluster Commands #define SCENES_MANAGEMENT_ENABLE_ADD_SCENE_CMD 1 diff --git a/applications/matter_bridge/src/default_zap/bridge.matter b/applications/matter_bridge/src/default_zap/bridge.matter index 6d8862b9ed66..9bccec6d36e9 100644 --- a/applications/matter_bridge/src/default_zap/bridge.matter +++ b/applications/matter_bridge/src/default_zap/bridge.matter @@ -2337,6 +2337,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2369,7 +2372,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } @@ -2399,7 +2402,7 @@ endpoint 2 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; handle command TriggerEffect; diff --git a/applications/matter_bridge/src/default_zap/bridge.zap b/applications/matter_bridge/src/default_zap/bridge.zap index 67a8b38cddec..8f8fbbffc460 100644 --- a/applications/matter_bridge/src/default_zap/bridge.zap +++ b/applications/matter_bridge/src/default_zap/bridge.zap @@ -2537,6 +2537,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -3077,7 +3101,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -3420,7 +3444,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/applications/matter_bridge/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/applications/matter_bridge/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index 9e8b20ecc855..a83f455b63a4 100644 --- a/applications/matter_bridge/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/applications/matter_bridge/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -543,6 +543,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/applications/matter_bridge/src/default_zap/zap-generated/access.h b/applications/matter_bridge/src/default_zap/zap-generated/access.h index c1e60e180fa8..d574a94e9793 100644 --- a/applications/matter_bridge/src/default_zap/zap-generated/access.h +++ b/applications/matter_bridge/src/default_zap/zap-generated/access.h @@ -156,6 +156,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -191,6 +193,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -226,6 +230,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/applications/matter_bridge/src/default_zap/zap-generated/endpoint_config.h b/applications/matter_bridge/src/default_zap/zap-generated/endpoint_config.h index 04b64a6c3287..28a23c7fa455 100644 --- a/applications/matter_bridge/src/default_zap/zap-generated/endpoint_config.h +++ b/applications/matter_bridge/src/default_zap/zap-generated/endpoint_config.h @@ -304,7 +304,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -325,7 +325,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -513,35 +513,38 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=43)*/ \ + /* GeneratedCommandList (index=45)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=48) */ \ + /* AcceptedCommandList (index=51) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=53)*/ \ + /* GeneratedCommandList (index=56)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=56) */ \ + /* AcceptedCommandList (index=59) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* Identify */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=61) */ \ + /* AcceptedCommandList (index=64) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -549,14 +552,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=68)*/ \ + /* GeneratedCommandList (index=71)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=73) */ \ + /* AcceptedCommandList (index=76) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -737,7 +740,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -749,8 +752,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -762,7 +765,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -801,7 +804,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -814,8 +817,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -840,7 +843,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/applications/matter_bridge/src/default_zap/zap-generated/gen_config.h b/applications/matter_bridge/src/default_zap/zap-generated/gen_config.h index 5031e8a4a90d..eeffca6e0bdd 100644 --- a/applications/matter_bridge/src/default_zap/zap-generated/gen_config.h +++ b/applications/matter_bridge/src/default_zap/zap-generated/gen_config.h @@ -486,3 +486,5 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 diff --git a/applications/matter_weather_station/src/default_zap/weather-station.matter b/applications/matter_weather_station/src/default_zap/weather-station.matter index 230518129c13..1187248facad 100644 --- a/applications/matter_weather_station/src/default_zap/weather-station.matter +++ b/applications/matter_weather_station/src/default_zap/weather-station.matter @@ -2434,6 +2434,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2477,7 +2480,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } @@ -2516,7 +2519,7 @@ endpoint 2 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } @@ -2555,7 +2558,7 @@ endpoint 3 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/applications/matter_weather_station/src/default_zap/weather-station.zap b/applications/matter_weather_station/src/default_zap/weather-station.zap index 00e0a3065c34..88e1948791fc 100644 --- a/applications/matter_weather_station/src/default_zap/weather-station.zap +++ b/applications/matter_weather_station/src/default_zap/weather-station.zap @@ -3639,6 +3639,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4317,7 +4341,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -4772,7 +4796,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -5227,7 +5251,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/applications/matter_weather_station/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/applications/matter_weather_station/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index ddaafd087066..a4f3b84b9a71 100644 --- a/applications/matter_weather_station/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/applications/matter_weather_station/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -348,6 +348,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/applications/matter_weather_station/src/default_zap/zap-generated/access.h b/applications/matter_weather_station/src/default_zap/zap-generated/access.h index 193c244b5e83..861a9c48b7fd 100644 --- a/applications/matter_weather_station/src/default_zap/zap-generated/access.h +++ b/applications/matter_weather_station/src/default_zap/zap-generated/access.h @@ -136,6 +136,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -166,6 +168,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -196,6 +200,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/applications/matter_weather_station/src/default_zap/zap-generated/endpoint_config.h b/applications/matter_weather_station/src/default_zap/zap-generated/endpoint_config.h index 4ab419725db2..0eda06f6b24a 100644 --- a/applications/matter_weather_station/src/default_zap/zap-generated/endpoint_config.h +++ b/applications/matter_weather_station/src/default_zap/zap-generated/endpoint_config.h @@ -449,7 +449,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -480,7 +480,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -511,7 +511,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 3, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -617,34 +617,37 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=44)*/ \ + /* GeneratedCommandList (index=46)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=49) */ \ + /* AcceptedCommandList (index=52) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=54)*/ \ + /* GeneratedCommandList (index=57)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=57) */ \ + /* AcceptedCommandList (index=60) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=59) */ \ + /* AcceptedCommandList (index=62) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 3, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=61) */ \ + /* AcceptedCommandList (index=64) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ } @@ -833,7 +836,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -845,8 +848,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -871,7 +874,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -910,7 +913,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -949,7 +952,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h b/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h index 7ac54c186663..48e52c1c38b3 100644 --- a/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h +++ b/applications/matter_weather_station/src/default_zap/zap-generated/gen_config.h @@ -450,6 +450,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/samples/matter/common/src/certification/thread_platform/thread_certification.matter b/samples/matter/common/src/certification/thread_platform/thread_certification.matter index b39711f1d9f6..9788b2f83896 100644 --- a/samples/matter/common/src/certification/thread_platform/thread_certification.matter +++ b/samples/matter/common/src/certification/thread_platform/thread_certification.matter @@ -2566,7 +2566,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; handle command TriggerEffect; diff --git a/samples/matter/common/src/certification/thread_platform/thread_certification.zap b/samples/matter/common/src/certification/thread_platform/thread_certification.zap index 7566737951b0..f6db33b143b1 100644 --- a/samples/matter/common/src/certification/thread_platform/thread_certification.zap +++ b/samples/matter/common/src/certification/thread_platform/thread_certification.zap @@ -4797,7 +4797,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/samples/matter/common/src/certification/thread_platform/zap-generated/endpoint_config.h b/samples/matter/common/src/certification/thread_platform/zap-generated/endpoint_config.h index 9c13315d8ebc..2456e66d2dc0 100644 --- a/samples/matter/common/src/certification/thread_platform/zap-generated/endpoint_config.h +++ b/samples/matter/common/src/certification/thread_platform/zap-generated/endpoint_config.h @@ -472,7 +472,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Groups (server) */ \ { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ diff --git a/samples/matter/light_bulb/src/default_zap/light_bulb.matter b/samples/matter/light_bulb/src/default_zap/light_bulb.matter index a91407ed9665..6ba5115e87ef 100644 --- a/samples/matter/light_bulb/src/default_zap/light_bulb.matter +++ b/samples/matter/light_bulb/src/default_zap/light_bulb.matter @@ -2376,6 +2376,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2408,7 +2411,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; handle command TriggerEffect; diff --git a/samples/matter/light_bulb/src/default_zap/light_bulb.zap b/samples/matter/light_bulb/src/default_zap/light_bulb.zap index d7e0a4266edb..23d569e1ccc4 100644 --- a/samples/matter/light_bulb/src/default_zap/light_bulb.zap +++ b/samples/matter/light_bulb/src/default_zap/light_bulb.zap @@ -3645,6 +3645,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4193,7 +4217,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/samples/matter/light_bulb/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/light_bulb/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index b8aadec7248f..64357d1cf2b9 100644 --- a/samples/matter/light_bulb/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/light_bulb/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -652,6 +652,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/light_bulb/src/default_zap/zap-generated/access.h b/samples/matter/light_bulb/src/default_zap/zap-generated/access.h index 3d6a549592c5..a65de57f95ee 100644 --- a/samples/matter/light_bulb/src/default_zap/zap-generated/access.h +++ b/samples/matter/light_bulb/src/default_zap/zap-generated/access.h @@ -154,6 +154,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -190,6 +192,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -226,6 +230,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/light_bulb/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/light_bulb/src/default_zap/zap-generated/endpoint_config.h index 898372c92279..336fa9438c58 100644 --- a/samples/matter/light_bulb/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/light_bulb/src/default_zap/zap-generated/endpoint_config.h @@ -442,7 +442,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -604,31 +604,34 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=45)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=50) */ \ + /* AcceptedCommandList (index=53) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* Identify */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=61) */ \ + /* AcceptedCommandList (index=64) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -636,14 +639,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=68)*/ \ + /* GeneratedCommandList (index=71)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=73) */ \ + /* AcceptedCommandList (index=76) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -652,7 +655,7 @@ 0x00000042 /* OnWithTimedOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=80) */ \ + /* AcceptedCommandList (index=83) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -848,7 +851,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -860,8 +863,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -873,7 +876,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -886,8 +889,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -899,7 +902,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -912,7 +915,7 @@ .clusterSize = 21, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 80 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/samples/matter/light_bulb/src/default_zap/zap-generated/gen_config.h b/samples/matter/light_bulb/src/default_zap/zap-generated/gen_config.h index ce4f163fd649..8a7e4a74920b 100644 --- a/samples/matter/light_bulb/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/light_bulb/src/default_zap/zap-generated/gen_config.h @@ -477,6 +477,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/samples/matter/light_switch/snippets/lit_icd/light_switch.matter b/samples/matter/light_switch/snippets/lit_icd/light_switch.matter index d163151ffde0..5b3bc55fcedf 100644 --- a/samples/matter/light_switch/snippets/lit_icd/light_switch.matter +++ b/samples/matter/light_switch/snippets/lit_icd/light_switch.matter @@ -2543,6 +2543,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2602,7 +2605,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 4; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/light_switch/snippets/lit_icd/light_switch.zap b/samples/matter/light_switch/snippets/lit_icd/light_switch.zap index 580431dd437b..7edfdec898f9 100644 --- a/samples/matter/light_switch/snippets/lit_icd/light_switch.zap +++ b/samples/matter/light_switch/snippets/lit_icd/light_switch.zap @@ -3652,6 +3652,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4510,7 +4534,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "4", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/samples/matter/light_switch/snippets/lit_icd/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/light_switch/snippets/lit_icd/zap-generated/IMClusterCommandHandler.cpp index 2cf5b4b20710..7c9998517ed1 100644 --- a/samples/matter/light_switch/snippets/lit_icd/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/light_switch/snippets/lit_icd/zap-generated/IMClusterCommandHandler.cpp @@ -511,6 +511,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/light_switch/snippets/lit_icd/zap-generated/access.h b/samples/matter/light_switch/snippets/lit_icd/zap-generated/access.h index 478341b22c17..7e52f6ee5baa 100644 --- a/samples/matter/light_switch/snippets/lit_icd/zap-generated/access.h +++ b/samples/matter/light_switch/snippets/lit_icd/zap-generated/access.h @@ -150,6 +150,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -188,6 +190,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -226,6 +230,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/light_switch/snippets/lit_icd/zap-generated/endpoint_config.h b/samples/matter/light_switch/snippets/lit_icd/zap-generated/endpoint_config.h index 5c125c438701..0e31f3b403c8 100644 --- a/samples/matter/light_switch/snippets/lit_icd/zap-generated/endpoint_config.h +++ b/samples/matter/light_switch/snippets/lit_icd/zap-generated/endpoint_config.h @@ -473,7 +473,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -595,40 +595,43 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=45)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=50) */ \ + /* AcceptedCommandList (index=53) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: ICD Management (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* RegisterClient */, \ 0x00000002 /* UnregisterClient */, \ 0x00000003 /* StayActiveRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=62)*/ \ + /* GeneratedCommandList (index=65)*/ \ 0x00000001 /* RegisterClientResponse */, \ 0x00000004 /* StayActiveResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=65) */ \ + /* AcceptedCommandList (index=68) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=67) */ \ + /* AcceptedCommandList (index=70) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -636,7 +639,7 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=74)*/ \ + /* GeneratedCommandList (index=77)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ @@ -828,7 +831,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -840,8 +843,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -853,8 +856,8 @@ .clusterSize = 135, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -879,7 +882,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -892,8 +895,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 74 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/samples/matter/light_switch/snippets/lit_icd/zap-generated/gen_config.h b/samples/matter/light_switch/snippets/lit_icd/zap-generated/gen_config.h index cd477d6f9de1..5f5b4d6d5611 100644 --- a/samples/matter/light_switch/snippets/lit_icd/zap-generated/gen_config.h +++ b/samples/matter/light_switch/snippets/lit_icd/zap-generated/gen_config.h @@ -471,6 +471,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/samples/matter/light_switch/src/default_zap/light_switch.matter b/samples/matter/light_switch/src/default_zap/light_switch.matter index 5aeb770f0117..71c4ff6da6d4 100644 --- a/samples/matter/light_switch/src/default_zap/light_switch.matter +++ b/samples/matter/light_switch/src/default_zap/light_switch.matter @@ -2543,6 +2543,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2589,7 +2592,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/light_switch/src/default_zap/light_switch.zap b/samples/matter/light_switch/src/default_zap/light_switch.zap index be180d481a26..28262b3817dd 100644 --- a/samples/matter/light_switch/src/default_zap/light_switch.zap +++ b/samples/matter/light_switch/src/default_zap/light_switch.zap @@ -3652,6 +3652,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4356,7 +4380,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/samples/matter/light_switch/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/light_switch/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index ffa9b5db3ed7..edb9338fd299 100644 --- a/samples/matter/light_switch/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/light_switch/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -444,6 +444,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/light_switch/src/default_zap/zap-generated/access.h b/samples/matter/light_switch/src/default_zap/zap-generated/access.h index 23bddd243d1c..dbcf2778ed92 100644 --- a/samples/matter/light_switch/src/default_zap/zap-generated/access.h +++ b/samples/matter/light_switch/src/default_zap/zap-generated/access.h @@ -144,6 +144,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -179,6 +181,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -214,6 +218,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/light_switch/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/light_switch/src/default_zap/zap-generated/endpoint_config.h index 05ceae103f3d..232cdf21f14c 100644 --- a/samples/matter/light_switch/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/light_switch/src/default_zap/zap-generated/endpoint_config.h @@ -445,7 +445,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -567,30 +567,33 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=45)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=50) */ \ + /* AcceptedCommandList (index=53) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=60) */ \ + /* AcceptedCommandList (index=63) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -598,7 +601,7 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=67)*/ \ + /* GeneratedCommandList (index=70)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ @@ -790,7 +793,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -802,8 +805,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -841,7 +844,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -854,8 +857,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/samples/matter/light_switch/src/default_zap/zap-generated/gen_config.h b/samples/matter/light_switch/src/default_zap/zap-generated/gen_config.h index 1cae2f5395a2..a503278c74c9 100644 --- a/samples/matter/light_switch/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/light_switch/src/default_zap/zap-generated/gen_config.h @@ -466,6 +466,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/samples/matter/lock/snippets/schedules/lock.matter b/samples/matter/lock/snippets/schedules/lock.matter index 01b5c4a5c992..d35ca53db6df 100644 --- a/samples/matter/lock/snippets/schedules/lock.matter +++ b/samples/matter/lock/snippets/schedules/lock.matter @@ -3172,6 +3172,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -3215,7 +3218,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/lock/snippets/schedules/lock.zap b/samples/matter/lock/snippets/schedules/lock.zap index c24ad6ae19e8..5955191c0457 100644 --- a/samples/matter/lock/snippets/schedules/lock.zap +++ b/samples/matter/lock/snippets/schedules/lock.zap @@ -3987,6 +3987,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4665,7 +4689,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/samples/matter/lock/snippets/schedules/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/lock/snippets/schedules/zap-generated/IMClusterCommandHandler.cpp index e51456b51f5f..b2ce979924bf 100644 --- a/samples/matter/lock/snippets/schedules/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/lock/snippets/schedules/zap-generated/IMClusterCommandHandler.cpp @@ -546,6 +546,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/lock/snippets/schedules/zap-generated/access.h b/samples/matter/lock/snippets/schedules/zap-generated/access.h index d534da58467c..591d087d4310 100644 --- a/samples/matter/lock/snippets/schedules/zap-generated/access.h +++ b/samples/matter/lock/snippets/schedules/zap-generated/access.h @@ -196,6 +196,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -247,6 +249,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -298,6 +302,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/lock/snippets/schedules/zap-generated/endpoint_config.h b/samples/matter/lock/snippets/schedules/zap-generated/endpoint_config.h index 9a89de33e28a..b95e2202fdff 100644 --- a/samples/matter/lock/snippets/schedules/zap-generated/endpoint_config.h +++ b/samples/matter/lock/snippets/schedules/zap-generated/endpoint_config.h @@ -484,7 +484,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -651,30 +651,33 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=53)*/ \ + /* GeneratedCommandList (index=55)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=63)*/ \ + /* GeneratedCommandList (index=66)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=66) */ \ + /* AcceptedCommandList (index=69) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ - /* AcceptedCommandList (index=68) */ \ + /* AcceptedCommandList (index=71) */ \ 0x00000000 /* LockDoor */, \ 0x00000001 /* UnlockDoor */, \ 0x00000003 /* UnlockWithTimeout */, \ @@ -694,7 +697,7 @@ 0x00000024 /* GetCredentialStatus */, \ 0x00000026 /* ClearCredential */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=87)*/ \ + /* GeneratedCommandList (index=90)*/ \ 0x0000000C /* GetWeekDayScheduleResponse */, \ 0x0000000F /* GetYearDayScheduleResponse */, \ 0x00000012 /* GetHolidayScheduleResponse */, \ @@ -914,7 +917,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -926,8 +929,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -952,7 +955,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -978,8 +981,8 @@ .clusterSize = 37, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayDoorLockServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/samples/matter/lock/snippets/schedules/zap-generated/gen_config.h b/samples/matter/lock/snippets/schedules/zap-generated/gen_config.h index 10086b11918d..03fb8450d55a 100644 --- a/samples/matter/lock/snippets/schedules/zap-generated/gen_config.h +++ b/samples/matter/lock/snippets/schedules/zap-generated/gen_config.h @@ -470,6 +470,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/samples/matter/lock/src/default_zap/lock.matter b/samples/matter/lock/src/default_zap/lock.matter index 89e87358eedd..ec7427b9a042 100644 --- a/samples/matter/lock/src/default_zap/lock.matter +++ b/samples/matter/lock/src/default_zap/lock.matter @@ -2853,6 +2853,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2896,7 +2899,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/lock/src/default_zap/lock.zap b/samples/matter/lock/src/default_zap/lock.zap index 3c6e02d8ef4b..6547a6a7406b 100644 --- a/samples/matter/lock/src/default_zap/lock.zap +++ b/samples/matter/lock/src/default_zap/lock.zap @@ -3645,6 +3645,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4323,7 +4347,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/samples/matter/lock/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/lock/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index 87967ec3ddc5..a1dc63f2c71a 100644 --- a/samples/matter/lock/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/lock/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -465,6 +465,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/lock/src/default_zap/zap-generated/access.h b/samples/matter/lock/src/default_zap/zap-generated/access.h index 6120bcfa8af8..9cb5885b2528 100644 --- a/samples/matter/lock/src/default_zap/zap-generated/access.h +++ b/samples/matter/lock/src/default_zap/zap-generated/access.h @@ -191,6 +191,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -228,6 +230,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -265,6 +269,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/lock/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/lock/src/default_zap/zap-generated/endpoint_config.h index a1aa713201c7..9612ddcc26cd 100644 --- a/samples/matter/lock/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/lock/src/default_zap/zap-generated/endpoint_config.h @@ -462,7 +462,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -612,30 +612,33 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=45)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=50) */ \ + /* AcceptedCommandList (index=53) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ - /* AcceptedCommandList (index=60) */ \ + /* AcceptedCommandList (index=63) */ \ 0x00000000 /* LockDoor */, \ 0x00000001 /* UnlockDoor */, \ 0x00000003 /* UnlockWithTimeout */, \ @@ -646,7 +649,7 @@ 0x00000024 /* GetCredentialStatus */, \ 0x00000026 /* ClearCredential */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=70)*/ \ + /* GeneratedCommandList (index=73)*/ \ 0x0000001C /* GetUserResponse */, \ 0x00000023 /* SetCredentialResponse */, \ 0x00000025 /* GetCredentialStatusResponse */, \ @@ -837,7 +840,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -849,8 +852,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -875,7 +878,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -901,8 +904,8 @@ .clusterSize = 34, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayDoorLockServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/samples/matter/lock/src/default_zap/zap-generated/gen_config.h b/samples/matter/lock/src/default_zap/zap-generated/gen_config.h index 2e0b8b71f9cc..fc5d1bc7a924 100644 --- a/samples/matter/lock/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/lock/src/default_zap/zap-generated/gen_config.h @@ -452,6 +452,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter b/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter index 773e6a920338..4f1e78cb2b0c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +++ b/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter @@ -568,9 +568,6 @@ cluster BasicInformation = 40 { boolean reachableNewValue = 0; } - info event RandomNumberChanged = 4 { - } - readonly attribute int16u dataModelRevision = 0; readonly attribute char_string<32> vendorName = 1; readonly attribute vendor_id vendorID = 2; @@ -594,7 +591,6 @@ cluster BasicInformation = 40 { readonly attribute optional ProductAppearanceStruct productAppearance = 20; readonly attribute int32u specificationVersion = 21; readonly attribute int16u maxPathsPerInvoke = 22; - attribute int16u randomNumber = 23; readonly attribute int32u configurationVersion = 24; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -602,8 +598,6 @@ cluster BasicInformation = 40 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - /** Generate random number */ - command GenerateRandom(): DefaultSuccess = 0; command MfgSpecificPing(): DefaultSuccess = 0; } @@ -1442,66 +1436,6 @@ cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } -/** The NordicDevKit cluster showcases a cluster manufacturer extensions */ -cluster NordicDevKit = 4294048769 { - revision 1; // NOTE: Default/not specifically set - - enum LEDActionEnum : enum8 { - kOff = 0; - kOn = 1; - kToggle = 2; - } - - info event UserButtonChanged = 4293984256 { - } - - readonly attribute command_id generatedCommandList[] = 65528; - readonly attribute command_id acceptedCommandList[] = 65529; - readonly attribute attrib_id attributeList[] = 65531; - readonly attribute bitmap32 featureMap = 65532; - readonly attribute int16u clusterRevision = 65533; - attribute char_string<254> devKitName = 4293984256; - provisional readonly nosubscribe attribute boolean userLED = 4293984257; - provisional readonly nosubscribe attribute boolean userButton = 4293984258; - - request struct SetLEDRequest { - LEDActionEnum action = 0; - } - - /** Change LED state */ - command SetLED(SetLEDRequest): DefaultSuccess = 4293984256; -} - -/** The NordicDevKit cluster showcases a cluster manufacturer extensions */ -cluster NordicDevKit = 4294048769 { - revision 1; // NOTE: Default/not specifically set - - enum LEDActionEnum : enum8 { - kOff = 0; - kOn = 1; - kToggle = 2; - } - - info event UserButtonChanged = 4293984256 { - } - - readonly attribute command_id generatedCommandList[] = 65528; - readonly attribute command_id acceptedCommandList[] = 65529; - readonly attribute attrib_id attributeList[] = 65531; - readonly attribute bitmap32 featureMap = 65532; - readonly attribute int16u clusterRevision = 65533; - attribute char_string<254> devKitName = 4293984256; - provisional readonly nosubscribe attribute boolean userLED = 4293984257; - provisional readonly nosubscribe attribute boolean userButton = 4293984258; - - request struct SetLEDRequest { - LEDActionEnum action = 0; - } - - /** Change LED state */ - command SetLED(SetLEDRequest): DefaultSuccess = 4293984256; -} - endpoint 0 { device type ma_rootdevice = 22, version 3; device type ma_otarequestor = 18, version 1; @@ -1537,7 +1471,6 @@ endpoint 0 { emits event StartUp; emits event ShutDown; emits event Leave; - emits event RandomNumberChanged; callback attribute dataModelRevision; callback attribute vendorName; callback attribute vendorID; @@ -1555,14 +1488,11 @@ endpoint 0 { callback attribute capabilityMinima; callback attribute specificationVersion; callback attribute maxPathsPerInvoke; - ram attribute randomNumber default = 0; callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; ram attribute clusterRevision default = 4; - - handle command GenerateRandom; } server cluster OtaSoftwareUpdateRequestor { @@ -1689,6 +1619,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -1711,20 +1644,5 @@ endpoint 0 { } } endpoint 1 { - device type nordic_dev_kit = 1, version 1; - - binding cluster NordicDevKit; - - server cluster NordicDevKit { - callback attribute generatedCommandList; - callback attribute acceptedCommandList; - callback attribute attributeList; - ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; - persist attribute devKitName default = "Nordic Development Kit"; - ram attribute userLED default = false; - ram attribute userButton default = false; - handle command SetLED; - } } diff --git a/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap b/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap index 69e03a1a0654..dd4da08b122e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap +++ b/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap @@ -19,7 +19,7 @@ "package": [ { "pathRelativity": "relativeToZap", - "path": "zcl.json", + "path": "../../../../../../modules/lib/matter/src/app/zap-templates/zcl/zcl.json", "type": "zcl-properties", "category": "matter", "version": 1, @@ -403,16 +403,6 @@ "define": "BASIC_INFORMATION_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "GenerateRandom", - "code": 0, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - } - ], "attributes": [ { "name": "DataModelRevision", @@ -686,22 +676,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "RandomNumber", - "code": 23, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 1, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -804,13 +778,6 @@ "mfgCode": null, "side": "server", "included": 1 - }, - { - "name": "RandomNumberChanged", - "code": 4, - "mfgCode": null, - "side": "server", - "included": 1 } ] }, @@ -2090,6 +2057,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -2480,199 +2471,13 @@ { "id": 2, "name": "Anonymous Endpoint Type", - "deviceTypeRef": { - "code": 1, - "profileId": 4095, - "label": "nordic-dev-kit", - "name": "nordic-dev-kit", - "deviceTypeOrder": 0 - }, - "deviceTypes": [ - { - "code": 1, - "profileId": 4095, - "label": "nordic-dev-kit", - "name": "nordic-dev-kit", - "deviceTypeOrder": 0 - } - ], - "deviceVersions": [ - 1 - ], - "deviceIdentifiers": [ - 1 - ], - "deviceTypeName": "nordic-dev-kit", - "deviceTypeCode": 1, - "deviceTypeProfileId": 4095, - "clusters": [ - { - "name": "NordicDevKit", - "code": 4294048769, - "mfgCode": null, - "define": "NORDIC_DEV_KIT_CLUSTER", - "side": "client", - "enabled": 1, - "commands": [ - { - "name": "SetLED", - "code": 4293984256, - "mfgCode": null, - "source": "client", - "isIncoming": 0, - "isEnabled": 1 - } - ] - }, - { - "name": "NordicDevKit", - "code": 4294048769, - "mfgCode": null, - "define": "NORDIC_DEV_KIT_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [ - { - "name": "SetLED", - "code": 4293984256, - "mfgCode": null, - "source": "client", - "isIncoming": 1, - "isEnabled": 1 - } - ], - "attributes": [ - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "DevKitName", - "code": 4293984256, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "NVM", - "singleton": 0, - "bounded": 0, - "defaultValue": "Nordic Development Kit", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "UserLED", - "code": 4293984257, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "false", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "UserButton", - "code": 4293984258, - "mfgCode": null, - "side": "server", - "type": "boolean", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "false", - "reportable": 0, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - } - ] + "deviceTypes": [], + "deviceVersions": [], + "deviceIdentifiers": [], + "deviceTypeName": "", + "deviceTypeCode": "", + "deviceTypeProfileId": "", + "clusters": [] } ], "endpoints": [ diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index 7c6dc1f762dc..0fd868dcd73f 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -40,52 +40,6 @@ namespace app namespace Clusters { - namespace BasicInformation - { - - Protocols::InteractionModel::Status - DispatchServerCommand(CommandHandler *apCommandObj, const ConcreteCommandPath &aCommandPath, - TLV::TLVReader &aDataTlv) - { - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) { - case Commands::GenerateRandom::Id: { - Commands::GenerateRandom::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = - emberAfBasicInformationClusterGenerateRandomCallback( - apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - ChipLogError(Zcl, - "Unknown command " ChipLogFormatMEI - " for cluster " ChipLogFormatMEI, - ChipLogValueMEI(aCommandPath.mCommandId), - ChipLogValueMEI(aCommandPath.mClusterId)); - return Protocols::InteractionModel::Status::UnsupportedCommand; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) { - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, - TLVError.Format()); - return Protocols::InteractionModel::Status::InvalidCommand; - } - - // We use success as a marker that no special handling is required - // This is to avoid having a std::optional which uses slightly more code. - return Protocols::InteractionModel::Status::Success; - } - - } // namespace BasicInformation - namespace GroupKeyManagement { @@ -165,51 +119,6 @@ namespace app } // namespace GroupKeyManagement - namespace NordicDevKit - { - - Protocols::InteractionModel::Status - DispatchServerCommand(CommandHandler *apCommandObj, const ConcreteCommandPath &aCommandPath, - TLV::TLVReader &aDataTlv) - { - CHIP_ERROR TLVError = CHIP_NO_ERROR; - bool wasHandled = false; - { - switch (aCommandPath.mCommandId) { - case Commands::SetLED::Id: { - Commands::SetLED::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) { - wasHandled = emberAfNordicDevKitClusterSetLEDCallback( - apCommandObj, aCommandPath, commandData); - } - break; - } - default: { - // Unrecognized command ID, error status will apply. - ChipLogError(Zcl, - "Unknown command " ChipLogFormatMEI - " for cluster " ChipLogFormatMEI, - ChipLogValueMEI(aCommandPath.mCommandId), - ChipLogValueMEI(aCommandPath.mClusterId)); - return Protocols::InteractionModel::Status::UnsupportedCommand; - } - } - } - - if (CHIP_NO_ERROR != TLVError || !wasHandled) { - ChipLogProgress(Zcl, "Failed to dispatch command, TLVError=%" CHIP_ERROR_FORMAT, - TLVError.Format()); - return Protocols::InteractionModel::Status::InvalidCommand; - } - - // We use success as a marker that no special handling is required - // This is to avoid having a std::optional which uses slightly more code. - return Protocols::InteractionModel::Status::Success; - } - - } // namespace NordicDevKit - namespace OtaSoftwareUpdateRequestor { @@ -348,6 +257,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, @@ -381,18 +311,10 @@ namespace app Protocols::InteractionModel::Status errorStatus = Protocols::InteractionModel::Status::Success; switch (aCommandPath.mClusterId) { - case Clusters::BasicInformation::Id: - errorStatus = - Clusters::BasicInformation::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::GroupKeyManagement::Id: errorStatus = Clusters::GroupKeyManagement::DispatchServerCommand(apCommandObj, aCommandPath, aReader); break; - case Clusters::NordicDevKit::Id: - errorStatus = - Clusters::NordicDevKit::DispatchServerCommand(apCommandObj, aCommandPath, aReader); - break; case Clusters::OtaSoftwareUpdateRequestor::Id: errorStatus = Clusters::OtaSoftwareUpdateRequestor::DispatchServerCommand( apCommandObj, aCommandPath, aReader); diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/PluginApplicationCallbacks.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/PluginApplicationCallbacks.h index 4cd762555aa8..76b356055d63 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/PluginApplicationCallbacks.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/PluginApplicationCallbacks.h @@ -29,7 +29,6 @@ void MatterGeneralDiagnosticsPluginServerInitCallback(); void MatterAdministratorCommissioningPluginServerInitCallback(); void MatterOperationalCredentialsPluginServerInitCallback(); void MatterGroupKeyManagementPluginServerInitCallback(); -void MatterNordicDevKitPluginServerInitCallback(); #define MATTER_PLUGINS_INIT \ MatterDescriptorPluginServerInitCallback(); \ @@ -41,5 +40,4 @@ void MatterNordicDevKitPluginServerInitCallback(); MatterGeneralDiagnosticsPluginServerInitCallback(); \ MatterAdministratorCommissioningPluginServerInitCallback(); \ MatterOperationalCredentialsPluginServerInitCallback(); \ - MatterGroupKeyManagementPluginServerInitCallback(); \ - MatterNordicDevKitPluginServerInitCallback(); + MatterGroupKeyManagementPluginServerInitCallback(); diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/access.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/access.h index 3acfeac7a243..34fab00297fa 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/access.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/access.h @@ -40,8 +40,6 @@ 0x00000031, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \ - /* Cluster: NordicDevKit, Attribute: UserLED, Privilege: view */ \ - /* Cluster: NordicDevKit, Attribute: UserButton, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -57,8 +55,6 @@ 0x00000007, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \ 0x00000000, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \ - /* Cluster: NordicDevKit, Attribute: UserLED, Privilege: view */ \ - /* Cluster: NordicDevKit, Attribute: UserButton, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -74,8 +70,6 @@ chip::Access::Privilege::kAdminister, /* Cluster: Network Commissioning, Attribute: LastConnectErrorValue, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Attribute: NOCs, Privilege: administer */ \ /* Cluster: Group Key Management, Attribute: GroupKeyMap, Privilege: view */ \ - /* Cluster: NordicDevKit, Attribute: UserLED, Privilege: view */ \ - /* Cluster: NordicDevKit, Attribute: UserButton, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -141,6 +135,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -170,6 +166,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -199,6 +197,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/callback-stub.cpp b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/callback-stub.cpp index 7062c1836dd6..617c5a2dcc8c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/callback-stub.cpp +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/callback-stub.cpp @@ -52,9 +52,6 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case app::Clusters::NetworkCommissioning::Id: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case app::Clusters::NordicDevKit::Id: - emberAfNordicDevKitClusterInitCallback(endpoint); - break; case app::Clusters::OtaSoftwareUpdateProvider::Id: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; @@ -110,11 +107,6 @@ void __attribute__((weak)) emberAfNetworkCommissioningClusterInitCallback(Endpoi // To prevent warning (void)endpoint; } -void __attribute__((weak)) emberAfNordicDevKitClusterInitCallback(EndpointId endpoint) -{ - // To prevent warning - (void)endpoint; -} void __attribute__((weak)) emberAfOtaSoftwareUpdateProviderClusterInitCallback(EndpointId endpoint) { // To prevent warning diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/endpoint_config.h index 55021f997a7f..4371ff0ec215 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/endpoint_config.h @@ -29,96 +29,24 @@ #if CHIP_CONFIG_BIG_ENDIAN_TARGET #define GENERATED_DEFAULTS \ { \ - \ /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */ \ \ /* 0 - Breadcrumb, */ \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - \ - /* Endpoint: 1, Cluster: NordicDevKit (server), big-endian */ \ - \ - /* 8 - DevKitName, */ \ - 22, \ - 'N', \ - 'o', \ - 'r', \ - 'd', \ - 'i', \ - 'c', \ - ' ', \ - 'D', \ - 'e', \ - 'v', \ - 'e', \ - 'l', \ - 'o', \ - 'p', \ - 'm', \ - 'e', \ - 'n', \ - 't', \ - ' ', \ - 'K', \ - 'i', \ - 't', \ - \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ } #else // !CHIP_CONFIG_BIG_ENDIAN_TARGET #define GENERATED_DEFAULTS \ { \ - \ /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */ \ \ /* 0 - Breadcrumb, */ \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - 0x00, \ - \ - /* Endpoint: 1, Cluster: NordicDevKit (server), little-endian */ \ - \ - /* 8 - DevKitName, */ \ - 22, \ - 'N', \ - 'o', \ - 'r', \ - 'd', \ - 'i', \ - 'c', \ - ' ', \ - 'D', \ - 'e', \ - 'v', \ - 'e', \ - 'l', \ - 'o', \ - 'p', \ - 'm', \ - 'e', \ - 'n', \ - 't', \ - ' ', \ - 'K', \ - 'i', \ - 't', \ - \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ } #endif // CHIP_CONFIG_BIG_ENDIAN_TARGET -#define GENERATED_DEFAULTS_COUNT (2) +#define GENERATED_DEFAULTS_COUNT (1) // This is an array of EmberAfAttributeMinMaxValue structures. #define GENERATED_MIN_MAX_DEFAULT_COUNT 0 @@ -127,214 +55,215 @@ } // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 91 -#define GENERATED_ATTRIBUTES \ - { \ - \ - /* Endpoint: 0, Cluster: Descriptor (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DeviceTypeList \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ServerList \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClientList \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PartsList \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: Access Control (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ACL */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Extension */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SubjectsPerAccessControlEntry \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetsPerAccessControlEntry \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AccessControlEntriesPerFabric \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: Basic Information (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | \ - ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* UniqueID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* MaxPathsPerInvoke */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000017, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RandomNumber */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* DefaultOTAProviders */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), 0 }, /* UpdatePossible */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 }, /* UpdateState */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress \ - */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { ZAP_LONG_DEFAULTS_INDEX(0), 0x00000000, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Breadcrumb \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BasicCommissioningInfo \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegulatoryConfig \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LocationCapability \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportsConcurrentConnection \ - */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxNetworks \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ScanMaxTimeSeconds \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ConnectMaxTimeSeconds \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* InterfaceEnabled */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkingStatus */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedWiFiBands \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(BITMAP16), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedThreadFeatures */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ThreadVersion \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NetworkInterfaces \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RebootCount \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UpTime \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TotalOperationalHours \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BootReason \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TestEventTriggersEnabled \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NOCs \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Fabrics \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedFabrics \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CommissionedFabrics \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TrustedRootCertificates \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentFabricIndex \ - */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* GroupKeyMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* GroupTable \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupsPerFabric \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupKeysPerFabric \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 1, Cluster: NordicDevKit (server) */ \ - { ZAP_LONG_DEFAULTS_INDEX(8), 0xFFF10000, 255, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* DevKitName */ \ - { ZAP_SIMPLE_DEFAULT(false), 0xFFF10001, 1, ZAP_TYPE(BOOLEAN), 0 }, /* UserLED */ \ - { ZAP_SIMPLE_DEFAULT(false), 0xFFF10002, 1, ZAP_TYPE(BOOLEAN), 0 }, /* UserButton */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ +#define GENERATED_ATTRIBUTE_COUNT 85 +#define GENERATED_ATTRIBUTES \ + { \ + /* Endpoint: 0, Cluster: Descriptor (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DeviceTypeList \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ServerList */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClientList */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PartsList */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Access Control (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ACL */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Extension */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SubjectsPerAccessControlEntry */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetsPerAccessControlEntry */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AccessControlEntriesPerFabric */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Basic Information (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | \ + ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | \ + ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* UniqueID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* MaxPathsPerInvoke \ + */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* DefaultOTAProviders \ + */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), 0 }, /* UpdatePossible */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 }, /* UpdateState */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress \ + */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: General Commissioning (server) */ \ + { ZAP_LONG_DEFAULTS_INDEX(0), 0x00000000, 8, ZAP_TYPE(INT64U), \ + ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Breadcrumb */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BasicCommissioningInfo */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegulatoryConfig */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LocationCapability */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportsConcurrentConnection */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxNetworks */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ScanMaxTimeSeconds */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ConnectMaxTimeSeconds */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* InterfaceEnabled \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkingStatus \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedWiFiBands */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(BITMAP16), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedThreadFeatures */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ThreadVersion */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NetworkInterfaces */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RebootCount */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UpTime */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TotalOperationalHours */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BootReason */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TestEventTriggersEnabled */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NOCs */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Fabrics */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedFabrics */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CommissionedFabrics */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TrustedRootCertificates */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentFabricIndex */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* GroupKeyMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* GroupTable */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupsPerFabric */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupKeysPerFabric */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */ \ } // clang-format off -#define GENERATED_EVENT_COUNT 7 +#define GENERATED_EVENT_COUNT 6 #define GENERATED_EVENTS { \ /* Endpoint: 0, Cluster: Basic Information (server) */ \ /* EventList (index=0) */ \ 0x00000000, /* StartUp */ \ 0x00000001, /* ShutDown */ \ 0x00000002, /* Leave */ \ - 0x00000004, /* RandomNumberChanged */ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ - /* EventList (index=4) */ \ + /* EventList (index=3) */ \ 0x00000000, /* StateTransition */ \ 0x00000001, /* VersionApplied */ \ 0x00000002, /* DownloadError */ \ @@ -347,27 +276,23 @@ // clang-format off #define GENERATED_COMMANDS { \ - /* Endpoint: 0, Cluster: Basic Information (server) */\ - /* AcceptedCommandList (index=0) */ \ - 0x00000000 /* GenerateRandom */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ - /* AcceptedCommandList (index=2) */ \ + /* AcceptedCommandList (index=0) */ \ 0x00000000 /* AnnounceOTAProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ - /* AcceptedCommandList (index=4) */ \ + /* AcceptedCommandList (index=2) */ \ 0x00000000 /* ArmFailSafe */, \ 0x00000002 /* SetRegulatoryConfig */, \ 0x00000004 /* CommissioningComplete */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=8)*/ \ + /* GeneratedCommandList (index=6)*/ \ 0x00000001 /* ArmFailSafeResponse */, \ 0x00000003 /* SetRegulatoryConfigResponse */, \ 0x00000005 /* CommissioningCompleteResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=12) */ \ + /* AcceptedCommandList (index=10) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -375,27 +300,27 @@ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=19)*/ \ + /* GeneratedCommandList (index=17)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Diagnostics (server) */\ - /* AcceptedCommandList (index=23) */ \ + /* AcceptedCommandList (index=21) */ \ 0x00000000 /* TestEventTrigger */, \ 0x00000001 /* TimeSnapshot */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=26)*/ \ + /* GeneratedCommandList (index=24)*/ \ 0x00000002 /* TimeSnapshotResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */\ - /* AcceptedCommandList (index=28) */ \ + /* AcceptedCommandList (index=26) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ 0x00000002 /* RevokeCommissioning */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Operational Credentials (server) */\ - /* AcceptedCommandList (index=32) */ \ + /* AcceptedCommandList (index=30) */ \ 0x00000000 /* AttestationRequest */, \ 0x00000002 /* CertificateChainRequest */, \ 0x00000004 /* CSRRequest */, \ @@ -404,34 +329,33 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ /* GeneratedCommandList (index=41)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=46) */ \ + /* AcceptedCommandList (index=47) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=51)*/ \ + /* GeneratedCommandList (index=52)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 1, Cluster: NordicDevKit (server) */\ - /* AcceptedCommandList (index=54) */ \ - 0xFFF10000 /* SetLED */, \ - chip::kInvalidCommandId /* end of list */, \ } // clang-format on // This is an array of EmberAfCluster structures. -#define GENERATED_CLUSTER_COUNT 13 +#define GENERATED_CLUSTER_COUNT 11 // clang-format off #define GENERATED_CLUSTERS { \ { \ @@ -464,19 +388,19 @@ /* Endpoint: 0, Cluster: Basic Information (server) */ \ .clusterId = 0x00000028, \ .attributes = ZAP_ATTRIBUTE_INDEX(13), \ - .attributeCount = 20, \ - .clusterSize = 41, \ + .attributeCount = 19, \ + .clusterSize = 39, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ), \ + .acceptedCommandList = nullptr, \ .generatedCommandList = nullptr, \ .eventList = ZAP_GENERATED_EVENTS_INDEX( 0 ), \ - .eventCount = 4, \ + .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: OTA Software Update Provider (client) */ \ .clusterId = 0x00000029, \ - .attributes = ZAP_ATTRIBUTE_INDEX(33), \ + .attributes = ZAP_ATTRIBUTE_INDEX(32), \ .attributeCount = 0, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(CLIENT), \ @@ -489,64 +413,64 @@ { \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ .clusterId = 0x0000002A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(33), \ + .attributes = ZAP_ATTRIBUTE_INDEX(32), \ .attributeCount = 6, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 2 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ), \ .generatedCommandList = nullptr, \ - .eventList = ZAP_GENERATED_EVENTS_INDEX( 4 ), \ + .eventList = ZAP_GENERATED_EVENTS_INDEX( 3 ), \ .eventCount = 3, \ },\ { \ /* Endpoint: 0, Cluster: General Commissioning (server) */ \ .clusterId = 0x00000030, \ - .attributes = ZAP_ATTRIBUTE_INDEX(39), \ + .attributes = ZAP_ATTRIBUTE_INDEX(38), \ .attributeCount = 7, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 4 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 8 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 2 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 6 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ .clusterId = 0x00000031, \ - .attributes = ZAP_ATTRIBUTE_INDEX(46), \ + .attributes = ZAP_ATTRIBUTE_INDEX(45), \ .attributeCount = 13, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 12 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 19 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ .clusterId = 0x00000033, \ - .attributes = ZAP_ATTRIBUTE_INDEX(59), \ + .attributes = ZAP_ATTRIBUTE_INDEX(58), \ .attributeCount = 8, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ { \ /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ .clusterId = 0x0000003C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(67), \ + .attributes = ZAP_ATTRIBUTE_INDEX(66), \ .attributeCount = 5, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -554,12 +478,12 @@ { \ /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ .clusterId = 0x0000003E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(72), \ + .attributes = ZAP_ATTRIBUTE_INDEX(71), \ .attributeCount = 8, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ), \ .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ), \ .eventList = nullptr, \ .eventCount = 0, \ @@ -567,39 +491,13 @@ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ .clusterId = 0x0000003F, \ - .attributes = ZAP_ATTRIBUTE_INDEX(80), \ + .attributes = ZAP_ATTRIBUTE_INDEX(79), \ .attributeCount = 6, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ), \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: NordicDevKit (client) */ \ - .clusterId = 0xFFF1FC01, \ - .attributes = ZAP_ATTRIBUTE_INDEX(86), \ - .attributeCount = 0, \ - .clusterSize = 0, \ - .mask = ZAP_CLUSTER_MASK(CLIENT), \ - .functions = NULL, \ - .acceptedCommandList = nullptr, \ - .generatedCommandList = nullptr, \ - .eventList = nullptr, \ - .eventCount = 0, \ - },\ - { \ - /* Endpoint: 1, Cluster: NordicDevKit (server) */ \ - .clusterId = 0xFFF1FC01, \ - .attributes = ZAP_ATTRIBUTE_INDEX(86), \ - .attributeCount = 5, \ - .clusterSize = 263, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ), \ - .generatedCommandList = nullptr, \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -607,48 +505,71 @@ // clang-format on -#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 11 +#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 10 // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 11, 74 }, \ - { ZAP_CLUSTER_INDEX(11), 2, 263 }, \ + { ZAP_CLUSTER_INDEX(0), 11, 72 }, \ } // Largest attribute size is needed for various buffers -#define ATTRIBUTE_LARGEST (256) +#define ATTRIBUTE_LARGEST (66) static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, "ATTRIBUTE_LARGEST larger than expected"); // Total size of singleton attributes -#define ATTRIBUTE_SINGLETONS_SIZE (37) +#define ATTRIBUTE_SINGLETONS_SIZE (35) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (337) +#define ATTRIBUTE_MAX_SIZE (72) // Number of fixed endpoints -#define FIXED_ENDPOINT_COUNT (2) +#define FIXED_ENDPOINT_COUNT (1) // Array of endpoints that are supported, the data inside // the array is the endpoint number. -#define FIXED_ENDPOINT_ARRAY { 0x0000, 0x0001 } +#define FIXED_ENDPOINT_ARRAY \ + { \ + 0x0000 \ + } // Array of profile ids -#define FIXED_PROFILE_IDS { 0x0103, 0x0FFF } +#define FIXED_PROFILE_IDS \ + { \ + 0x0103 \ + } // Array of device types -#define FIXED_DEVICE_TYPES { { 0x00000012, 1 }, { 0x00000016, 3 }, { 0x00000001, 1 } } +#define FIXED_DEVICE_TYPES \ + { \ + { 0x00000012, 1 }, \ + { \ + 0x00000016, 3 \ + } \ + } // Array of device type offsets -#define FIXED_DEVICE_TYPE_OFFSETS { 0, 2 } +#define FIXED_DEVICE_TYPE_OFFSETS \ + { \ + 0 \ + } // Array of device type lengths -#define FIXED_DEVICE_TYPE_LENGTHS { 2, 1 } +#define FIXED_DEVICE_TYPE_LENGTHS \ + { \ + 2 \ + } // Array of endpoint types supported on each endpoint -#define FIXED_ENDPOINT_TYPES { 0, 1 } +#define FIXED_ENDPOINT_TYPES \ + { \ + 0 \ + } // Array of parent endpoints for each endpoint -#define FIXED_PARENT_ENDPOINTS { kInvalidEndpointId, kInvalidEndpointId } +#define FIXED_PARENT_ENDPOINTS \ + { \ + kInvalidEndpointId \ + } diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/gen_config.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/gen_config.h index 1d7e7f911156..52573442deb7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/gen_config.h @@ -158,7 +158,6 @@ #define MATTER_DM_TLS_CLIENT_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_METER_IDENTIFICATION_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_COMMODITY_METERING_CLUSTER_SERVER_ENDPOINT_COUNT (0) -#define MATTER_DM_NORDIC_DEV_KIT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define MATTER_DM_UNIT_TESTING_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_FAULT_INJECTION_CLUSTER_SERVER_ENDPOINT_COUNT (0) #define MATTER_DM_SAMPLE_MEI_CLUSTER_SERVER_ENDPOINT_COUNT (0) @@ -300,7 +299,6 @@ #define MATTER_DM_TLS_CLIENT_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_METER_IDENTIFICATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_COMMODITY_METERING_CLUSTER_CLIENT_ENDPOINT_COUNT (0) -#define MATTER_DM_NORDIC_DEV_KIT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define MATTER_DM_UNIT_TESTING_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_FAULT_INJECTION_CLUSTER_CLIENT_ENDPOINT_COUNT (0) #define MATTER_DM_SAMPLE_MEI_CLUSTER_CLIENT_ENDPOINT_COUNT (0) @@ -361,24 +359,12 @@ #define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT_SERVER #define MATTER_DM_PLUGIN_GROUP_KEY_MANAGEMENT -// Use this macro to check if the client side of the NordicDevKit cluster is included -#define ZCL_USING_NORDIC_DEV_KIT_CLUSTER_CLIENT -#define MATTER_DM_PLUGIN_NORDIC_DEV_KIT_CLIENT - -// Use this macro to check if the server side of the NordicDevKit cluster is included -#define ZCL_USING_NORDIC_DEV_KIT_CLUSTER_SERVER -#define MATTER_DM_PLUGIN_NORDIC_DEV_KIT_SERVER -#define MATTER_DM_PLUGIN_NORDIC_DEV_KIT - /**** Cluster Commands Flag ****/ // AdministratorCommissioning Cluster Commands #define ADMINISTRATOR_COMMISSIONING_ENABLE_OPEN_COMMISSIONING_WINDOW_CMD 1 #define ADMINISTRATOR_COMMISSIONING_ENABLE_OPEN_BASIC_COMMISSIONING_WINDOW_CMD 1 #define ADMINISTRATOR_COMMISSIONING_ENABLE_REVOKE_COMMISSIONING_CMD 1 -// BasicInformation Cluster Commands -#define BASIC_INFORMATION_ENABLE_GENERATE_RANDOM_CMD 1 - // GeneralCommissioning Cluster Commands #define GENERAL_COMMISSIONING_ENABLE_ARM_FAIL_SAFE_CMD 1 #define GENERAL_COMMISSIONING_ENABLE_SET_REGULATORY_CONFIG_CMD 1 @@ -402,9 +388,6 @@ #define NETWORK_COMMISSIONING_ENABLE_CONNECT_NETWORK_CMD 1 #define NETWORK_COMMISSIONING_ENABLE_REORDER_NETWORK_CMD 1 -// NordicDevKit Cluster Commands -#define NORDIC_DEV_KIT_ENABLE_SET_LED_CMD 1 - // OtaSoftwareUpdateRequestor Cluster Commands #define OTA_SOFTWARE_UPDATE_REQUESTOR_ENABLE_ANNOUNCE_OTA_PROVIDER_CMD 1 @@ -417,3 +400,5 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 diff --git a/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.matter b/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.matter index 2cd067058a7b..1dc3ea396915 100644 --- a/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.matter +++ b/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.matter @@ -2490,6 +2490,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2547,7 +2550,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.zap b/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.zap index bd17bd7ce1ef..72f2a242671b 100644 --- a/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.zap +++ b/samples/matter/smoke_co_alarm/src/default_zap/smoke_co_alarm.zap @@ -3558,6 +3558,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4399,7 +4423,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index 3491d71d2931..9ab431548979 100644 --- a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -415,6 +415,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/access.h b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/access.h index c9c70d524620..f16398888cc2 100644 --- a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/access.h +++ b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/access.h @@ -143,6 +143,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -177,6 +179,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -211,6 +215,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/endpoint_config.h index 9f1da03d5e3a..3e3c779afec4 100644 --- a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/endpoint_config.h @@ -455,7 +455,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -585,40 +585,43 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=45)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=50) */ \ + /* AcceptedCommandList (index=53) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: ICD Management (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* RegisterClient */, \ 0x00000002 /* UnregisterClient */, \ 0x00000003 /* StayActiveRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=62)*/ \ + /* GeneratedCommandList (index=65)*/ \ 0x00000001 /* RegisterClientResponse */, \ 0x00000004 /* StayActiveResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=65) */ \ + /* AcceptedCommandList (index=68) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */\ - /* AcceptedCommandList (index=67) */ \ + /* AcceptedCommandList (index=70) */ \ 0x00000000 /* SelfTestRequest */, \ chip::kInvalidCommandId /* end of list */, \ } @@ -807,7 +810,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -819,8 +822,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -832,8 +835,8 @@ .clusterSize = 135, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -845,7 +848,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -884,7 +887,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/gen_config.h b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/gen_config.h index ed97733f814d..b30ac2affa94 100644 --- a/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/smoke_co_alarm/src/default_zap/zap-generated/gen_config.h @@ -446,6 +446,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // SmokeCoAlarm Cluster Commands #define SMOKE_CO_ALARM_ENABLE_SELF_TEST_REQUEST_CMD 1 diff --git a/samples/matter/template/src/default_zap/template.matter b/samples/matter/template/src/default_zap/template.matter index 6030dcc50d56..e642629b781f 100644 --- a/samples/matter/template/src/default_zap/template.matter +++ b/samples/matter/template/src/default_zap/template.matter @@ -1619,6 +1619,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { diff --git a/samples/matter/template/src/default_zap/template.zap b/samples/matter/template/src/default_zap/template.zap index f0981d013766..8fea8430cfd4 100644 --- a/samples/matter/template/src/default_zap/template.zap +++ b/samples/matter/template/src/default_zap/template.zap @@ -2057,6 +2057,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ diff --git a/samples/matter/template/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/template/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index f1891bf1d0e3..0fd868dcd73f 100644 --- a/samples/matter/template/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/template/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -257,6 +257,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/template/src/default_zap/zap-generated/access.h b/samples/matter/template/src/default_zap/zap-generated/access.h index 6e2be3018f2a..34fab00297fa 100644 --- a/samples/matter/template/src/default_zap/zap-generated/access.h +++ b/samples/matter/template/src/default_zap/zap-generated/access.h @@ -135,6 +135,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -164,6 +166,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -193,6 +197,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/template/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/template/src/default_zap/zap-generated/endpoint_config.h index c87779c8093a..4371ff0ec215 100644 --- a/samples/matter/template/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/template/src/default_zap/zap-generated/endpoint_config.h @@ -329,21 +329,24 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=39)*/ \ + /* GeneratedCommandList (index=41)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=44) */ \ + /* AcceptedCommandList (index=47) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=49)*/ \ + /* GeneratedCommandList (index=52)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ @@ -481,7 +484,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -493,8 +496,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ diff --git a/samples/matter/template/src/default_zap/zap-generated/gen_config.h b/samples/matter/template/src/default_zap/zap-generated/gen_config.h index 51e43bb3773c..52573442deb7 100644 --- a/samples/matter/template/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/template/src/default_zap/zap-generated/gen_config.h @@ -400,3 +400,5 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 diff --git a/samples/matter/thermostat/src/default_zap/thermostat.matter b/samples/matter/thermostat/src/default_zap/thermostat.matter index ba0f02fd4919..c2ad43996f3f 100644 --- a/samples/matter/thermostat/src/default_zap/thermostat.matter +++ b/samples/matter/thermostat/src/default_zap/thermostat.matter @@ -2619,6 +2619,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2653,7 +2656,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/thermostat/src/default_zap/thermostat.zap b/samples/matter/thermostat/src/default_zap/thermostat.zap index fe363a842e29..040def4952fd 100644 --- a/samples/matter/thermostat/src/default_zap/thermostat.zap +++ b/samples/matter/thermostat/src/default_zap/thermostat.zap @@ -3645,6 +3645,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4193,7 +4217,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/samples/matter/thermostat/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/thermostat/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index f4084a0bcc8e..877cf5e082fd 100644 --- a/samples/matter/thermostat/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/thermostat/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -444,6 +444,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/thermostat/src/default_zap/zap-generated/access.h b/samples/matter/thermostat/src/default_zap/zap-generated/access.h index e29e4b433bad..1b1af3c3727f 100644 --- a/samples/matter/thermostat/src/default_zap/zap-generated/access.h +++ b/samples/matter/thermostat/src/default_zap/zap-generated/access.h @@ -165,6 +165,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -200,6 +202,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -235,6 +239,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/thermostat/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/thermostat/src/default_zap/zap-generated/endpoint_config.h index 0e25a1346d7d..7f38936847d5 100644 --- a/samples/matter/thermostat/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/thermostat/src/default_zap/zap-generated/endpoint_config.h @@ -446,7 +446,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Groups (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* NameSupport */ \ @@ -608,30 +608,33 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=45)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=50) */ \ + /* AcceptedCommandList (index=53) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=61) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=60) */ \ + /* AcceptedCommandList (index=63) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -639,14 +642,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=67)*/ \ + /* GeneratedCommandList (index=70)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Thermostat (server) */\ - /* AcceptedCommandList (index=72) */ \ + /* AcceptedCommandList (index=75) */ \ 0x00000000 /* SetpointRaiseLower */, \ chip::kInvalidCommandId /* end of list */, \ } @@ -835,7 +838,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -847,8 +850,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -873,7 +876,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -886,8 +889,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -925,7 +928,7 @@ .clusterSize = 33, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayThermostatServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/samples/matter/thermostat/src/default_zap/zap-generated/gen_config.h b/samples/matter/thermostat/src/default_zap/zap-generated/gen_config.h index eabed3c5502f..74ec05171021 100644 --- a/samples/matter/thermostat/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/thermostat/src/default_zap/zap-generated/gen_config.h @@ -462,6 +462,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // Thermostat Cluster Commands #define THERMOSTAT_ENABLE_SETPOINT_RAISE_LOWER_CMD 1 diff --git a/samples/matter/window_covering/src/default_zap/window-app.matter b/samples/matter/window_covering/src/default_zap/window-app.matter index 7d1e97fdf984..c533e0fc8250 100644 --- a/samples/matter/window_covering/src/default_zap/window-app.matter +++ b/samples/matter/window_covering/src/default_zap/window-app.matter @@ -2259,6 +2259,9 @@ endpoint 0 { handle command UpdateFabricLabel; handle command RemoveFabric; handle command AddTrustedRootCertificate; + handle command SetVIDVerificationStatement; + handle command SignVIDVerificationRequest; + handle command SignVIDVerificationResponse; } server cluster GroupKeyManagement { @@ -2302,7 +2305,7 @@ endpoint 1 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 5; + ram attribute clusterRevision default = 6; handle command Identify; } diff --git a/samples/matter/window_covering/src/default_zap/window-app.zap b/samples/matter/window_covering/src/default_zap/window-app.zap index 659e3ee36f49..26abc9e4c16b 100644 --- a/samples/matter/window_covering/src/default_zap/window-app.zap +++ b/samples/matter/window_covering/src/default_zap/window-app.zap @@ -3387,6 +3387,30 @@ "source": "client", "isIncoming": 1, "isEnabled": 1 + }, + { + "name": "SetVIDVerificationStatement", + "code": 12, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationRequest", + "code": 13, + "mfgCode": null, + "source": "client", + "isIncoming": 1, + "isEnabled": 1 + }, + { + "name": "SignVIDVerificationResponse", + "code": 14, + "mfgCode": null, + "source": "server", + "isIncoming": 0, + "isEnabled": 1 } ], "attributes": [ @@ -4065,7 +4089,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "6", "reportable": 1, "minInterval": 0, "maxInterval": 65344, diff --git a/samples/matter/window_covering/src/default_zap/zap-generated/IMClusterCommandHandler.cpp b/samples/matter/window_covering/src/default_zap/zap-generated/IMClusterCommandHandler.cpp index e5d646811486..92746f3ef002 100644 --- a/samples/matter/window_covering/src/default_zap/zap-generated/IMClusterCommandHandler.cpp +++ b/samples/matter/window_covering/src/default_zap/zap-generated/IMClusterCommandHandler.cpp @@ -348,6 +348,27 @@ namespace app } break; } + case Commands::SetVIDVerificationStatement::Id: { + Commands::SetVIDVerificationStatement::DecodableType commandData; + TLVError = commandData.Decode(aDataTlv, + apCommandObj->GetAccessingFabricIndex()); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSetVIDVerificationStatementCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } + case Commands::SignVIDVerificationRequest::Id: { + Commands::SignVIDVerificationRequest::DecodableType commandData; + TLVError = DataModel::Decode(aDataTlv, commandData); + if (TLVError == CHIP_NO_ERROR) { + wasHandled = + emberAfOperationalCredentialsClusterSignVIDVerificationRequestCallback( + apCommandObj, aCommandPath, commandData); + } + break; + } default: { // Unrecognized command ID, error status will apply. ChipLogError(Zcl, diff --git a/samples/matter/window_covering/src/default_zap/zap-generated/access.h b/samples/matter/window_covering/src/default_zap/zap-generated/access.h index 8db1b7102f30..d564b65a97be 100644 --- a/samples/matter/window_covering/src/default_zap/zap-generated/access.h +++ b/samples/matter/window_covering/src/default_zap/zap-generated/access.h @@ -142,6 +142,8 @@ 0x0000003E, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000003E, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x0000003F, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -172,6 +174,8 @@ 0x00000009, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ 0x0000000A, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ 0x0000000B, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + 0x0000000C, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + 0x0000000D, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ 0x00000000, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ 0x00000001, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ 0x00000003, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ @@ -202,6 +206,8 @@ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: UpdateFabricLabel, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: RemoveFabric, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: AddTrustedRootCertificate, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SetVIDVerificationStatement, Privilege: administer */ \ + chip::Access::Privilege::kAdminister, /* Cluster: Operational Credentials, Command: SignVIDVerificationRequest, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetWrite, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRead, Privilege: administer */ \ chip::Access::Privilege::kAdminister, /* Cluster: Group Key Management, Command: KeySetRemove, Privilege: administer */ \ diff --git a/samples/matter/window_covering/src/default_zap/zap-generated/endpoint_config.h b/samples/matter/window_covering/src/default_zap/zap-generated/endpoint_config.h index a2f77db8c251..3ffbddf40993 100644 --- a/samples/matter/window_covering/src/default_zap/zap-generated/endpoint_config.h +++ b/samples/matter/window_covering/src/default_zap/zap-generated/endpoint_config.h @@ -421,7 +421,7 @@ ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \ { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* IdentifyType */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ + { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ @@ -563,30 +563,33 @@ 0x00000009 /* UpdateFabricLabel */, \ 0x0000000A /* RemoveFabric */, \ 0x0000000B /* AddTrustedRootCertificate */, \ + 0x0000000C /* SetVIDVerificationStatement */, \ + 0x0000000D /* SignVIDVerificationRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=44)*/ \ + /* GeneratedCommandList (index=46)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ + 0x0000000E /* SignVIDVerificationResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=49) */ \ + /* AcceptedCommandList (index=52) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=54)*/ \ + /* GeneratedCommandList (index=57)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=57) */ \ + /* AcceptedCommandList (index=60) */ \ 0x00000000 /* Identify */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Window Covering (server) */\ - /* AcceptedCommandList (index=59) */ \ + /* AcceptedCommandList (index=62) */ \ 0x00000000 /* UpOrOpen */, \ 0x00000001 /* DownOrClose */, \ 0x00000002 /* StopMotion */, \ @@ -766,7 +769,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -778,8 +781,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ), \ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ), \ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ), \ .eventList = nullptr, \ .eventCount = 0, \ },\ @@ -804,7 +807,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ @@ -830,7 +833,7 @@ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayWindowCoveringServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ), \ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ), \ .generatedCommandList = nullptr, \ .eventList = nullptr, \ .eventCount = 0, \ diff --git a/samples/matter/window_covering/src/default_zap/zap-generated/gen_config.h b/samples/matter/window_covering/src/default_zap/zap-generated/gen_config.h index ae6149c1ca1e..b06856636963 100644 --- a/samples/matter/window_covering/src/default_zap/zap-generated/gen_config.h +++ b/samples/matter/window_covering/src/default_zap/zap-generated/gen_config.h @@ -435,6 +435,8 @@ #define OPERATIONAL_CREDENTIALS_ENABLE_UPDATE_FABRIC_LABEL_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_REMOVE_FABRIC_CMD 1 #define OPERATIONAL_CREDENTIALS_ENABLE_ADD_TRUSTED_ROOT_CERTIFICATE_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SET_VID_VERIFICATION_STATEMENT_CMD 1 +#define OPERATIONAL_CREDENTIALS_ENABLE_SIGN_VID_VERIFICATION_REQUEST_CMD 1 // ThreadNetworkDiagnostics Cluster Commands #define THREAD_NETWORK_DIAGNOSTICS_ENABLE_RESET_COUNTS_CMD 1 diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index b91dc267fcca..273f61cfe420 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -22,6 +22,13 @@ - applications.matter_bridge.memory_profiling comment: "Variant does not fit in FLASH area - it should be probably removed in the future" +- scenarios: + - sample.matter.light_bulb.memory_profiling + platforms: + - nrf7002dk/nrf5340/cpuapp + comment: "https://nordicsemi.atlassian.net/browse/KRKNWK-20715" + + - scenarios: - nrf.extended.drivers.uart.uart_elementary_dual_l09 - nrf.extended.drivers.uart.uart_elementary_dual_setup_mismatch_l09