Skip to content

Commit cd9c042

Browse files
ArekBalysNordicArekBalysNordic
committed
samples: matter: Update ZAP files to the newest version
ZAP Tool version has been changed, and we need to re-generate all source files. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
1 parent 07ef49a commit cd9c042

13 files changed

Lines changed: 5204 additions & 5428 deletions

File tree

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

Lines changed: 348 additions & 387 deletions
Large diffs are not rendered by default.

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

Lines changed: 519 additions & 511 deletions
Large diffs are not rendered by default.

‎samples/matter/common/src/certification/thread_platform/zap-generated/endpoint_config.h‎

Lines changed: 440 additions & 480 deletions
Large diffs are not rendered by default.

‎samples/matter/light_bulb/src/default_zap/zap-generated/endpoint_config.h‎

Lines changed: 433 additions & 475 deletions
Large diffs are not rendered by default.

‎samples/matter/light_switch/snippets/lit_icd/zap-generated/endpoint_config.h‎

Lines changed: 528 additions & 474 deletions
Large diffs are not rendered by default.

‎samples/matter/light_switch/src/default_zap/zap-generated/endpoint_config.h‎

Lines changed: 407 additions & 448 deletions
Large diffs are not rendered by default.

‎samples/matter/lock/snippets/schedules/zap-generated/endpoint_config.h‎

Lines changed: 486 additions & 516 deletions
Large diffs are not rendered by default.

‎samples/matter/lock/src/default_zap/zap-generated/endpoint_config.h‎

Lines changed: 460 additions & 488 deletions
Large diffs are not rendered by default.

‎samples/matter/manufacturer_specific/src/default_zap/zap-generated/endpoint_config.h‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -162,45 +162,42 @@
162162
*/ \
163163
\
164164
/* Endpoint: 0, Cluster: Basic Information (server) */ \
165-
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), \
166-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision */ \
165+
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DataModelRevision \
166+
*/ \
167167
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING), \
168-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */ \
168+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* VendorName */ \
169169
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID), \
170-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */ \
170+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* VendorID */ \
171171
{ ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING), \
172-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */ \
173-
{ ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), \
174-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */ \
172+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ProductName */ \
173+
{ ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ProductID \
174+
*/ \
175175
{ ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING), \
176-
ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel \
177-
*/ \
176+
ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel */ \
178177
{ ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING), \
179-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | \
180-
ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */ \
181-
{ ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), \
182-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion */ \
178+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */ \
179+
{ ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* HardwareVersion \
180+
*/ \
183181
{ ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING), \
184-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString */ \
185-
{ ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U), \
186-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion */ \
182+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* HardwareVersionString */ \
183+
{ ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SoftwareVersion \
184+
*/ \
187185
{ ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING), \
188-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString */ \
186+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SoftwareVersionString */ \
189187
{ ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING), \
190-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate */ \
188+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ManufacturingDate */ \
191189
{ ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING), \
192-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */ \
190+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SerialNumber */ \
193191
{ ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING), \
194-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* UniqueID */ \
192+
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UniqueID */ \
195193
{ ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima \
196194
*/ \
197-
{ ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U), \
198-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion */ \
199-
{ ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), \
200-
ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* MaxPathsPerInvoke */ \
195+
{ ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SpecificationVersion \
196+
*/ \
197+
{ ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxPathsPerInvoke \
198+
*/ \
201199
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
202-
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision \
203-
*/ \
200+
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
204201
\
205202
/* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \
206203
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), \
@@ -618,7 +615,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
618615
"ATTRIBUTE_LARGEST larger than expected");
619616

620617
// Total size of singleton attributes
621-
#define ATTRIBUTE_SINGLETONS_SIZE (35)
618+
#define ATTRIBUTE_SINGLETONS_SIZE (0)
622619

623620
// Total size of attribute storage
624621
#define ATTRIBUTE_MAX_SIZE (335)

0 commit comments

Comments
 (0)