Skip to content

matter: update data model and enable mandatory cmds #24029

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

matter: update data model and enable mandatory cmds #24029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions applications/matter_bridge/snippets/onoff_plug/bridge.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
30 changes: 27 additions & 3 deletions applications/matter_bridge/snippets/onoff_plug/bridge.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -3077,7 +3101,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -3402,7 +3426,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -4382,7 +4406,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "5",
"defaultValue": "6",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
21 changes: 21 additions & 0 deletions applications/matter_bridge/snippets/onoff_plug/zap-generated/IMClusterCommandHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */ \
Expand Down Expand Up @@ -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 */ \
Expand Down Expand Up @@ -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 */ \
Expand Down
65 changes: 34 additions & 31 deletions applications/matter_bridge/snippets/onoff_plug/zap-generated/endpoint_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand All @@ -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 */ \
Expand Down Expand Up @@ -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 */ \
Expand Down Expand Up @@ -567,50 +567,53 @@
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 */, \
0x00000003 /* RemoveGroup */, \
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 */, \
Expand All @@ -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 */, \
Expand All @@ -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 */, \
Expand All @@ -637,27 +640,27 @@
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 */, \
0x00000003 /* RemoveGroup */, \
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 */, \
Expand Down Expand Up @@ -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, \
},\
Expand All @@ -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, \
},\
Expand All @@ -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, \
Expand All @@ -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, \
Expand All @@ -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, \
},\
Expand All @@ -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, \
Expand All @@ -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, \
},\
Expand All @@ -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, \
Expand All @@ -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, \
},\
Expand All @@ -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, \
Expand Down
2 changes: 2 additions & 0 deletions applications/matter_bridge/snippets/onoff_plug/zap-generated/gen_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading