diff --git a/applications/matter_bridge/snippets/onoff_plug/bridge.matter b/applications/matter_bridge/snippets/onoff_plug/bridge.matter index 50341a6d8cc..57c6edc79c0 100644 --- a/applications/matter_bridge/snippets/onoff_plug/bridge.matter +++ b/applications/matter_bridge/snippets/onoff_plug/bridge.matter @@ -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"]; @@ -759,7 +754,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -823,11 +816,6 @@ 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; @@ -835,7 +823,6 @@ cluster AccessControl = 31 { 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; 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 24b5f1d713a..1c6500ce4b2 100644 --- a/applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h +++ b/applications/matter_bridge/snippets/onoff_plug/zap-generated/access.h @@ -257,7 +257,6 @@ 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 @@ -265,7 +264,6 @@ 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 @@ -273,7 +271,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/applications/matter_bridge/src/default_zap/bridge.matter b/applications/matter_bridge/src/default_zap/bridge.matter index c387a54fe4b..e35f87ddc71 100644 --- a/applications/matter_bridge/src/default_zap/bridge.matter +++ b/applications/matter_bridge/src/default_zap/bridge.matter @@ -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"]; @@ -759,7 +754,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -823,11 +816,6 @@ 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; @@ -835,7 +823,6 @@ cluster AccessControl = 31 { 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; 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 40ca386c132..2b7b9a06b1d 100644 --- a/applications/matter_bridge/src/default_zap/zap-generated/access.h +++ b/applications/matter_bridge/src/default_zap/zap-generated/access.h @@ -245,7 +245,6 @@ 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 @@ -253,7 +252,6 @@ 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 @@ -261,7 +259,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 8930c8b5799..6e15be364dd 100644 --- a/applications/matter_weather_station/src/default_zap/weather-station.matter +++ b/applications/matter_weather_station/src/default_zap/weather-station.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; 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 89ed979ccf5..043c8f0392e 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 @@ -218,7 +218,6 @@ 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 @@ -226,7 +225,6 @@ 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 @@ -234,7 +232,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/closure/src/default_zap/closure.matter b/samples/matter/closure/src/default_zap/closure.matter index e0c82780fee..0eb26af1cb7 100644 --- a/samples/matter/closure/src/default_zap/closure.matter +++ b/samples/matter/closure/src/default_zap/closure.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; diff --git a/samples/matter/closure/src/default_zap/closure.zap b/samples/matter/closure/src/default_zap/closure.zap index 3f1a7af4cc7..f09a69f22a4 100644 --- a/samples/matter/closure/src/default_zap/closure.zap +++ b/samples/matter/closure/src/default_zap/closure.zap @@ -3025,4 +3025,4 @@ "parentEndpointIdentifier": 0 } ] -} \ No newline at end of file +} diff --git a/samples/matter/closure/src/default_zap/zap-generated/access.h b/samples/matter/closure/src/default_zap/zap-generated/access.h index 718faa0d66c..6f806bc49d2 100644 --- a/samples/matter/closure/src/default_zap/zap-generated/access.h +++ b/samples/matter/closure/src/default_zap/zap-generated/access.h @@ -218,7 +218,6 @@ 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 @@ -226,7 +225,6 @@ 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 @@ -234,7 +232,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 e11c603f936..f435541b5bb 100644 --- a/samples/matter/common/src/certification/thread_platform/thread_certification.matter +++ b/samples/matter/common/src/certification/thread_platform/thread_certification.matter @@ -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"]; @@ -619,7 +614,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -683,11 +676,6 @@ 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; @@ -695,7 +683,6 @@ cluster AccessControl = 31 { 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; diff --git a/samples/matter/common/src/certification/thread_platform/zap-generated/access.h b/samples/matter/common/src/certification/thread_platform/zap-generated/access.h index 15901eb759d..513c5db5785 100644 --- a/samples/matter/common/src/certification/thread_platform/zap-generated/access.h +++ b/samples/matter/common/src/certification/thread_platform/zap-generated/access.h @@ -269,7 +269,6 @@ 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 @@ -277,7 +276,6 @@ 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 @@ -285,7 +283,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/common/src/zap_samples.yml b/samples/matter/common/src/zap_samples.yml index 69cc63f1907..a20fe18efc9 100644 --- a/samples/matter/common/src/zap_samples.yml +++ b/samples/matter/common/src/zap_samples.yml @@ -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 diff --git a/samples/matter/contact_sensor/src/default_zap/contact_sensor.matter b/samples/matter/contact_sensor/src/default_zap/contact_sensor.matter index b93da3158d3..1a70f288f7b 100644 --- a/samples/matter/contact_sensor/src/default_zap/contact_sensor.matter +++ b/samples/matter/contact_sensor/src/default_zap/contact_sensor.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; diff --git a/samples/matter/contact_sensor/src/default_zap/zap-generated/access.h b/samples/matter/contact_sensor/src/default_zap/zap-generated/access.h index 819ac2ccd44..3eb8755f965 100644 --- a/samples/matter/contact_sensor/src/default_zap/zap-generated/access.h +++ b/samples/matter/contact_sensor/src/default_zap/zap-generated/access.h @@ -233,7 +233,6 @@ 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 @@ -241,7 +240,6 @@ 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 @@ -249,7 +247,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 16d3c0ddea3..25e95380d46 100644 --- a/samples/matter/light_bulb/src/default_zap/light_bulb.matter +++ b/samples/matter/light_bulb/src/default_zap/light_bulb.matter @@ -705,12 +705,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"]; @@ -742,7 +737,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -774,7 +768,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; } @@ -806,11 +799,6 @@ 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; @@ -818,7 +806,6 @@ cluster AccessControl = 31 { 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; 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 27c3ef2e286..f247f566075 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 @@ -242,7 +242,6 @@ 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 @@ -250,7 +249,6 @@ 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 @@ -258,7 +256,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 c0fc0a53a3d..4fa705e0c05 100644 --- a/samples/matter/light_switch/snippets/lit_icd/light_switch.matter +++ b/samples/matter/light_switch/snippets/lit_icd/light_switch.matter @@ -774,12 +774,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"]; @@ -811,7 +806,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -843,7 +837,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; } @@ -875,11 +868,6 @@ 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; @@ -887,7 +875,6 @@ cluster AccessControl = 31 { 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; 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 9e550b9bd80..99380da9a46 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 @@ -248,7 +248,6 @@ 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 @@ -256,7 +255,6 @@ 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 @@ -264,7 +262,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 e21e9a2798c..25983a1e781 100644 --- a/samples/matter/light_switch/src/default_zap/light_switch.matter +++ b/samples/matter/light_switch/src/default_zap/light_switch.matter @@ -774,12 +774,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"]; @@ -811,7 +806,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -843,7 +837,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; } @@ -875,11 +868,6 @@ 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; @@ -887,7 +875,6 @@ cluster AccessControl = 31 { 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; 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 c1d5c3908de..b53905b1a74 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 @@ -236,7 +236,6 @@ 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 @@ -244,7 +243,6 @@ 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 @@ -252,7 +250,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/lock/snippets/schedules/lock.matter b/samples/matter/lock/snippets/schedules/lock.matter index c8c3506bf2d..a9b760b8a0b 100644 --- a/samples/matter/lock/snippets/schedules/lock.matter +++ b/samples/matter/lock/snippets/schedules/lock.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; diff --git a/samples/matter/lock/snippets/schedules/zap-generated/access.h b/samples/matter/lock/snippets/schedules/zap-generated/access.h index 0b13483bb5a..4e9a1e296cf 100644 --- a/samples/matter/lock/snippets/schedules/zap-generated/access.h +++ b/samples/matter/lock/snippets/schedules/zap-generated/access.h @@ -335,7 +335,6 @@ 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 @@ -343,7 +342,6 @@ 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 @@ -351,7 +349,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/lock/src/default_zap/lock.matter b/samples/matter/lock/src/default_zap/lock.matter index 3623d4f0e31..345221e97ef 100644 --- a/samples/matter/lock/src/default_zap/lock.matter +++ b/samples/matter/lock/src/default_zap/lock.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; 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 083f8421eb4..72fc396b77b 100644 --- a/samples/matter/lock/src/default_zap/zap-generated/access.h +++ b/samples/matter/lock/src/default_zap/zap-generated/access.h @@ -293,7 +293,6 @@ 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 @@ -301,7 +300,6 @@ 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 @@ -309,7 +307,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 f3e4114f467..7b000eb50b7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +++ b/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter @@ -386,12 +386,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"]; @@ -423,7 +418,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -455,7 +449,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; } @@ -487,11 +480,6 @@ 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; @@ -499,7 +487,6 @@ cluster AccessControl = 31 { 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; @@ -1708,7 +1695,7 @@ endpoint 1 { callback attribute attributeList; ram attribute featureMap default = 0; ram attribute clusterRevision default = 1; - ram attribute devKitName default = "Nordic Development Kit"; + persist attribute devKitName default = "Nordic Development Kit"; ram attribute userLED default = false; ram attribute userButton default = false; 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 a85861afcc0..12ed6eeca09 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap +++ b/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.zap @@ -2562,7 +2562,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2578,7 +2578,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2594,7 +2594,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": null, "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -2639,7 +2639,7 @@ "side": "server", "type": "char_string", "included": 1, - "storageOption": "RAM", + "storageOption": "NVM", "singleton": 0, "bounded": 0, "defaultValue": "Nordic Development Kit", 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 2c8b1a91a13..98297a27604 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 @@ -221,7 +221,6 @@ 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 @@ -229,7 +228,6 @@ 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 @@ -237,7 +235,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/AttributeIds.h index 85a5cb603ff..a2f1b1b78c8 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AccessControl (cluster code: 31/0x1F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include @@ -19,7 +19,7 @@ namespace app { // Total number of attributes supported by the cluster, including global attributes - inline constexpr uint32_t kAttributesCount = 13; + inline constexpr uint32_t kAttributesCount = 12; namespace Acl { @@ -56,11 +56,6 @@ namespace app inline constexpr AttributeId Id = 0x00000006; } // namespace Arl - namespace AuxiliaryACL - { - inline constexpr AttributeId Id = 0x00000007; - } // namespace AuxiliaryACL - namespace GeneratedCommandList { inline constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.h index ce0956801a9..9d2c6b4e6f5 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.h @@ -199,30 +199,6 @@ namespace app static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace Arl - namespace AuxiliaryACL - { - struct TypeInfo { - using Type = chip::app::DataModel::List< - const chip::app::Clusters::AccessControl::Structs:: - AccessControlEntryStruct::Type>; - using DecodableType = chip::app::DataModel::DecodableList< - chip::app::Clusters::AccessControl::Structs:: - AccessControlEntryStruct::DecodableType>; - using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::AccessControl::Structs:: - AccessControlEntryStruct::DecodableType> &; - - static constexpr ClusterId GetClusterId() - { - return Clusters::AccessControl::Id; - } - static constexpr AttributeId GetAttributeId() - { - return Attributes::AuxiliaryACL::Id; - } - static constexpr bool MustUseTimedWrite() { return false; } - }; - } // namespace AuxiliaryACL namespace GeneratedCommandList { struct TypeInfo @@ -293,7 +269,6 @@ namespace app accessControlEntriesPerFabric = static_cast(0); Attributes::CommissioningARL::TypeInfo::DecodableType commissioningARL; Attributes::Arl::TypeInfo::DecodableType arl; - Attributes::AuxiliaryACL::TypeInfo::DecodableType auxiliaryACL; Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.ipp b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.ipp index c88c96214fa..33012c44d0e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.ipp +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Attributes.ipp @@ -51,8 +51,6 @@ namespace app return DataModel::Decode(reader, commissioningARL); case Attributes::Arl::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, arl); - case Attributes::AuxiliaryACL::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, auxiliaryACL); case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, generatedCommandList); case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/BUILD.gn index 558b08c5684..a00a372326b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/ClusterId.h index cbfee6b6526..ed76af4048e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AccessControl (cluster code: 31/0x1F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/CommandIds.h index 0fcf2a83951..9cfaefad0c7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AccessControl (cluster code: 31/0x1F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Enums.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Enums.h index 4f28d0d48ca..6190e1d41ed 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Enums.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Enums.h @@ -32,17 +32,6 @@ namespace app namespace AccessControl { - // Enum for AccessControlAuxiliaryTypeEnum - enum class AccessControlAuxiliaryTypeEnum : uint8_t { - kSystem = 0x00, - kGroupcast = 0x01, - // All received enum values that are not listed above will be mapped - // to kUnknownEnumValue. This is a helper enum value that should only - // be used by code to process how it handles receiving and unknown - // enum value. This specific should never be transmitted. - kUnknownEnumValue = 2, - }; - // Enum for AccessControlEntryAuthModeEnum enum class AccessControlEntryAuthModeEnum : uint8_t { kPase = 0x01, @@ -98,7 +87,6 @@ namespace app enum class Feature : uint32_t { kExtension = 0x1, kManagedDevice = 0x2, - kAuxiliary = 0x4, }; } // namespace AccessControl } // namespace Clusters diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EnumsCheck.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EnumsCheck.h index f90c843ac4b..42aec55ba2e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EnumsCheck.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EnumsCheck.h @@ -28,18 +28,6 @@ namespace app { namespace Clusters { - static auto __attribute__((unused)) - EnsureKnownEnumValue(AccessControl::AccessControlAuxiliaryTypeEnum val) - { - using EnumType = AccessControl::AccessControlAuxiliaryTypeEnum; - switch (val) { - case EnumType::kSystem: - case EnumType::kGroupcast: - return val; - default: - return EnumType::kUnknownEnumValue; - } - } static auto __attribute__((unused)) EnsureKnownEnumValue(AccessControl::AccessControlEntryAuthModeEnum val) { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EventIds.h index bf04da2b731..d458283d39b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AccessControl (cluster code: 31/0x1F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include @@ -31,11 +31,6 @@ namespace app inline constexpr EventId Id = 0x00000002; } // namespace FabricRestrictionReviewUpdate - namespace AuxiliaryAccessUpdated - { - inline constexpr EventId Id = 0x00000003; - } // namespace AuxiliaryAccessUpdated - } // namespace Events } // namespace AccessControl } // namespace Clusters diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.h index 9c2f58b3d59..12badcfe281 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.h @@ -237,60 +237,6 @@ namespace app CHIP_ERROR Decode(TLV::TLVReader &reader); }; } // namespace FabricRestrictionReviewUpdate - namespace AuxiliaryAccessUpdated - { - static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; - - enum class Fields : uint8_t { - kAdminNodeID = 0, - kFabricIndex = 254, - }; - - struct Type { - public: - static constexpr PriorityLevel GetPriorityLevel() - { - return kPriorityLevel; - } - static constexpr EventId GetEventId() - { - return Events::AuxiliaryAccessUpdated::Id; - } - static constexpr ClusterId GetClusterId() - { - return Clusters::AccessControl::Id; - } - static constexpr bool kIsFabricScoped = true; - - DataModel::Nullable adminNodeID; - chip::FabricIndex fabricIndex = static_cast(0); - - auto GetFabricIndex() const { return fabricIndex; } - - CHIP_ERROR Encode(TLV::TLVWriter &aWriter, TLV::Tag aTag) const; - }; - - struct DecodableType { - public: - static constexpr PriorityLevel GetPriorityLevel() - { - return kPriorityLevel; - } - static constexpr EventId GetEventId() - { - return Events::AuxiliaryAccessUpdated::Id; - } - static constexpr ClusterId GetClusterId() - { - return Clusters::AccessControl::Id; - } - - DataModel::Nullable adminNodeID; - chip::FabricIndex fabricIndex = static_cast(0); - - CHIP_ERROR Decode(TLV::TLVReader &reader); - }; - } // namespace AuxiliaryAccessUpdated } // namespace Events } // namespace AccessControl } // namespace Clusters diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.ipp b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.ipp index 591a0e5459e..89d72872ee7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.ipp +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Events.ipp @@ -188,42 +188,6 @@ namespace app } } } // namespace FabricRestrictionReviewUpdate. - namespace AuxiliaryAccessUpdated - { - CHIP_ERROR Type::Encode(TLV::TLVWriter &aWriter, TLV::Tag aTag) const - { - TLV::TLVType outer; - ReturnErrorOnFailure( - aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode( - aWriter, TLV::ContextTag(Fields::kAdminNodeID), adminNodeID)); - ReturnErrorOnFailure(DataModel::Encode( - aWriter, TLV::ContextTag(Fields::kFabricIndex), fabricIndex)); - return aWriter.EndContainer(outer); - } - - CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) - { - detail::StructDecodeIterator __iterator(reader); - while (true) { - uint8_t __context_tag = 0; - CHIP_ERROR err = __iterator.Next(__context_tag); - VerifyOrReturnError(err != CHIP_ERROR_END_OF_TLV, - CHIP_NO_ERROR); - ReturnErrorOnFailure(err); - - if (__context_tag == to_underlying(Fields::kAdminNodeID)) { - err = DataModel::Decode(reader, adminNodeID); - } else if (__context_tag == - to_underlying(Fields::kFabricIndex)) { - err = DataModel::Decode(reader, fabricIndex); - } else { - } - - ReturnErrorOnFailure(err); - } - } - } // namespace AuxiliaryAccessUpdated. } // namespace Events } // namespace AccessControl } // namespace Clusters diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Ids.h index 93d9ee313d5..c90e65eb75b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AccessControl (cluster code: 31/0x001F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Metadata.h index b42a7529d96..6c5f5fc106e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster AccessControl (cluster code: 31/0x1F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include @@ -21,7 +21,7 @@ namespace app namespace AccessControl { - inline constexpr uint32_t kRevision = 3; + inline constexpr uint32_t kRevision = 2; namespace Attributes { @@ -79,14 +79,6 @@ namespace app DataModel::AttributeQualityFlags::kListAttribute), Access::Privilege::kView, std::nullopt); } // namespace Arl - namespace AuxiliaryACL - { - inline constexpr DataModel::AttributeEntry kMetadataEntry( - AuxiliaryACL::Id, - BitFlags( - DataModel::AttributeQualityFlags::kListAttribute), - Access::Privilege::kAdminister, std::nullopt); - } // namespace AuxiliaryACL constexpr std::array kMandatoryMetadata = { Acl::kMetadataEntry, SubjectsPerAccessControlEntry::kMetadataEntry, @@ -131,12 +123,6 @@ namespace app Access::Privilege::kAdminister }; } // namespace FabricRestrictionReviewUpdate - namespace AuxiliaryAccessUpdated - { - inline constexpr DataModel::EventEntry kMetadataEntry{ - Access::Privilege::kAdminister - }; - } // namespace AuxiliaryAccessUpdated } // namespace Events } // namespace AccessControl diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/MetadataProvider.h index c943affb371..381e725c5cd 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster AccessControl (cluster code: 31/0x1F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include @@ -37,8 +37,6 @@ namespace app return CommissioningARL::kMetadataEntry; case Arl::Id: return Arl::kMetadataEntry; - case AuxiliaryACL::Id: - return AuxiliaryACL::kMetadataEntry; default: return std::nullopt; } diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.h index 2efcb2460da..9bda53d9301 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.h @@ -186,7 +186,6 @@ namespace app kAuthMode = 2, kSubjects = 3, kTargets = 4, - kAuxiliaryType = 5, kFabricIndex = 254, }; @@ -200,7 +199,6 @@ namespace app DataModel::Nullable< DataModel::List> targets; - Optional auxiliaryType; chip::FabricIndex fabricIndex = static_cast(0); static constexpr bool kIsFabricScoped = true; @@ -232,7 +230,6 @@ namespace app DataModel::Nullable> targets; - Optional auxiliaryType; chip::FabricIndex fabricIndex = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader &reader); diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.ipp b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.ipp index fa133c63469..750b348243f 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.ipp +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AccessControl/Structs.ipp @@ -240,10 +240,6 @@ namespace app if (includeSensitive) { encoder.Encode(to_underlying(Fields::kTargets), targets); } - if (includeSensitive) { - encoder.Encode(to_underlying(Fields::kAuxiliaryType), - auxiliaryType); - } if (aAccessingFabricIndex.HasValue()) { encoder.Encode(to_underlying(Fields::kFabricIndex), fabricIndex); @@ -270,9 +266,6 @@ namespace app err = DataModel::Decode(reader, subjects); } else if (__context_tag == to_underlying(Fields::kTargets)) { err = DataModel::Decode(reader, targets); - } else if (__context_tag == - to_underlying(Fields::kAuxiliaryType)) { - err = DataModel::Decode(reader, auxiliaryType); } else if (__context_tag == to_underlying(Fields::kFabricIndex)) { err = DataModel::Decode(reader, fabricIndex); diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/AttributeIds.h index a35dabfc0fd..dc237d3ada9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x3C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/BUILD.gn index 01d46495877..afe6643333d 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/ClusterId.h index 96a0f017582..3d01970d5f0 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x3C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/CommandIds.h index cbfce982d83..3a13ff4c720 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x3C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/EventIds.h index 09552495776..bd8f9dbc174 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x3C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Ids.h index 4451d236ae3..6d9bf88e0c6 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x003C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Metadata.h index bbf6c920499..b70715960d7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster AdministratorCommissioning (cluster code: 60/0x3C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/MetadataProvider.h index 27bdd968236..2dc989e0f7f 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/AdministratorCommissioning/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster AdministratorCommissioning (cluster code: 60/0x3C) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BUILD.gn index 545380fcc01..6383fbef4de 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# List of cluster usages based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# List of cluster usages based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") template("declare_all_items_target") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/AttributeIds.h index 1e6a7a0afb1..c865f9091da 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster BasicInformation (cluster code: 40/0x28) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/BUILD.gn index b15c7cba448..a56bb6bd33c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/ClusterId.h index 392317d4a8e..326d2da223c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster BasicInformation (cluster code: 40/0x28) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/CommandIds.h index dda608dfe9a..5465713ef7e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster BasicInformation (cluster code: 40/0x28) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/EventIds.h index 8df74f47e20..ab8f6221fdd 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster BasicInformation (cluster code: 40/0x28) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Ids.h index 1dad919dde7..29a3b0cb1d9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster BasicInformation (cluster code: 40/0x0028) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Metadata.h index d9342295f82..387087f8580 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster BasicInformation (cluster code: 40/0x28) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/MetadataProvider.h index b978b3391ce..f564233b2d3 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/BasicInformation/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster BasicInformation (cluster code: 40/0x28) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/AttributeIds.h index 56d1777666f..af1907884be 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster Descriptor (cluster code: 29/0x1D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/BUILD.gn index b67ea491b13..6e1055bc2a1 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/ClusterId.h index c8fc7ea360b..0470dbb5568 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster Descriptor (cluster code: 29/0x1D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/CommandIds.h index cf3b8ffa38c..361837d6431 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster Descriptor (cluster code: 29/0x1D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/EventIds.h index cd97afe8b21..a34b9f48df6 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster Descriptor (cluster code: 29/0x1D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Ids.h index faa0a177f5e..f24e7deb961 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster Descriptor (cluster code: 29/0x001D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Metadata.h index 3df8e3e8529..b5a6d29474c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster Descriptor (cluster code: 29/0x1D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/MetadataProvider.h index bfd806225ba..f5a82127951 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/Descriptor/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster Descriptor (cluster code: 29/0x1D) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/AttributeIds.h index e966eec24be..24518d60bd4 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralCommissioning (cluster code: 48/0x30) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/BUILD.gn index 70d462b4356..55ddb79d0b9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/ClusterId.h index 683b379f5c6..edb356b0c7f 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralCommissioning (cluster code: 48/0x30) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/CommandIds.h index 25aee9aa268..965018aedbb 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralCommissioning (cluster code: 48/0x30) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/EventIds.h index 7a2596259b2..a08642b07df 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralCommissioning (cluster code: 48/0x30) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Ids.h index 81197683355..b4717ae4e77 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralCommissioning (cluster code: 48/0x0030) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Metadata.h index 7bdb06e2725..6a7169ef02c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster GeneralCommissioning (cluster code: 48/0x30) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/MetadataProvider.h index 0052d5b3b06..1d3cdb84465 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralCommissioning/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster GeneralCommissioning (cluster code: 48/0x30) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/AttributeIds.h index dae3dd1f6cd..39381165e3b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralDiagnostics (cluster code: 51/0x33) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/BUILD.gn index 4f45fb00ab6..0007752030b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/ClusterId.h index d79400a4862..4cbc3900999 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralDiagnostics (cluster code: 51/0x33) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/CommandIds.h index 750d966fa66..934cb0bc322 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralDiagnostics (cluster code: 51/0x33) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/EventIds.h index 41a68b0c66e..3f4ba9c14d7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralDiagnostics (cluster code: 51/0x33) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Ids.h index e0e22c89fe5..40b221cfd92 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GeneralDiagnostics (cluster code: 51/0x0033) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Metadata.h index f4e47089c85..f8c35fa75c4 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster GeneralDiagnostics (cluster code: 51/0x33) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/MetadataProvider.h index 0859fb2c724..5583daeedd4 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GeneralDiagnostics/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster GeneralDiagnostics (cluster code: 51/0x33) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/AttributeIds.h index a1ffd5a825f..d9a3f20a788 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GroupKeyManagement (cluster code: 63/0x3F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/BUILD.gn index 841df55c77c..0f20508b3f9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/ClusterId.h index 58843480e12..ef697d7a0a6 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GroupKeyManagement (cluster code: 63/0x3F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/CommandIds.h index 244271faa4f..9e8ccf226eb 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GroupKeyManagement (cluster code: 63/0x3F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/EventIds.h index c4014e3e511..faa3ffedf2c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GroupKeyManagement (cluster code: 63/0x3F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Ids.h index 9ef801d57c8..ce4c480169f 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster GroupKeyManagement (cluster code: 63/0x003F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Metadata.h index 5918fb9bae2..bf68f6a304d 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster GroupKeyManagement (cluster code: 63/0x3F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/MetadataProvider.h index b896abcc43f..1ac8bda7615 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/GroupKeyManagement/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster GroupKeyManagement (cluster code: 63/0x3F) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/MetadataQuery.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/MetadataQuery.h index 3201ad79a23..b5b745bfd2e 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/MetadataQuery.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/MetadataQuery.h @@ -7,7 +7,7 @@ // If used without parameters it will instatiate metadata // for all clusters and might incur a big overhead. // -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/AttributeIds.h index eb0a5e83d69..ab962ea8242 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NetworkCommissioning (cluster code: 49/0x31) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/BUILD.gn index 51409e812ad..dcde26c7c91 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/ClusterId.h index cabb55b8123..24f4757d77b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NetworkCommissioning (cluster code: 49/0x31) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/CommandIds.h index 82f5d6f3e7f..86030e02c52 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NetworkCommissioning (cluster code: 49/0x31) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/EventIds.h index bff8a51cb9d..f010dd5beb9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NetworkCommissioning (cluster code: 49/0x31) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Ids.h index b3a8bd630b5..d8cddb53ff5 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NetworkCommissioning (cluster code: 49/0x0031) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Metadata.h index fc7bf9f1a86..fe7a9bcf1b4 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster NetworkCommissioning (cluster code: 49/0x31) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/MetadataProvider.h index 73dbc8c4593..5271983738a 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NetworkCommissioning/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster NetworkCommissioning (cluster code: 49/0x31) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/AttributeIds.h index c4609ffe89e..ab473089971 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/BUILD.gn index 5caffeb189d..499a1de8304 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/ClusterId.h index cff787ef4c9..6170727d719 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/CommandIds.h index 023c9550865..2dcc71d0e06 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/EventIds.h index 0411c48ed72..76d5e3d54b7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Ids.h index 7a808a86b41..1a198ed1ef9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Metadata.h index fb86fb6bfca..a2a113ba330 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/MetadataProvider.h index 7f5bb016704..002bdd853bb 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/NordicDevKit/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster NordicDevKit (cluster code: 4294048769/0xFFF1FC01) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/AttributeIds.h index b1ee39da6df..9c9ac7c13f6 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OperationalCredentials (cluster code: 62/0x3E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/BUILD.gn index 48992472f5b..f6b351af305 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/ClusterId.h index 825bffdd0be..f7a2c9aec44 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OperationalCredentials (cluster code: 62/0x3E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/CommandIds.h index beee4a5ccf5..bb0bcffb4a7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OperationalCredentials (cluster code: 62/0x3E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/EventIds.h index bb07d0a5ed3..5a44f5f46c1 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OperationalCredentials (cluster code: 62/0x3E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Ids.h index e3b67d4a93f..d565312ab8a 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OperationalCredentials (cluster code: 62/0x003E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Metadata.h index 2d2730d9393..95cc8faaca9 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster OperationalCredentials (cluster code: 62/0x3E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/MetadataProvider.h index c1b031b4b8f..dd92b5a661a 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OperationalCredentials/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster OperationalCredentials (cluster code: 62/0x3E) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/AttributeIds.h index 85948466db1..869ae228a41 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x29) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/BUILD.gn index abb90abc77b..90da6038d9c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/ClusterId.h index c268c62e1b8..e0b09cc3858 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x29) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/CommandIds.h index dc73f707cce..0cc1073f20c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x29) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/EventIds.h index 886b26dc1e5..cbe8d8b8411 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x29) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Ids.h index 20788c31f6f..b54ffebacf5 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x0029) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Metadata.h index 207927adcca..6d43943dc2b 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x29) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/MetadataProvider.h index 75cee5bbb16..c6db89ee9c8 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateProvider/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster OtaSoftwareUpdateProvider (cluster code: 41/0x29) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/AttributeIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/AttributeIds.h index 64359d74978..34b22ca63e8 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/AttributeIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/AttributeIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x2A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/BUILD.gn b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/BUILD.gn index 6840fc0bb17..73f5822e785 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/BUILD.gn +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/BUILD.gn @@ -1,6 +1,6 @@ # DO NOT EDIT MANUALLY - Generated file # -# Cluster generated code for constants and metadata based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +# Cluster generated code for constants and metadata based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter import("//build_overrides/chip.gni") source_set("ids") { diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/ClusterId.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/ClusterId.h index 0c2c4165758..f91ecd214b7 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/ClusterId.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/ClusterId.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x2A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/CommandIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/CommandIds.h index dcc5552f4c2..20c7279392c 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/CommandIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/CommandIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x2A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/EventIds.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/EventIds.h index 04cf279a13e..c8bb8b8c236 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/EventIds.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/EventIds.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x2A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Ids.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Ids.h index 184cf253c6e..8a9a876e0ab 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Ids.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Ids.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Identifier constant values for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x002A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Metadata.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Metadata.h index f91e5996a06..d116742641d 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Metadata.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/Metadata.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x2A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include diff --git a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/MetadataProvider.h b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/MetadataProvider.h index 11967865fda..476862e8c66 100644 --- a/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/MetadataProvider.h +++ b/samples/matter/manufacturer_specific/src/default_zap/zap-generated/clusters/OtaSoftwareUpdateRequestor/MetadataProvider.h @@ -1,7 +1,7 @@ // DO NOT EDIT MANUALLY - Generated file // // Cluster metadata information for cluster OtaSoftwareUpdateRequestor (cluster code: 42/0x2A) -// based on /home/arbl/ncs/nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter +// based on nrf/samples/matter/manufacturer_specific/src/default_zap/manufacturer_specific.matter #pragma once #include 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 e2718a6c900..575dad8b09e 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,25 +29,21 @@ #if CHIP_CONFIG_BIG_ENDIAN_TARGET #define GENERATED_DEFAULTS \ { \ - \ /* Endpoint: 1, Cluster: NordicDevKit (server), big-endian */ \ \ /* 0 - DevKitName, */ \ - 22, 'N', 'o', 'r', 'd', 'i', 'c', ' ', 'D', 'e', 'v', 'e', \ - 'l', 'o', 'p', 'm', 'e', 'n', 't', ' ', 'K', 'i', 't', \ - \ + 22, 'N', 'o', 'r', 'd', 'i', 'c', ' ', 'D', 'e', 'v', 'e', 'l', 'o', 'p', 'm', 'e', 'n', 't', ' ', \ + 'K', 'i', 't', \ } #else // !CHIP_CONFIG_BIG_ENDIAN_TARGET #define GENERATED_DEFAULTS \ { \ - \ /* Endpoint: 1, Cluster: NordicDevKit (server), little-endian */ \ \ /* 0 - DevKitName, */ \ - 22, 'N', 'o', 'r', 'd', 'i', 'c', ' ', 'D', 'e', 'v', 'e', \ - 'l', 'o', 'p', 'm', 'e', 'n', 't', ' ', 'K', 'i', 't', \ - \ + 22, 'N', 'o', 'r', 'd', 'i', 'c', ' ', 'D', 'e', 'v', 'e', 'l', 'o', 'p', 'm', 'e', 'n', 't', ' ', \ + 'K', 'i', 't', \ } #endif // CHIP_CONFIG_BIG_ENDIAN_TARGET @@ -62,230 +58,252 @@ // 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) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DeviceTypeList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ServerList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClientList */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* PartsList */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Access Control (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* ACL */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* Extension */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SubjectsPerAccessControlEntry \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TargetsPerAccessControlEntry \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* AccessControlEntriesPerFabric \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Basic Information (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DataModelRevision */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* VendorName */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* VendorID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ProductName */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ProductID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* NodeLabel */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* Location */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* HardwareVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* HardwareVersionString */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SoftwareVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SoftwareVersionString */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ManufacturingDate */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SerialNumber */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* UniqueID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* CapabilityMinima */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SpecificationVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxPathsPerInvoke */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000017, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* RandomNumber */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* 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) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* DefaultOTAProviders */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(READABLE) }, /* UpdatePossible \ - */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(READABLE) }, /* UpdateState \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap \ - */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision \ - */ \ - \ - /* Endpoint: 0, Cluster: General Commissioning (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 8, ZAP_TYPE(INT64U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* Breadcrumb */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* BasicCommissioningInfo */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* RegulatoryConfig */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* LocationCapability */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportsConcurrentConnection \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxNetworks */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* Networks */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ScanMaxTimeSeconds */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ConnectMaxTimeSeconds */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* InterfaceEnabled */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ - ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkingStatus */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ - ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ - ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportedWiFiBands */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(BITMAP16), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportedThreadFeatures */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ThreadVersion */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* NetworkInterfaces */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* RebootCount */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* UpTime */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TotalOperationalHours */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* BootReason */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TestEventTriggersEnabled \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* WindowStatus */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ - ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ - ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap \ - */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* NOCs */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* Fabrics */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportedFabrics */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* CommissionedFabrics */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TrustedRootCertificates */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* CurrentFabricIndex */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* 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) | \ - ZAP_ATTRIBUTE_MASK(READABLE) }, /* GroupKeyMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* GroupTable */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupsPerFabric */ \ - { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupKeysPerFabric */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ - { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ - ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ - \ - /* Endpoint: 1, Cluster: NordicDevKit (server) */ \ - { ZAP_LONG_DEFAULTS_INDEX(0), 0xFFF10000, 255, ZAP_TYPE(CHAR_STRING), \ - ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DevKitName */ \ - { ZAP_SIMPLE_DEFAULT(false), 0xFFF10001, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(READABLE) }, /* UserLED \ - */ \ - { ZAP_SIMPLE_DEFAULT(false), 0xFFF10002, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(READABLE) }, /* UserButton \ - */ \ - { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap \ - */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision \ - */ \ +#define GENERATED_ATTRIBUTES \ + { \ + /* Endpoint: 0, Cluster: Descriptor (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DeviceTypeList */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ServerList */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClientList */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* PartsList */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Access Control (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* ACL */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* Extension */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SubjectsPerAccessControlEntry \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TargetsPerAccessControlEntry \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* AccessControlEntriesPerFabric \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Basic Information (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* DataModelRevision \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* VendorName */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* VendorID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ProductName */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ProductID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* NodeLabel */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* Location */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* HardwareVersion */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* HardwareVersionString \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SoftwareVersion */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SoftwareVersionString \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ManufacturingDate \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SerialNumber */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* UniqueID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* CapabilityMinima \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SpecificationVersion \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxPathsPerInvoke \ + */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x00000017, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* RandomNumber */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* 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) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* DefaultOTAProviders */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* UpdatePossible */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(READABLE) }, /* UpdateState \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(READABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: General Commissioning (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 8, ZAP_TYPE(INT64U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* Breadcrumb */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* BasicCommissioningInfo \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* RegulatoryConfig \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* LocationCapability \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportsConcurrentConnection \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxNetworks */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* Networks */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ScanMaxTimeSeconds \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ConnectMaxTimeSeconds \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* InterfaceEnabled */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkingStatus */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportedWiFiBands \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(BITMAP16), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportedThreadFeatures \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ThreadVersion */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* NetworkInterfaces \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* RebootCount */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* UpTime */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TotalOperationalHours \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* BootReason */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TestEventTriggersEnabled \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* WindowStatus */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) | \ + ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* NOCs */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* Fabrics */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* SupportedFabrics \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* CommissionedFabrics \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* TrustedRootCertificates \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* CurrentFabricIndex \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* 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) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* GroupKeyMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* GroupTable */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupsPerFabric \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* MaxGroupKeysPerFabric \ + */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ + \ + /* Endpoint: 1, Cluster: NordicDevKit (server) */ \ + { ZAP_LONG_DEFAULTS_INDEX(0), 0xFFF10000, 255, ZAP_TYPE(CHAR_STRING), \ + ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* DevKitName */ \ + { ZAP_SIMPLE_DEFAULT(false), 0xFFF10001, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* UserLED */ \ + { ZAP_SIMPLE_DEFAULT(false), 0xFFF10002, 1, ZAP_TYPE(BOOLEAN), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* UserButton */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + ZAP_ATTRIBUTE_MASK(READABLE) }, /* ClusterRevision */ \ } // clang-format off @@ -568,8 +586,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 11, 15 }, \ - { ZAP_CLUSTER_INDEX(11), 1, 263 }, \ + { ZAP_CLUSTER_INDEX(0), 11, 15 }, { ZAP_CLUSTER_INDEX(11), 1, 263 }, \ } // Largest attribute size is needed for various buffers @@ -589,22 +606,46 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, // 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, 0x0001 \ + } // Array of profile ids -#define FIXED_PROFILE_IDS { 0x0103, 0x0402 } +#define FIXED_PROFILE_IDS \ + { \ + 0x0103, 0x0402 \ + } // Array of device types -#define FIXED_DEVICE_TYPES { { 0x00000012, 1 }, { 0x00000016, 4 }, { 0xFFF10001, 1 } } +#define FIXED_DEVICE_TYPES \ + { \ + { 0x00000012, 1 }, { 0x00000016, 4 }, \ + { \ + 0xFFF10001, 1 \ + } \ + } // Array of device type offsets -#define FIXED_DEVICE_TYPE_OFFSETS { 0, 2 } +#define FIXED_DEVICE_TYPE_OFFSETS \ + { \ + 0, 2 \ + } // Array of device type lengths -#define FIXED_DEVICE_TYPE_LENGTHS { 2, 1 } +#define FIXED_DEVICE_TYPE_LENGTHS \ + { \ + 2, 1 \ + } // Array of endpoint types supported on each endpoint -#define FIXED_ENDPOINT_TYPES { 0, 1 } +#define FIXED_ENDPOINT_TYPES \ + { \ + 0, 1 \ + } // Array of parent endpoints for each endpoint -#define FIXED_PARENT_ENDPOINTS { kInvalidEndpointId, kInvalidEndpointId } +#define FIXED_PARENT_ENDPOINTS \ + { \ + kInvalidEndpointId, kInvalidEndpointId \ + } 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 18540f21d79..f5d1f85d1e1 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 @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; 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 819ac2ccd44..3eb8755f965 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 @@ -233,7 +233,6 @@ 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 @@ -241,7 +240,6 @@ 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 @@ -249,7 +247,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/temperature_sensor/src/default_zap/temperature_sensor.matter b/samples/matter/temperature_sensor/src/default_zap/temperature_sensor.matter index 50b3e0e9467..cb3f2b908d6 100644 --- a/samples/matter/temperature_sensor/src/default_zap/temperature_sensor.matter +++ b/samples/matter/temperature_sensor/src/default_zap/temperature_sensor.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; diff --git a/samples/matter/temperature_sensor/src/default_zap/zap-generated/access.h b/samples/matter/temperature_sensor/src/default_zap/zap-generated/access.h index 819ac2ccd44..3eb8755f965 100644 --- a/samples/matter/temperature_sensor/src/default_zap/zap-generated/access.h +++ b/samples/matter/temperature_sensor/src/default_zap/zap-generated/access.h @@ -233,7 +233,6 @@ 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 @@ -241,7 +240,6 @@ 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 @@ -249,7 +247,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/template/src/default_zap/template.matter b/samples/matter/template/src/default_zap/template.matter index ac7e5ceeb6e..761f8cb4752 100644 --- a/samples/matter/template/src/default_zap/template.matter +++ b/samples/matter/template/src/default_zap/template.matter @@ -386,12 +386,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"]; @@ -423,7 +418,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -455,7 +449,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; } @@ -487,11 +480,6 @@ 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; @@ -499,7 +487,6 @@ cluster AccessControl = 31 { 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; 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 e1ed8c925f5..a22e5e438fe 100644 --- a/samples/matter/template/src/default_zap/zap-generated/access.h +++ b/samples/matter/template/src/default_zap/zap-generated/access.h @@ -215,7 +215,6 @@ 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 @@ -223,7 +222,6 @@ 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 @@ -231,7 +229,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/samples/matter/thermostat/src/default_zap/thermostat.matter b/samples/matter/thermostat/src/default_zap/thermostat.matter index 0fcf41eafb6..8ea87615326 100644 --- a/samples/matter/thermostat/src/default_zap/thermostat.matter +++ b/samples/matter/thermostat/src/default_zap/thermostat.matter @@ -580,12 +580,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"]; @@ -617,7 +612,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -649,7 +643,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; } @@ -681,11 +674,6 @@ 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; @@ -693,7 +681,6 @@ cluster AccessControl = 31 { 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; 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 6e4e3205065..dc479c4b357 100644 --- a/samples/matter/thermostat/src/default_zap/zap-generated/access.h +++ b/samples/matter/thermostat/src/default_zap/zap-generated/access.h @@ -257,7 +257,6 @@ 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 @@ -265,7 +264,6 @@ 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 @@ -273,7 +271,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// 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 701351a52cc..64c7cc2132a 100644 --- a/samples/matter/window_covering/src/default_zap/window-app.matter +++ b/samples/matter/window_covering/src/default_zap/window-app.matter @@ -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"]; @@ -472,7 +467,6 @@ cluster AccessControl = 31 { bitmap Feature : bitmap32 { kExtension = 0x1; kManagedDevice = 0x2; - kAuxiliary = 0x4; } struct AccessRestrictionStruct { @@ -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; } @@ -536,11 +529,6 @@ 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; @@ -548,7 +536,6 @@ cluster AccessControl = 31 { 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; 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 dceea0e43f8..27481f6b9cb 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 @@ -224,7 +224,6 @@ 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 @@ -232,7 +231,6 @@ 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 @@ -240,7 +238,6 @@ 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 */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/west.yml b/west.yml index a8b26552559..ad6c938147f 100644 --- a/west.yml +++ b/west.yml @@ -155,7 +155,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: c9826122fccab36e7caec9654bd1c0fdd1d27242 + revision: 9c6dbea0201fb152ec4fdec26ac9461a58e44520 west-commands: scripts/west/west-commands.yml submodules: - name: nlio