From 3238330ee0c8b1143fa40b5edae55d9e4382ff72 Mon Sep 17 00:00:00 2001 From: Evgeniy Morozov Date: Tue, 21 Jun 2022 21:48:59 +0300 Subject: [PATCH] Enable COTA feature (#19815) * Enable the COTA feature for TC_DL tests * Update auto-generated files --- examples/lock-app/lock-common/lock-app.matter | 4 +++- examples/lock-app/lock-common/lock-app.zap | 4 ++-- scripts/tests/chiptest/__init__.py | 2 +- zzz_generated/lock-app/zap-generated/access.h | 6 ++++++ .../lock-app/zap-generated/endpoint_config.h | 16 +++++++++------- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 34009fcf9add01..b642db15d1f57e 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1668,6 +1668,7 @@ server cluster DoorLock = 257 { attribute access(write: manage) boolean enablePrivacyModeButton = 43; attribute access(write: administer) int8u wrongCodeEntryLimit = 48; attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49; + attribute access(write: administer) boolean requirePINforRemoteOperation = 51; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2187,7 +2188,8 @@ endpoint 1 { ram attribute enablePrivacyModeButton; ram attribute wrongCodeEntryLimit default = 3; ram attribute userCodeTemporaryDisableTime default = 10; - ram attribute featureMap default = 0x133; + ram attribute requirePINforRemoteOperation; + ram attribute featureMap default = 0x1B3; ram attribute clusterRevision default = 6; } } diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index c4ce3db3e46ad9..5203c9d992dfce 100755 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -7850,7 +7850,7 @@ "mfgCode": null, "side": "server", "type": "boolean", - "included": 0, + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -7934,7 +7934,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x133", + "defaultValue": "0x1B3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py index fbf3fcac09f8ea..283d272f183e13 100644 --- a/scripts/tests/chiptest/__init__.py +++ b/scripts/tests/chiptest/__init__.py @@ -32,7 +32,7 @@ def AllTests(chip_tool: str): if name.startswith('TV_') or name.startswith('Test_TC_MC_'): target = TestTarget.TV - elif name.startswith('DL_'): + elif name.startswith('DL_') or name.startswith('Test_TC_DL_'): target = TestTarget.LOCK elif name.startswith('OTA_'): target = TestTarget.OTA diff --git a/zzz_generated/lock-app/zap-generated/access.h b/zzz_generated/lock-app/zap-generated/access.h index bbd73bb7aa9bf1..3a217db3617577 100644 --- a/zzz_generated/lock-app/zap-generated/access.h +++ b/zzz_generated/lock-app/zap-generated/access.h @@ -55,6 +55,7 @@ /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ + /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ } // Parallel array data (cluster, *attribute*, privilege) for read attribute @@ -85,6 +86,7 @@ /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ + /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ } // Parallel array data (cluster, attribute, *privilege*) for read attribute @@ -115,6 +117,7 @@ /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: view */ \ /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: view */ \ /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: view */ \ + /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: view */ \ } //////////////////////////////////////////////////////////////////////////////// @@ -138,6 +141,7 @@ 257, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \ 257, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \ 257, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \ + 257, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \ } // Parallel array data (cluster, *attribute*, privilege) for write attribute @@ -159,6 +163,7 @@ 43, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \ 48, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \ 49, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \ + 51, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \ } // Parallel array data (cluster, attribute, *privilege*) for write attribute @@ -180,6 +185,7 @@ kMatterAccessPrivilegeManage, /* Cluster: Door Lock, Attribute: EnablePrivacyModeButton, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: WrongCodeEntryLimit, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: UserCodeTemporaryDisableTime, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Door Lock, Attribute: RequirePINforRemoteOperation, Privilege: administer */ \ } //////////////////////////////////////////////////////////////////////////////// diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index cd0a33315180ab..0a7f997ee99a2a 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -129,7 +129,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 260 +#define GENERATED_ATTRIBUTE_COUNT 261 #define GENERATED_ATTRIBUTES \ { \ \ @@ -543,8 +543,10 @@ { 0x00000030, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(4) }, /* WrongCodeEntryLimit */ \ { 0x00000031, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* UserCodeTemporaryDisableTime */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x133) }, /* FeatureMap */ \ + ZAP_MIN_MAX_DEFAULTS_INDEX(5) }, /* UserCodeTemporaryDisableTime */ \ + { 0x00000033, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), \ + ZAP_SIMPLE_DEFAULT(0) }, /* RequirePINforRemoteOperation */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x1B3) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(6) }, /* ClusterRevision */ \ } @@ -1015,8 +1017,8 @@ /* Endpoint: 1, Cluster: Door Lock (server) */ \ .clusterId = 0x00000101, \ .attributes = ZAP_ATTRIBUTE_INDEX(233), \ - .attributeCount = 27, \ - .clusterSize = 41, \ + .attributeCount = 28, \ + .clusterSize = 42, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayDoorLockServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\ @@ -1033,7 +1035,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 21, 311 }, { ZAP_CLUSTER_INDEX(21), 6, 206 }, \ + { ZAP_CLUSTER_INDEX(0), 21, 311 }, { ZAP_CLUSTER_INDEX(21), 6, 207 }, \ } // Largest attribute size is needed for various buffers @@ -1045,7 +1047,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (37) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (517) +#define ATTRIBUTE_MAX_SIZE (518) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (2)