Update following change in the support for the StartUpMode attribute …

…for the RVC device type (#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 <commits@restyled.io>
project-chip · Oct 19, 2023 · 16a7378 · 16a7378
1 parent 9f37258
commit 16a7378
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 63 deletions.
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -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;
@@ -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;
@@ -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;
@@ -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;

diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -2266,6 +2266,7 @@
  "define": "SCENES_CLUSTER",
  "side": "server",
  "enabled": 1,
+ "apiMaturity": "provisional",
  "commands": [
  {
  "name": "AddScene",
@@ -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,
@@ -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,
@@ -3391,5 +3360,6 @@
  "endpointId": 1,
  "networkId": 0
  }
- ]
+ ],
+ "log": []
 }
diff --git a/examples/rvc-app/README.md b/examples/rvc-app/README.md
@@ -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
 

diff --git a/examples/rvc-app/rvc-common/pics/RVC Clean Mode Cluster Test Plan.xml b/examples/rvc-app/rvc-common/pics/RVC Clean Mode Cluster Test Plan.xml
@@ -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>

diff --git a/examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt b/examples/rvc-app/rvc-common/pics/RVC_App_Test_Plan.txt
@@ -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

diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -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;
@@ -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;

diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -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,
@@ -2799,5 +2783,6 @@
  "endpointId": 1,
  "networkId": 0
  }
- ]
+ ],
+ "log": []
 }