Skip to content

Commit 4129857

Browse files
cliffamznpull[bot]
cliffamzn
authored and
pull[bot]
committed
Fixing feature map for resource monitoring cluster (#29074)
* Fixing feature map for resource monitoring cluster The replacement product list feature bitmask was set to 0x3 when it should have been set to 0x4. Fixing it here. Verified by looking reading the feature map in the all clusters app and the resource monitoring app: ``` > hepafiltermonitoring read feature-map 1 1 ... [1693934613437] [9078:18462448] [DMG] AttributeReportIBs = [1693934613437] [9078:18462448] [DMG] [ [1693934613437] [9078:18462448] [DMG] AttributeReportIB = [1693934613437] [9078:18462448] [DMG] { [1693934613437] [9078:18462448] [DMG] AttributeDataIB = [1693934613437] [9078:18462448] [DMG] { [1693934613437] [9078:18462448] [DMG] DataVersion = 0x443616af, [1693934613437] [9078:18462448] [DMG] AttributePathIB = [1693934613437] [9078:18462448] [DMG] { [1693934613437] [9078:18462448] [DMG] Endpoint = 0x1, [1693934613437] [9078:18462448] [DMG] Cluster = 0x72, [1693934613437] [9078:18462448] [DMG] Attribute = 0x0000_FFFC, [1693934613437] [9078:18462448] [DMG] } [1693934613437] [9078:18462448] [DMG] [1693934613437] [9078:18462448] [DMG] Data = 7, [1693934613437] [9078:18462448] [DMG] }, [1693934613437] [9078:18462448] [DMG] [1693934613437] [9078:18462448] [DMG] }, [1693934613437] [9078:18462448] [DMG] [1693934613437] [9078:18462448] [DMG] ], ``` This fixes #28197 and #28198 * Updating and adding feature flag tests
1 parent e022501 commit 4129857

File tree

16 files changed

+116
-42
lines changed

16 files changed

+116
-42
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -3162,7 +3162,7 @@ server cluster HepaFilterMonitoring = 113 {
31623162
bitmap Feature : BITMAP32 {
31633163
kCondition = 0x1;
31643164
kWarning = 0x2;
3165-
kReplacementProductList = 0x3;
3165+
kReplacementProductList = 0x4;
31663166
}
31673167

31683168
struct ReplacementProductStruct {
@@ -3210,7 +3210,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
32103210
bitmap Feature : BITMAP32 {
32113211
kCondition = 0x1;
32123212
kWarning = 0x2;
3213-
kReplacementProductList = 0x3;
3213+
kReplacementProductList = 0x4;
32143214
}
32153215

32163216
struct ReplacementProductStruct {
@@ -6914,7 +6914,7 @@ endpoint 1 {
69146914
callback attribute generatedCommandList;
69156915
callback attribute acceptedCommandList;
69166916
callback attribute attributeList;
6917-
ram attribute featureMap default = 3;
6917+
ram attribute featureMap default = 7;
69186918
ram attribute clusterRevision default = 1;
69196919
}
69206920

@@ -6928,7 +6928,7 @@ endpoint 1 {
69286928
callback attribute generatedCommandList;
69296929
callback attribute acceptedCommandList;
69306930
callback attribute attributeList;
6931-
ram attribute featureMap default = 3;
6931+
ram attribute featureMap default = 7;
69326932
ram attribute clusterRevision default = 1;
69336933
}
69346934

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -18456,7 +18456,7 @@
1845618456
"storageOption": "RAM",
1845718457
"singleton": 0,
1845818458
"bounded": 0,
18459-
"defaultValue": "3",
18459+
"defaultValue": "7",
1846018460
"reportable": 1,
1846118461
"minInterval": 1,
1846218462
"maxInterval": 65534,
@@ -18710,7 +18710,7 @@
1871018710
"storageOption": "RAM",
1871118711
"singleton": 0,
1871218712
"bounded": 0,
18713-
"defaultValue": "3",
18713+
"defaultValue": "7",
1871418714
"reportable": 1,
1871518715
"minInterval": 1,
1871618716
"maxInterval": 65534,
@@ -35392,5 +35392,6 @@
3539235392
"endpointId": 65534,
3539335393
"networkId": 0
3539435394
}
35395-
]
35395+
],
35396+
"log": []
3539635397
}

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ server cluster HepaFilterMonitoring = 113 {
967967
bitmap Feature : BITMAP32 {
968968
kCondition = 0x1;
969969
kWarning = 0x2;
970-
kReplacementProductList = 0x3;
970+
kReplacementProductList = 0x4;
971971
}
972972

973973
struct ReplacementProductStruct {
@@ -1011,7 +1011,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
10111011
bitmap Feature : BITMAP32 {
10121012
kCondition = 0x1;
10131013
kWarning = 0x2;
1014-
kReplacementProductList = 0x3;
1014+
kReplacementProductList = 0x4;
10151015
}
10161016

10171017
struct ReplacementProductStruct {

‎examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ server cluster HepaFilterMonitoring = 113 {
15381538
bitmap Feature : BITMAP32 {
15391539
kCondition = 0x1;
15401540
kWarning = 0x2;
1541-
kReplacementProductList = 0x3;
1541+
kReplacementProductList = 0x4;
15421542
}
15431543

15441544
struct ReplacementProductStruct {
@@ -1586,7 +1586,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
15861586
bitmap Feature : BITMAP32 {
15871587
kCondition = 0x1;
15881588
kWarning = 0x2;
1589-
kReplacementProductList = 0x3;
1589+
kReplacementProductList = 0x4;
15901590
}
15911591

15921592
struct ReplacementProductStruct {
@@ -2010,7 +2010,7 @@ endpoint 1 {
20102010
callback attribute generatedCommandList;
20112011
callback attribute acceptedCommandList;
20122012
callback attribute attributeList;
2013-
ram attribute featureMap default = 0;
2013+
ram attribute featureMap default = 7;
20142014
ram attribute clusterRevision default = 1;
20152015
}
20162016

@@ -2024,7 +2024,7 @@ endpoint 1 {
20242024
callback attribute generatedCommandList;
20252025
callback attribute acceptedCommandList;
20262026
callback attribute attributeList;
2027-
ram attribute featureMap default = 0;
2027+
ram attribute featureMap default = 7;
20282028
ram attribute clusterRevision default = 1;
20292029
}
20302030

‎examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap

+10-9
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
}
1717
],
1818
"package": [
19+
{
20+
"pathRelativity": "relativeToZap",
21+
"path": "../../../src/app/zap-templates/app-templates.json",
22+
"type": "gen-templates-json",
23+
"version": "chip-v1"
24+
},
1925
{
2026
"pathRelativity": "relativeToZap",
2127
"path": "../../../src/app/zap-templates/zcl/zcl.json",
2228
"type": "zcl-properties",
2329
"category": "matter",
2430
"version": 1,
2531
"description": "Matter SDK ZCL data"
26-
},
27-
{
28-
"pathRelativity": "relativeToZap",
29-
"path": "../../../src/app/zap-templates/app-templates.json",
30-
"type": "gen-templates-json",
31-
"version": "chip-v1"
3232
}
3333
],
3434
"endpointTypes": [
@@ -6373,7 +6373,7 @@
63736373
"storageOption": "RAM",
63746374
"singleton": 0,
63756375
"bounded": 0,
6376-
"defaultValue": "0",
6376+
"defaultValue": "7",
63776377
"reportable": 1,
63786378
"minInterval": 1,
63796379
"maxInterval": 65534,
@@ -6627,7 +6627,7 @@
66276627
"storageOption": "RAM",
66286628
"singleton": 0,
66296629
"bounded": 0,
6630-
"defaultValue": "0",
6630+
"defaultValue": "7",
66316631
"reportable": 1,
66326632
"minInterval": 1,
66336633
"maxInterval": 65534,
@@ -6993,5 +6993,6 @@
69936993
"endpointId": 1,
69946994
"networkId": 0
69956995
}
6996-
]
6996+
],
6997+
"log": []
69976998
}

‎src/app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ enum class Feature : uint32_t
6262
{
6363
kCondition = 0x1,
6464
kWarning = 0x2,
65-
kReplacementProductList = 0x3
65+
kReplacementProductList = 0x4
6666
};
6767

6868
// Enum for ProductIdentifierTypeEnum

‎src/app/tests/suites/TestActivatedCarbonFilterMonitoring.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ tests:
2828
- name: "nodeId"
2929
value: nodeId
3030

31+
- label: "Validate the feature map"
32+
command: "readAttribute"
33+
attribute: "FeatureMap"
34+
response:
35+
constraints:
36+
type: bitmap32
37+
hasMasksSet: [0x7]
38+
3139
- label: "Read Replacement Product List"
3240
command: "readAttribute"
3341
attribute: "ReplacementProductList"

‎src/app/tests/suites/TestHepaFilterMonitoring.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ tests:
2828
- name: "nodeId"
2929
value: nodeId
3030

31+
- label: "Validate the feature map"
32+
command: "readAttribute"
33+
attribute: "FeatureMap"
34+
response:
35+
constraints:
36+
type: bitmap32
37+
hasMasksSet: [0x7]
38+
3139
- label: "Read Replacement Product List"
3240
command: "readAttribute"
3341
attribute: "ReplacementProductList"

‎src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ tests:
7979
response:
8080
constraints:
8181
type: bitmap32
82-
hasMasksSet: [0x3]
82+
hasMasksSet: [0x4]
8383

8484
- label: "Step 4a: Read the global attribute: AttributeList"
8585
PICS: PICS_EVENT_LIST_ENABLED

‎src/app/tests/suites/certification/Test_TC_HEPAFREMON_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ tests:
7979
response:
8080
constraints:
8181
type: bitmap32
82-
hasMasksSet: [0x3]
82+
hasMasksSet: [0x4]
8383

8484
- label: "Step 4: Read the global attribute: AttributeList"
8585
PICS: PICS_EVENT_LIST_ENABLED

‎src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ limitations under the License.
6868
<cluster code="0x0072" />
6969
<field name="Condition" mask="0x01" />
7070
<field name="Warning" mask="0x02" />
71-
<field name="ReplacementProductList" mask="0x03" />
71+
<field name="ReplacementProductList" mask="0x04" />
7272
</bitmap>
7373

7474
<!-- Cluster Data Types -->

‎src/controller/data_model/controller-clusters.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -3497,7 +3497,7 @@ client cluster HepaFilterMonitoring = 113 {
34973497
bitmap Feature : BITMAP32 {
34983498
kCondition = 0x1;
34993499
kWarning = 0x2;
3500-
kReplacementProductList = 0x3;
3500+
kReplacementProductList = 0x4;
35013501
}
35023502

35033503
struct ReplacementProductStruct {
@@ -3546,7 +3546,7 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
35463546
bitmap Feature : BITMAP32 {
35473547
kCondition = 0x1;
35483548
kWarning = 0x2;
3549-
kReplacementProductList = 0x3;
3549+
kReplacementProductList = 0x4;
35503550
}
35513551

35523552
struct ReplacementProductStruct {

‎src/controller/python/chip/clusters/Objects.py

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

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+2-2
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/cluster-enums.h

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

0 commit comments

Comments
 (0)