Skip to content

Commit

Permalink
Update following change in the support for the StartUpMode attribute …
Browse files Browse the repository at this point in the history
…for the RVC device type (project-chip#29862)

* Removed the StartUpMode attribute from the RVC ModeBase clusters in chef's RVC device.

* Reverted the changes made in PR 29248 following the spec change in PR 7576.

* Restyled by prettier-markdown

---------

Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
2 people authored and HunsupJung committed Oct 23, 2023
1 parent 6e76c31 commit cac610a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,6 @@ server cluster RvcRunMode = 84 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute nullable int8u startUpMode = 2;
attribute nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -1090,7 +1089,6 @@ server cluster RvcCleanMode = 85 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute nullable int8u startUpMode = 2;
attribute nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -1426,7 +1424,6 @@ endpoint 1 {
server cluster RvcRunMode {
callback attribute supportedModes default = 0;
callback attribute currentMode default = 0;
callback attribute startUpMode default = 0;
callback attribute onMode default = 0;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
Expand All @@ -1442,7 +1439,6 @@ endpoint 1 {
server cluster RvcCleanMode {
callback attribute supportedModes default = 0;
callback attribute currentMode default = 0;
callback attribute startUpMode default = 0;
callback attribute onMode default = 0;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
Expand Down
36 changes: 3 additions & 33 deletions examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2266,6 +2266,7 @@
"define": "SCENES_CLUSTER",
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "AddScene",
Expand Down Expand Up @@ -2811,22 +2812,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpMode",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
Expand Down Expand Up @@ -2999,22 +2984,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpMode",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
Expand Down Expand Up @@ -3391,5 +3360,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}
7 changes: 2 additions & 5 deletions examples/rvc-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,8 @@ transition to mode 2", set the `RvcRunMode` to 0.

#### TC 3.2

PIXIT: `PIXIT_ENDPOINT:1`
Example command:
`./scripts/tests/run_python_test.py --script src/python_testing/TC_RVCCLEANM_3_2.py --script-args "--storage-path admin_storage.json --PICS examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt --int-arg PIXIT_ENDPOINT:1"`

When asked "Physically power cycle the device", do so.
This is not applicable because this RVC device does not support the
`StartUpMode` attribute.

### RVC Run Mode cluster

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Draft
<feature>Does the device implement the StartUpMode attribute?</feature>
<reference>89.2.2. Attributes - allclusters.html[pdf]</reference>
<status cond="RVCCLEANM.S">O</status>
<support>true</support>
<support>false</support>
</picsItem>
<picsItem>
<itemNumber>RVCCLEANM.S.A0003</itemNumber>
Expand Down
2 changes: 1 addition & 1 deletion examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
RVCCLEANM.S=1
RVCCLEANM.S.A0000=1
RVCCLEANM.S.A0001=1
RVCCLEANM.S.A0002=1
RVCCLEANM.S.A0002=0
RVCCLEANM.S.A0003=0
RVCCLEANM.S.C01.Tx=1
RVCCLEANM.S.C00.Rsp=1
Expand Down
2 changes: 0 additions & 2 deletions examples/rvc-app/rvc-common/rvc-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,6 @@ server cluster RvcCleanMode = 85 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute nullable int8u startUpMode = 2;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -1194,7 +1193,6 @@ endpoint 1 {
server cluster RvcCleanMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down
19 changes: 2 additions & 17 deletions examples/rvc-app/rvc-common/rvc-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2439,22 +2439,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpMode",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -2799,5 +2783,6 @@
"endpointId": 1,
"networkId": 0
}
]
],
"log": []
}

0 comments on commit cac610a

Please sign in to comment.