Skip to content

samples: matter: Fixed Matter 1.5 compliance issues #25715

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
Nov 26, 2025
+410 −814
Merged

samples: matter: Fixed Matter 1.5 compliance issues #25715

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
15 changes: 1 addition & 14 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 @@ -722,12 +722,7 @@ cluster Binding = 30 {
and enforce Access Control for the Node's endpoints and their associated
cluster instances. */
cluster AccessControl = 31 {
revision 3;

enum AccessControlAuxiliaryTypeEnum : enum8 {
kSystem = 0;
kGroupcast = 1;
}
revision 2;

enum AccessControlEntryAuthModeEnum : enum8 {
kPASE = 1 [spec_name = "PASE"];
Expand Down Expand Up @@ -759,7 +754,6 @@ cluster AccessControl = 31 {
bitmap Feature : bitmap32 {
kExtension = 0x1;
kManagedDevice = 0x2;
kAuxiliary = 0x4;
}

struct AccessRestrictionStruct {
Expand Down Expand Up @@ -791,7 +785,6 @@ cluster AccessControl = 31 {
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
nullable fabric_sensitive int64u subjects[] = 3;
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -823,19 +816,13 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
nullable node_id adminNodeID = 0;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
readonly attribute int16u subjectsPerAccessControlEntry = 2;
readonly attribute int16u targetsPerAccessControlEntry = 3;
readonly attribute int16u accessControlEntriesPerFabric = 4;
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
3 changes: 0 additions & 3 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 @@ -257,23 +257,20 @@
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, *event*, privilege) for read event
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
15 changes: 1 addition & 14 deletions applications/matter_bridge/src/default_zap/bridge.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,12 +722,7 @@ cluster Binding = 30 {
and enforce Access Control for the Node's endpoints and their associated
cluster instances. */
cluster AccessControl = 31 {
revision 3;

enum AccessControlAuxiliaryTypeEnum : enum8 {
kSystem = 0;
kGroupcast = 1;
}
revision 2;

enum AccessControlEntryAuthModeEnum : enum8 {
kPASE = 1 [spec_name = "PASE"];
Expand Down Expand Up @@ -759,7 +754,6 @@ cluster AccessControl = 31 {
bitmap Feature : bitmap32 {
kExtension = 0x1;
kManagedDevice = 0x2;
kAuxiliary = 0x4;
}

struct AccessRestrictionStruct {
Expand Down Expand Up @@ -791,7 +785,6 @@ cluster AccessControl = 31 {
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
nullable fabric_sensitive int64u subjects[] = 3;
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -823,19 +816,13 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
nullable node_id adminNodeID = 0;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
readonly attribute int16u subjectsPerAccessControlEntry = 2;
readonly attribute int16u targetsPerAccessControlEntry = 3;
readonly attribute int16u accessControlEntriesPerFabric = 4;
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_bridge/src/default_zap/zap-generated/access.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,23 +245,20 @@
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, *event*, privilege) for read event
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
15 changes: 1 addition & 14 deletions applications/matter_weather_station/src/default_zap/weather-station.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,12 +435,7 @@ cluster Descriptor = 29 {
and enforce Access Control for the Node's endpoints and their associated
cluster instances. */
cluster AccessControl = 31 {
revision 3;

enum AccessControlAuxiliaryTypeEnum : enum8 {
kSystem = 0;
kGroupcast = 1;
}
revision 2;

enum AccessControlEntryAuthModeEnum : enum8 {
kPASE = 1 [spec_name = "PASE"];
Expand Down Expand Up @@ -472,7 +467,6 @@ cluster AccessControl = 31 {
bitmap Feature : bitmap32 {
kExtension = 0x1;
kManagedDevice = 0x2;
kAuxiliary = 0x4;
}

struct AccessRestrictionStruct {
Expand Down Expand Up @@ -504,7 +498,6 @@ cluster AccessControl = 31 {
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
nullable fabric_sensitive int64u subjects[] = 3;
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -536,19 +529,13 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
nullable node_id adminNodeID = 0;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
readonly attribute int16u subjectsPerAccessControlEntry = 2;
readonly attribute int16u targetsPerAccessControlEntry = 3;
readonly attribute int16u accessControlEntriesPerFabric = 4;
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
3 changes: 0 additions & 3 deletions applications/matter_weather_station/src/default_zap/zap-generated/access.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,23 +218,20 @@
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, *event*, privilege) for read event
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
15 changes: 1 addition & 14 deletions samples/matter/closure/src/default_zap/closure.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,12 +435,7 @@ cluster Descriptor = 29 {
and enforce Access Control for the Node's endpoints and their associated
cluster instances. */
cluster AccessControl = 31 {
revision 3;

enum AccessControlAuxiliaryTypeEnum : enum8 {
kSystem = 0;
kGroupcast = 1;
}
revision 2;

enum AccessControlEntryAuthModeEnum : enum8 {
kPASE = 1 [spec_name = "PASE"];
Expand Down Expand Up @@ -472,7 +467,6 @@ cluster AccessControl = 31 {
bitmap Feature : bitmap32 {
kExtension = 0x1;
kManagedDevice = 0x2;
kAuxiliary = 0x4;
}

struct AccessRestrictionStruct {
Expand Down Expand Up @@ -504,7 +498,6 @@ cluster AccessControl = 31 {
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
nullable fabric_sensitive int64u subjects[] = 3;
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -536,19 +529,13 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
nullable node_id adminNodeID = 0;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
readonly attribute int16u subjectsPerAccessControlEntry = 2;
readonly attribute int16u targetsPerAccessControlEntry = 3;
readonly attribute int16u accessControlEntriesPerFabric = 4;
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
2 changes: 1 addition & 1 deletion samples/matter/closure/src/default_zap/closure.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,4 +3025,4 @@
"parentEndpointIdentifier": 0
}
]
}
}
3 changes: 0 additions & 3 deletions samples/matter/closure/src/default_zap/zap-generated/access.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,23 +218,20 @@
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, *event*, privilege) for read event
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
15 changes: 1 addition & 14 deletions samples/matter/common/src/certification/thread_platform/thread_certification.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,12 +582,7 @@ cluster Descriptor = 29 {
and enforce Access Control for the Node's endpoints and their associated
cluster instances. */
cluster AccessControl = 31 {
revision 3;

enum AccessControlAuxiliaryTypeEnum : enum8 {
kSystem = 0;
kGroupcast = 1;
}
revision 2;

enum AccessControlEntryAuthModeEnum : enum8 {
kPASE = 1 [spec_name = "PASE"];
Expand Down Expand Up @@ -619,7 +614,6 @@ cluster AccessControl = 31 {
bitmap Feature : bitmap32 {
kExtension = 0x1;
kManagedDevice = 0x2;
kAuxiliary = 0x4;
}

struct AccessRestrictionStruct {
Expand Down Expand Up @@ -651,7 +645,6 @@ cluster AccessControl = 31 {
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
nullable fabric_sensitive int64u subjects[] = 3;
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -683,19 +676,13 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
nullable node_id adminNodeID = 0;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
readonly attribute int16u subjectsPerAccessControlEntry = 2;
readonly attribute int16u targetsPerAccessControlEntry = 3;
readonly attribute int16u accessControlEntriesPerFabric = 4;
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
3 changes: 0 additions & 3 deletions samples/matter/common/src/certification/thread_platform/zap-generated/access.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,23 +269,20 @@
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, *event*, privilege) for read event
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 4 additions & 0 deletions samples/matter/common/src/zap_samples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@
# contact sensor
- name: contact_sensor
zap_file: samples/matter/contact_sensor/src/default_zap/contact_sensor.zap

# closure
- name: closure
zap_file: samples/matter/closure/src/default_zap/closure.zap
Loading