Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing feature map for resource monitoring cluster #29074

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Fixing feature map for resource monitoring cluster #29074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2621751
Fixing feature map for resource monitoring cluster
cliffamzn Sep 5, 2023
76412f3
Updating and adding feature flag tests
cliffamzn Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3162,7 +3162,7 @@ server cluster HepaFilterMonitoring = 113 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down Expand Up @@ -3210,7 +3210,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down Expand Up @@ -6914,7 +6914,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 1;
}

Expand All @@ -6928,7 +6928,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 3;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 1;
}

Expand Down
7 changes: 4 additions & 3 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18456,7 +18456,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -18710,7 +18710,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -35392,5 +35392,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
4 changes: 2 additions & 2 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ server cluster HepaFilterMonitoring = 113 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down Expand Up @@ -1011,7 +1011,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down
8 changes: 4 additions & 4 deletions examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ server cluster HepaFilterMonitoring = 113 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down Expand Up @@ -1586,7 +1586,7 @@ server cluster ActivatedCarbonFilterMonitoring = 114 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down Expand Up @@ -2010,7 +2010,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 1;
}

Expand All @@ -2024,7 +2024,7 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute featureMap default = 7;
ram attribute clusterRevision default = 1;
}

Expand Down
19 changes: 10 additions & 9 deletions examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -6373,7 +6373,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -6627,7 +6627,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "7",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -6993,5 +6993,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
2 changes: 1 addition & 1 deletion src/app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum class Feature : uint32_t
{
kCondition = 0x1,
kWarning = 0x2,
kReplacementProductList = 0x3
kReplacementProductList = 0x4
};

// Enum for ProductIdentifierTypeEnum
Expand Down
8 changes: 8 additions & 0 deletions src/app/tests/suites/TestActivatedCarbonFilterMonitoring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ tests:
- name: "nodeId"
value: nodeId

- label: "Validate the feature map"
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x7]

- label: "Read Replacement Product List"
command: "readAttribute"
attribute: "ReplacementProductList"
Expand Down
8 changes: 8 additions & 0 deletions src/app/tests/suites/TestHepaFilterMonitoring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ tests:
- name: "nodeId"
value: nodeId

- label: "Validate the feature map"
command: "readAttribute"
attribute: "FeatureMap"
response:
constraints:
type: bitmap32
hasMasksSet: [0x7]

- label: "Read Replacement Product List"
command: "readAttribute"
attribute: "ReplacementProductList"
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ tests:
response:
constraints:
type: bitmap32
hasMasksSet: [0x3]
hasMasksSet: [0x4]
cliffamzn marked this conversation as resolved.
Show resolved Hide resolved

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_HEPAFREMON_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ tests:
response:
constraints:
type: bitmap32
hasMasksSet: [0x3]
hasMasksSet: [0x4]

- label: "Step 4: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml
View file
Open in desktop
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ limitations under the License.
<cluster code="0x0072" />
<field name="Condition" mask="0x01" />
<field name="Warning" mask="0x02" />
<field name="ReplacementProductList" mask="0x03" />
<field name="ReplacementProductList" mask="0x04" />
</bitmap>

<!-- Cluster Data Types -->
Expand Down
4 changes: 2 additions & 2 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3497,7 +3497,7 @@ client cluster HepaFilterMonitoring = 113 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down Expand Up @@ -3546,7 +3546,7 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
bitmap Feature : BITMAP32 {
kCondition = 0x1;
kWarning = 0x2;
kReplacementProductList = 0x3;
kReplacementProductList = 0x4;
}

struct ReplacementProductStruct {
Expand Down
4 changes: 2 additions & 2 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading