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

Mode-derived clusters: rev update (XMLs + TC 1.1) #29964

Merged
merged 5 commits into from
Oct 25, 2023
Merged

Mode-derived clusters: rev update (XMLs + TC 1.1) #29964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf51fb4
add changes
plauric Oct 24, 2023
9d7a34e
add Commands.h changes generated by regen
plauric Oct 24, 2023
d73fa67
update zap files and fix XML indenting issue
plauric Oct 25, 2023
6b2c2e6
add matter files
plauric Oct 25, 2023
6a0dc04
add missing chef matter file
plauric Oct 25, 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
10 changes: 5 additions & 5 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 @@ -5888,7 +5888,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand All @@ -5903,7 +5903,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand Down Expand Up @@ -5931,7 +5931,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand All @@ -5946,7 +5946,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand Down Expand Up @@ -5985,7 +5985,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand Down
13 changes: 7 additions & 6 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 @@ -9018,7 +9018,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -9190,7 +9190,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -9532,7 +9532,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -9704,7 +9704,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -10155,7 +10155,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -21789,5 +21789,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand All @@ -1301,7 +1301,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand Down
7 changes: 4 additions & 3 deletions examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2593,7 +2593,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -2765,7 +2765,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -3035,5 +3035,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
4 changes: 2 additions & 2 deletions examples/rvc-app/rvc-common/rvc-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand All @@ -1206,7 +1206,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute clusterRevision default = 2;

handle command ChangeToMode;
handle command ChangeToModeResponse;
Expand Down
7 changes: 4 additions & 3 deletions examples/rvc-app/rvc-common/rvc-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,7 +2373,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -2529,7 +2529,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -2783,5 +2783,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
4 changes: 2 additions & 2 deletions src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ tests:
verification: |
./chip-tool dishwashermode read cluster-revision 1 1

Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 1 on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number (2) on the TH(Chip-tool) and below is the sample log provided for the raspi platform:

[1690365584.246794][27436:27438] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0059 Attribute 0x0000_FFFD DataVersion: 1130015440
[1690365584.246860][27436:27438] CHIP:TOO: ClusterRevision: 1
[1690365584.246860][27436:27438] CHIP:TOO: ClusterRevision: 2
disabled: true

- label: "Step 3: TH reads from the DUT the FeatureMap attribute."
Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 1
value: 2
constraints:
type: int16u

Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 1
value: 2
constraints:
type: int16u

Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 1
value: 2
constraints:
type: int16u

Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 1
value: 2
constraints:
type: int16u

Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ limitations under the License.
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
<globalAttribute side="either" code="0xFFFD" value="2"/>
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
Expand Down
1 change: 1 addition & 0 deletions ...ates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ limitations under the License.
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
<globalAttribute side="either" code="0xFFFD" value="2"/>
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ limitations under the License.
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
<globalAttribute side="either" code="0xFFFD" value="2"/>
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ limitations under the License.
<client init="false" tick="false">true</client>
<server init="false" tick="false">true</server>
<description>Attributes and commands for selecting a mode from a list of supported options.</description>
<globalAttribute side="either" code="0xFFFD" value="2"/>
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="int8u" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
Expand Down
8 changes: 4 additions & 4 deletions zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
View file
Open in desktop

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