Skip to content

Commit 21f9f65

Browse files
OliverFan1OliverFan1
committed
Regen ZAP after adding FeatureMap and HoldTime to zcl.json and zcl-with-test-extensions.json file for Occupancy Sensing cluster
Signed-off-by: Oliver Fan <oliver.fan@nxp.com>
1 parent 0771743 commit 21f9f65

File tree

11 files changed

+33
-137
lines changed

11 files changed

+33
-137
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -8998,9 +8998,9 @@ endpoint 1 {
89988998
ram attribute occupancy;
89998999
ram attribute occupancySensorType;
90009000
ram attribute occupancySensorTypeBitmap;
9001-
ram attribute holdTime default = 10;
9001+
callback attribute holdTime;
90029002
callback attribute holdTimeLimits;
9003-
ram attribute featureMap default = 0x01;
9003+
callback attribute featureMap;
90049004
ram attribute clusterRevision default = 5;
90059005
}
90069006

@@ -9469,9 +9469,9 @@ endpoint 2 {
94699469
ram attribute occupancy;
94709470
ram attribute occupancySensorType;
94719471
ram attribute occupancySensorTypeBitmap;
9472-
ram attribute holdTime default = 20;
9472+
callback attribute holdTime;
94739473
callback attribute holdTimeLimits;
9474-
ram attribute featureMap default = 0x01;
9474+
callback attribute featureMap;
94759475
ram attribute clusterRevision default = 5;
94769476
}
94779477
}

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -6682,7 +6682,7 @@ endpoint 1 {
66826682
ram attribute occupancy;
66836683
ram attribute occupancySensorType;
66846684
ram attribute occupancySensorTypeBitmap;
6685-
ram attribute featureMap default = 0;
6685+
callback attribute featureMap;
66866686
ram attribute clusterRevision default = 4;
66876687
}
66886688

@@ -7029,7 +7029,7 @@ endpoint 2 {
70297029
ram attribute occupancy;
70307030
ram attribute occupancySensorType;
70317031
ram attribute occupancySensorTypeBitmap;
7032-
ram attribute featureMap default = 0;
7032+
callback attribute featureMap;
70337033
ram attribute clusterRevision default = 4;
70347034
}
70357035
}

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1716,7 +1716,7 @@ endpoint 1 {
17161716
callback attribute generatedCommandList;
17171717
callback attribute acceptedCommandList;
17181718
callback attribute attributeList;
1719-
ram attribute featureMap default = 0;
1719+
callback attribute featureMap;
17201720
ram attribute clusterRevision default = 2;
17211721
}
17221722
}

‎examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2153,7 +2153,7 @@ endpoint 1 {
21532153
ram attribute occupancy;
21542154
ram attribute occupancySensorType;
21552155
ram attribute occupancySensorTypeBitmap;
2156-
ram attribute featureMap default = 0;
2156+
callback attribute featureMap;
21572157
ram attribute clusterRevision default = 4;
21582158
}
21592159
}

‎examples/lighting-app/lighting-common/lighting-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2977,7 +2977,7 @@ endpoint 1 {
29772977
ram attribute occupancy;
29782978
ram attribute occupancySensorType;
29792979
ram attribute occupancySensorTypeBitmap;
2980-
ram attribute featureMap default = 0;
2980+
callback attribute featureMap;
29812981
ram attribute clusterRevision default = 4;
29822982
}
29832983
}

‎examples/placeholder/linux/apps/app1/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -9362,7 +9362,7 @@ endpoint 1 {
93629362
ram attribute physicalContactOccupiedToUnoccupiedDelay default = 0x00;
93639363
ram attribute physicalContactUnoccupiedToOccupiedDelay default = 0x00;
93649364
ram attribute physicalContactUnoccupiedToOccupiedThreshold default = 1;
9365-
ram attribute featureMap default = 0;
9365+
callback attribute featureMap;
93669366
callback attribute clusterRevision default = 4;
93679367
}
93689368
}

‎examples/placeholder/linux/apps/app2/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -9301,7 +9301,7 @@ endpoint 1 {
93019301
ram attribute physicalContactOccupiedToUnoccupiedDelay default = 0x00;
93029302
ram attribute physicalContactUnoccupiedToOccupiedDelay default = 0x00;
93039303
ram attribute physicalContactUnoccupiedToOccupiedThreshold default = 1;
9304-
ram attribute featureMap default = 0;
9304+
callback attribute featureMap;
93059305
callback attribute clusterRevision default = 4;
93069306
}
93079307
}

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -1576,11 +1576,11 @@
15761576
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
15771577
\
15781578
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
1579-
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
1580-
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \
1581-
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \
1582-
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
1583-
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
1579+
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
1580+
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \
1581+
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \
1582+
{ ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \
1583+
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
15841584
\
15851585
/* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */ \
15861586
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE), \
@@ -2017,11 +2017,11 @@
20172017
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
20182018
\
20192019
/* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \
2020-
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
2021-
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \
2022-
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \
2023-
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
2024-
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
2020+
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
2021+
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \
2022+
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \
2023+
{ ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \
2024+
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
20252025
\
20262026
/* Endpoint: 65534, Cluster: Descriptor (server) */ \
20272027
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DeviceTypeList */ \
@@ -3879,7 +3879,7 @@
38793879
.clusterId = 0x00000406, \
38803880
.attributes = ZAP_ATTRIBUTE_INDEX(762), \
38813881
.attributeCount = 5, \
3882-
.clusterSize = 9, \
3882+
.clusterSize = 5, \
38833883
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
38843884
.functions = chipFuncArrayOccupancySensingServer, \
38853885
.acceptedCommandList = nullptr, \
@@ -4152,7 +4152,7 @@
41524152
.clusterId = 0x00000406, \
41534153
.attributes = ZAP_ATTRIBUTE_INDEX(1034), \
41544154
.attributeCount = 5, \
4155-
.clusterSize = 9, \
4155+
.clusterSize = 5, \
41564156
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
41574157
.functions = chipFuncArrayOccupancySensingServer, \
41584158
.acceptedCommandList = nullptr, \
@@ -4195,7 +4195,7 @@
41954195
// This is an array of EmberAfEndpointType structures.
41964196
#define GENERATED_ENDPOINT_TYPES \
41974197
{ \
4198-
{ ZAP_CLUSTER_INDEX(0), 29, 349 }, { ZAP_CLUSTER_INDEX(29), 74, 3522 }, { ZAP_CLUSTER_INDEX(103), 7, 126 }, \
4198+
{ ZAP_CLUSTER_INDEX(0), 29, 349 }, { ZAP_CLUSTER_INDEX(29), 74, 3518 }, { ZAP_CLUSTER_INDEX(103), 7, 122 }, \
41994199
{ ZAP_CLUSTER_INDEX(110), 2, 0 }, \
42004200
}
42014201

@@ -4208,7 +4208,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
42084208
#define ATTRIBUTE_SINGLETONS_SIZE (36)
42094209

42104210
// Total size of attribute storage
4211-
#define ATTRIBUTE_MAX_SIZE (3997)
4211+
#define ATTRIBUTE_MAX_SIZE (3989)
42124212

42134213
// Number of fixed endpoints
42144214
#define FIXED_ENDPOINT_COUNT (4)

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -536,11 +536,11 @@
536536
{ ZAP_SIMPLE_DEFAULT(7), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
537537
\
538538
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
539-
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
540-
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \
541-
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \
542-
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
543-
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
539+
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */ \
540+
{ ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* OccupancySensorType */ \
541+
{ ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */ \
542+
{ ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */ \
543+
{ ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
544544
}
545545

546546
// clang-format off
@@ -1170,7 +1170,7 @@
11701170
.clusterId = 0x00000406, \
11711171
.attributes = ZAP_ATTRIBUTE_INDEX(271), \
11721172
.attributeCount = 5, \
1173-
.clusterSize = 9, \
1173+
.clusterSize = 5, \
11741174
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
11751175
.functions = chipFuncArrayOccupancySensingServer, \
11761176
.acceptedCommandList = nullptr, \
@@ -1187,7 +1187,7 @@
11871187
// This is an array of EmberAfEndpointType structures.
11881188
#define GENERATED_ENDPOINT_TYPES \
11891189
{ \
1190-
{ ZAP_CLUSTER_INDEX(0), 21, 223 }, { ZAP_CLUSTER_INDEX(21), 8, 121 }, \
1190+
{ ZAP_CLUSTER_INDEX(0), 21, 223 }, { ZAP_CLUSTER_INDEX(21), 8, 117 }, \
11911191
}
11921192

11931193
// Largest attribute size is needed for various buffers
@@ -1199,7 +1199,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
11991199
#define ATTRIBUTE_SINGLETONS_SIZE (36)
12001200

12011201
// Total size of attribute storage
1202-
#define ATTRIBUTE_MAX_SIZE (344)
1202+
#define ATTRIBUTE_MAX_SIZE (340)
12031203

12041204
// Number of fixed endpoints
12051205
#define FIXED_ENDPOINT_COUNT (2)

‎zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp

-92
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)