Skip to content

Commit ed47f2d

Browse files
kkasperczyk-nokkasperczyk-no
committed
samples: matter: Fixed Matter 1.5 compliance issues
* Regenerated files and pulled changes to fix issue with incorrect Access Control cluster revision and enabled provisional ConfigurationVersion * Fixed persisting DevKitName attribute Signed-off-by: Kamil Kasperczyk <[email protected]>
1 parent a144061 commit ed47f2d

File tree

145 files changed

+410
-814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+410
-814
lines changed

‎applications/matter_bridge/snippets/onoff_plug/bridge.matter‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -722,12 +722,7 @@ cluster Binding = 30 {
722722
and enforce Access Control for the Node's endpoints and their associated
723723
cluster instances. */
724724
cluster AccessControl = 31 {
725-
revision 3;
726-
727-
enum AccessControlAuxiliaryTypeEnum : enum8 {
728-
kSystem = 0;
729-
kGroupcast = 1;
730-
}
725+
revision 2;
731726

732727
enum AccessControlEntryAuthModeEnum : enum8 {
733728
kPASE = 1 [spec_name = "PASE"];
@@ -759,7 +754,6 @@ cluster AccessControl = 31 {
759754
bitmap Feature : bitmap32 {
760755
kExtension = 0x1;
761756
kManagedDevice = 0x2;
762-
kAuxiliary = 0x4;
763757
}
764758

765759
struct AccessRestrictionStruct {
@@ -791,7 +785,6 @@ cluster AccessControl = 31 {
791785
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
792786
nullable fabric_sensitive int64u subjects[] = 3;
793787
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
794-
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
795788
fabric_idx fabricIndex = 254;
796789
}
797790

@@ -823,19 +816,13 @@ cluster AccessControl = 31 {
823816
fabric_idx fabricIndex = 254;
824817
}
825818

826-
fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
827-
nullable node_id adminNodeID = 0;
828-
fabric_idx fabricIndex = 254;
829-
}
830-
831819
attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
832820
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
833821
readonly attribute int16u subjectsPerAccessControlEntry = 2;
834822
readonly attribute int16u targetsPerAccessControlEntry = 3;
835823
readonly attribute int16u accessControlEntriesPerFabric = 4;
836824
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
837825
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
838-
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
839826
readonly attribute command_id generatedCommandList[] = 65528;
840827
readonly attribute command_id acceptedCommandList[] = 65529;
841828
readonly attribute attrib_id attributeList[] = 65531;

‎applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,23 +257,20 @@
257257
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
258258
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
259259
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
260-
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
261260
}
262261

263262
// Parallel array data (cluster, *event*, privilege) for read event
264263
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
265264
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
266265
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
267266
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
268-
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
269267
}
270268

271269
// Parallel array data (cluster, event, *privilege*) for read event
272270
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
273271
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
274272
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
275273
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
276-
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
277274
}
278275

279276
////////////////////////////////////////////////////////////////////////////////

‎applications/matter_bridge/src/default_zap/bridge.matter‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -722,12 +722,7 @@ cluster Binding = 30 {
722722
and enforce Access Control for the Node's endpoints and their associated
723723
cluster instances. */
724724
cluster AccessControl = 31 {
725-
revision 3;
726-
727-
enum AccessControlAuxiliaryTypeEnum : enum8 {
728-
kSystem = 0;
729-
kGroupcast = 1;
730-
}
725+
revision 2;
731726

732727
enum AccessControlEntryAuthModeEnum : enum8 {
733728
kPASE = 1 [spec_name = "PASE"];
@@ -759,7 +754,6 @@ cluster AccessControl = 31 {
759754
bitmap Feature : bitmap32 {
760755
kExtension = 0x1;
761756
kManagedDevice = 0x2;
762-
kAuxiliary = 0x4;
763757
}
764758

765759
struct AccessRestrictionStruct {
@@ -791,7 +785,6 @@ cluster AccessControl = 31 {
791785
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
792786
nullable fabric_sensitive int64u subjects[] = 3;
793787
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
794-
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
795788
fabric_idx fabricIndex = 254;
796789
}
797790

@@ -823,19 +816,13 @@ cluster AccessControl = 31 {
823816
fabric_idx fabricIndex = 254;
824817
}
825818

826-
fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
827-
nullable node_id adminNodeID = 0;
828-
fabric_idx fabricIndex = 254;
829-
}
830-
831819
attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
832820
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
833821
readonly attribute int16u subjectsPerAccessControlEntry = 2;
834822
readonly attribute int16u targetsPerAccessControlEntry = 3;
835823
readonly attribute int16u accessControlEntriesPerFabric = 4;
836824
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
837825
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
838-
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
839826
readonly attribute command_id generatedCommandList[] = 65528;
840827
readonly attribute command_id acceptedCommandList[] = 65529;
841828
readonly attribute attrib_id attributeList[] = 65531;

‎applications/matter_bridge/src/default_zap/zap-generated/access.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,23 +245,20 @@
245245
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
246246
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
247247
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
248-
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
249248
}
250249

251250
// Parallel array data (cluster, *event*, privilege) for read event
252251
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
253252
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
254253
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
255254
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
256-
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
257255
}
258256

259257
// Parallel array data (cluster, event, *privilege*) for read event
260258
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
261259
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
262260
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
263261
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
264-
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
265262
}
266263

267264
////////////////////////////////////////////////////////////////////////////////

‎applications/matter_weather_station/src/default_zap/weather-station.matter‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,7 @@ cluster Descriptor = 29 {
435435
and enforce Access Control for the Node's endpoints and their associated
436436
cluster instances. */
437437
cluster AccessControl = 31 {
438-
revision 3;
439-
440-
enum AccessControlAuxiliaryTypeEnum : enum8 {
441-
kSystem = 0;
442-
kGroupcast = 1;
443-
}
438+
revision 2;
444439

445440
enum AccessControlEntryAuthModeEnum : enum8 {
446441
kPASE = 1 [spec_name = "PASE"];
@@ -472,7 +467,6 @@ cluster AccessControl = 31 {
472467
bitmap Feature : bitmap32 {
473468
kExtension = 0x1;
474469
kManagedDevice = 0x2;
475-
kAuxiliary = 0x4;
476470
}
477471

478472
struct AccessRestrictionStruct {
@@ -504,7 +498,6 @@ cluster AccessControl = 31 {
504498
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
505499
nullable fabric_sensitive int64u subjects[] = 3;
506500
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
507-
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
508501
fabric_idx fabricIndex = 254;
509502
}
510503

@@ -536,19 +529,13 @@ cluster AccessControl = 31 {
536529
fabric_idx fabricIndex = 254;
537530
}
538531

539-
fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
540-
nullable node_id adminNodeID = 0;
541-
fabric_idx fabricIndex = 254;
542-
}
543-
544532
attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
545533
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
546534
readonly attribute int16u subjectsPerAccessControlEntry = 2;
547535
readonly attribute int16u targetsPerAccessControlEntry = 3;
548536
readonly attribute int16u accessControlEntriesPerFabric = 4;
549537
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
550538
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
551-
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
552539
readonly attribute command_id generatedCommandList[] = 65528;
553540
readonly attribute command_id acceptedCommandList[] = 65529;
554541
readonly attribute attrib_id attributeList[] = 65531;

‎applications/matter_weather_station/src/default_zap/zap-generated/access.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,23 +218,20 @@
218218
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
219219
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
220220
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
221-
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
222221
}
223222

224223
// Parallel array data (cluster, *event*, privilege) for read event
225224
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
226225
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
227226
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
228227
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
229-
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
230228
}
231229

232230
// Parallel array data (cluster, event, *privilege*) for read event
233231
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
234232
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
235233
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
236234
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
237-
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
238235
}
239236

240237
////////////////////////////////////////////////////////////////////////////////

‎samples/matter/closure/src/default_zap/closure.matter‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,7 @@ cluster Descriptor = 29 {
435435
and enforce Access Control for the Node's endpoints and their associated
436436
cluster instances. */
437437
cluster AccessControl = 31 {
438-
revision 3;
439-
440-
enum AccessControlAuxiliaryTypeEnum : enum8 {
441-
kSystem = 0;
442-
kGroupcast = 1;
443-
}
438+
revision 2;
444439

445440
enum AccessControlEntryAuthModeEnum : enum8 {
446441
kPASE = 1 [spec_name = "PASE"];
@@ -472,7 +467,6 @@ cluster AccessControl = 31 {
472467
bitmap Feature : bitmap32 {
473468
kExtension = 0x1;
474469
kManagedDevice = 0x2;
475-
kAuxiliary = 0x4;
476470
}
477471

478472
struct AccessRestrictionStruct {
@@ -504,7 +498,6 @@ cluster AccessControl = 31 {
504498
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
505499
nullable fabric_sensitive int64u subjects[] = 3;
506500
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
507-
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
508501
fabric_idx fabricIndex = 254;
509502
}
510503

@@ -536,19 +529,13 @@ cluster AccessControl = 31 {
536529
fabric_idx fabricIndex = 254;
537530
}
538531

539-
fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
540-
nullable node_id adminNodeID = 0;
541-
fabric_idx fabricIndex = 254;
542-
}
543-
544532
attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
545533
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
546534
readonly attribute int16u subjectsPerAccessControlEntry = 2;
547535
readonly attribute int16u targetsPerAccessControlEntry = 3;
548536
readonly attribute int16u accessControlEntriesPerFabric = 4;
549537
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
550538
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
551-
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
552539
readonly attribute command_id generatedCommandList[] = 65528;
553540
readonly attribute command_id acceptedCommandList[] = 65529;
554541
readonly attribute attrib_id attributeList[] = 65531;

‎samples/matter/closure/src/default_zap/closure.zap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3025,4 +3025,4 @@
30253025
"parentEndpointIdentifier": 0
30263026
}
30273027
]
3028-
}
3028+
}

‎samples/matter/closure/src/default_zap/zap-generated/access.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,23 +218,20 @@
218218
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
219219
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
220220
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
221-
0x0000001F, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
222221
}
223222

224223
// Parallel array data (cluster, *event*, privilege) for read event
225224
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
226225
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
227226
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
228227
0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
229-
0x00000003, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
230228
}
231229

232230
// Parallel array data (cluster, event, *privilege*) for read event
233231
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
234232
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
235233
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
236234
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
237-
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AuxiliaryAccessUpdated, Privilege: administer */ \
238235
}
239236

