From bdb8145ec2195d2ba02e07be82d1021c0bcc2533 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Wed, 14 Jun 2023 12:29:19 +0200 Subject: [PATCH] samples: matter: Fixed spec incompatibilies for two clusters * Changed feature map from 2 to 0 for software diag cluster * Changed cluster revision from 1 to 2 for basic info cluster Signed-off-by: Arkadiusz Balys --- samples/matter/lock/src/lock.matter | 4 ++-- samples/matter/lock/src/lock.zap | 6 +++--- samples/matter/lock/src/zap-generated/endpoint_config.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/matter/lock/src/lock.matter b/samples/matter/lock/src/lock.matter index e063c3ecb162..686524241ac4 100644 --- a/samples/matter/lock/src/lock.matter +++ b/samples/matter/lock/src/lock.matter @@ -1711,7 +1711,7 @@ endpoint 0 { callback attribute acceptedCommandList; callback attribute attributeList; ram attribute featureMap default = 0; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 2; } server cluster OtaSoftwareUpdateRequestor { @@ -1778,7 +1778,7 @@ endpoint 0 { callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute attributeList; - ram attribute featureMap default = 1; + callback attribute featureMap default = 0; ram attribute clusterRevision default = 1; } diff --git a/samples/matter/lock/src/lock.zap b/samples/matter/lock/src/lock.zap index 1db56572a5cc..62b3adf60de5 100644 --- a/samples/matter/lock/src/lock.zap +++ b/samples/matter/lock/src/lock.zap @@ -1534,7 +1534,7 @@ "storageOption": "RAM", "singleton": 1, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -3287,10 +3287,10 @@ "side": "server", "type": "bitmap32", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/samples/matter/lock/src/zap-generated/endpoint_config.h b/samples/matter/lock/src/zap-generated/endpoint_config.h index d19f23ca873d..45c3dee3297f 100644 --- a/samples/matter/lock/src/zap-generated/endpoint_config.h +++ b/samples/matter/lock/src/zap-generated/endpoint_config.h @@ -142,7 +142,7 @@ { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */ \ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ + { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), \ ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ @@ -215,7 +215,7 @@ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapFree */ \ { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapUsed */ \ - { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \