From 75099075388243b10f3d17c04752b6bcc9e63310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Kr=C3=B3lik?= <66667989+Damian-Nordic@users.noreply.github.com> Date: Wed, 23 Mar 2022 13:04:06 +0100 Subject: [PATCH] [zap] Regenerate to fix ZAP CI (#16560) --- .../placeholder/linux/apps/app1/config.matter | 28 ++++++++++++------- .../placeholder/linux/apps/app2/config.matter | 28 ++++++++++++------- .../app1/zap-generated/endpoint_config.h | 17 +++++------ .../app2/zap-generated/endpoint_config.h | 17 +++++------ 4 files changed, 54 insertions(+), 36 deletions(-) diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 52cc0ea6df0025..ebd2f5bd9274c7 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1010,17 +1010,21 @@ server cluster LevelControl = 8 { } client cluster ModeSelect = 80 { + bitmap ModeSelectFeature : BITMAP32 { + kDeponoff = 0x1; + } + struct ModeOptionStruct { CHAR_STRING<32> label = 0; INT8U mode = 1; INT32U semanticTag = 2; } - readonly attribute int8u currentMode = 0; - readonly attribute ModeOptionStruct supportedModes[] = 1; - attribute int8u onMode = 2; - readonly attribute int8u startUpMode = 3; - readonly attribute char_string<32> description = 4; + readonly attribute char_string<32> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; + readonly attribute ModeOptionStruct supportedModes[] = 2; + readonly attribute int8u currentMode = 3; + readonly attribute nullable int8u startUpMode = 4; readonly global attribute command_id generatedCommandList[] = 65528; readonly global attribute command_id acceptedCommandList[] = 65529; readonly global attribute attrib_id attributeList[] = 65531; @@ -1035,17 +1039,21 @@ client cluster ModeSelect = 80 { } server cluster ModeSelect = 80 { + bitmap ModeSelectFeature : BITMAP32 { + kDeponoff = 0x1; + } + struct ModeOptionStruct { CHAR_STRING<32> label = 0; INT8U mode = 1; INT32U semanticTag = 2; } - readonly attribute int8u currentMode = 0; - readonly attribute ModeOptionStruct supportedModes[] = 1; - attribute int8u onMode = 2; - readonly attribute int8u startUpMode = 3; - readonly attribute char_string<32> description = 4; + readonly attribute char_string<32> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; + readonly attribute ModeOptionStruct supportedModes[] = 2; + readonly attribute int8u currentMode = 3; + readonly attribute nullable int8u startUpMode = 4; readonly global attribute command_id generatedCommandList[] = 65528; readonly global attribute command_id acceptedCommandList[] = 65529; readonly global attribute attrib_id attributeList[] = 65531; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 52cc0ea6df0025..ebd2f5bd9274c7 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1010,17 +1010,21 @@ server cluster LevelControl = 8 { } client cluster ModeSelect = 80 { + bitmap ModeSelectFeature : BITMAP32 { + kDeponoff = 0x1; + } + struct ModeOptionStruct { CHAR_STRING<32> label = 0; INT8U mode = 1; INT32U semanticTag = 2; } - readonly attribute int8u currentMode = 0; - readonly attribute ModeOptionStruct supportedModes[] = 1; - attribute int8u onMode = 2; - readonly attribute int8u startUpMode = 3; - readonly attribute char_string<32> description = 4; + readonly attribute char_string<32> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; + readonly attribute ModeOptionStruct supportedModes[] = 2; + readonly attribute int8u currentMode = 3; + readonly attribute nullable int8u startUpMode = 4; readonly global attribute command_id generatedCommandList[] = 65528; readonly global attribute command_id acceptedCommandList[] = 65529; readonly global attribute attrib_id attributeList[] = 65531; @@ -1035,17 +1039,21 @@ client cluster ModeSelect = 80 { } server cluster ModeSelect = 80 { + bitmap ModeSelectFeature : BITMAP32 { + kDeponoff = 0x1; + } + struct ModeOptionStruct { CHAR_STRING<32> label = 0; INT8U mode = 1; INT32U semanticTag = 2; } - readonly attribute int8u currentMode = 0; - readonly attribute ModeOptionStruct supportedModes[] = 1; - attribute int8u onMode = 2; - readonly attribute int8u startUpMode = 3; - readonly attribute char_string<32> description = 4; + readonly attribute char_string<32> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; + readonly attribute ModeOptionStruct supportedModes[] = 2; + readonly attribute int8u currentMode = 3; + readonly attribute nullable int8u startUpMode = 4; readonly global attribute command_id generatedCommandList[] = 65528; readonly global attribute command_id acceptedCommandList[] = 65529; readonly global attribute attrib_id attributeList[] = 65531; diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index a732031ae25e2b..37b3d6ee24766d 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -366,11 +366,12 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Mode Select (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentMode */ \ - { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedModes */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(255) }, /* OnMode */ \ - { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* StartUpMode */ \ - { 0x00000004, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* Description */ \ + { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* Description */ \ + { 0x00000001, ZAP_TYPE(ENUM16), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + ZAP_EMPTY_DEFAULT() }, /* StandardNamespace */ \ + { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedModes */ \ + { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentMode */ \ + { 0x00000004, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* StartUpMode */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ @@ -957,7 +958,7 @@ .clusterId = 0x00000050, \ .attributes = ZAP_ATTRIBUTE_INDEX(68), \ .attributeCount = 7, \ - .clusterSize = 42, \ + .clusterSize = 41, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ @@ -1249,7 +1250,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 31, 455 }, { ZAP_CLUSTER_INDEX(31), 8, 72 }, \ + { ZAP_CLUSTER_INDEX(0), 31, 454 }, { ZAP_CLUSTER_INDEX(31), 8, 72 }, \ } // Largest attribute size is needed for various buffers @@ -1261,7 +1262,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (78) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (527) +#define ATTRIBUTE_MAX_SIZE (526) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2) diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index a732031ae25e2b..37b3d6ee24766d 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -366,11 +366,12 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Mode Select (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentMode */ \ - { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedModes */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(255) }, /* OnMode */ \ - { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* StartUpMode */ \ - { 0x00000004, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* Description */ \ + { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* Description */ \ + { 0x00000001, ZAP_TYPE(ENUM16), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + ZAP_EMPTY_DEFAULT() }, /* StandardNamespace */ \ + { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* SupportedModes */ \ + { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentMode */ \ + { 0x00000004, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* StartUpMode */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_LONG_DEFAULTS_INDEX(40) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ @@ -957,7 +958,7 @@ .clusterId = 0x00000050, \ .attributes = ZAP_ATTRIBUTE_INDEX(68), \ .attributeCount = 7, \ - .clusterSize = 42, \ + .clusterSize = 41, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ @@ -1249,7 +1250,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 31, 455 }, { ZAP_CLUSTER_INDEX(31), 8, 72 }, \ + { ZAP_CLUSTER_INDEX(0), 31, 454 }, { ZAP_CLUSTER_INDEX(31), 8, 72 }, \ } // Largest attribute size is needed for various buffers @@ -1261,7 +1262,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (78) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (527) +#define ATTRIBUTE_MAX_SIZE (526) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2)