240237
////////////////////////////////////////////////////////////////////////////////

‎samples/matter/common/src/certification/thread_platform/thread_certification.matter‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -582,12 +582,7 @@ cluster Descriptor = 29 {
582582
and enforce Access Control for the Node's endpoints and their associated
583583
cluster instances. */
584584
cluster AccessControl = 31 {
585-
revision 3;
586-
587-
enum AccessControlAuxiliaryTypeEnum : enum8 {
588-
kSystem = 0;
589-
kGroupcast = 1;
590-
}
585+
revision 2;
591586

592587
enum AccessControlEntryAuthModeEnum : enum8 {
593588
kPASE = 1 [spec_name = "PASE"];
@@ -619,7 +614,6 @@ cluster AccessControl = 31 {
619614
bitmap Feature : bitmap32 {
620615
kExtension = 0x1;
621616
kManagedDevice = 0x2;
622-
kAuxiliary = 0x4;
623617
}
624618

625619
struct AccessRestrictionStruct {
@@ -651,7 +645,6 @@ cluster AccessControl = 31 {
651645
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
652646
nullable fabric_sensitive int64u subjects[] = 3;
653647
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
654-
optional fabric_sensitive AccessControlAuxiliaryTypeEnum auxiliaryType = 5;
655648
fabric_idx fabricIndex = 254;
656649
}
657650

@@ -683,19 +676,13 @@ cluster AccessControl = 31 {
683676
fabric_idx fabricIndex = 254;
684677
}
685678

686-
fabric_sensitive info event access(read: administer) AuxiliaryAccessUpdated = 3 {
687-
nullable node_id adminNodeID = 0;
688-
fabric_idx fabricIndex = 254;
689-
}
690-
691679
attribute access(read: administer, write: administer) AccessControlEntryStruct acl[] = 0;
692680
attribute access(read: administer, write: administer) optional AccessControlExtensionStruct extension[] = 1;
693681
readonly attribute int16u subjectsPerAccessControlEntry = 2;
694682
readonly attribute int16u targetsPerAccessControlEntry = 3;
695683
readonly attribute int16u accessControlEntriesPerFabric = 4;
696684
readonly attribute optional CommissioningAccessRestrictionEntryStruct commissioningARL[] = 5;
697685
readonly attribute optional AccessRestrictionEntryStruct arl[] = 6;
698-
readonly attribute access(read: administer) optional AccessControlEntryStruct auxiliaryACL[] = 7;
699686
readonly attribute command_id generatedCommandList[] = 65528;
700687
readonly attribute command_id acceptedCommandList[] = 65529;
701688
readonly attribute attrib_id attributeList[] = 65531;

0 commit comments

Comments
 (0)