Merge branch 'update_rvc_app' into enable_rvc_python_tests_to_run_in_ci

project-chip · Feb 7, 2024 · 5088469 · 5088469
2 parents eed8b06 + ebb8893
commit 5088469
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -118,7 +118,7 @@ jobs:
             - name: Check for use of %zu, which are not supported on some libcs.
               if: always()
               run: |
-                  git grep -n "%zu" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)examples/rvc-app/RVC_app_state_diagram.png' && exit 1 || exit 0
+                  git grep -I -n "%zu" -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
 
             # Comments like '{{! ... }}' should be used in zap files
             - name: Do not allow TODO in generated files

diff --git a/examples/rvc-app/README.md b/examples/rvc-app/README.md
@@ -55,7 +55,7 @@ Example command:
 
 PIXIT: `PIXIT.RVCCLEANM.MODE_CHANGE_FAIL:1 PIXIT.RVCCLEANM.MODE_CHANGE_OK:2`  
 Example command:
-`./scripts/tests/run_python_test.py --script src/python_testing/TC_RVCCLEANM_2_1.py --script-args "--storage-path admin_storage.json --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --int-arg PICS_SDK_CI_ONLY:1 PIXIT.RVCCLEANM.MODE_CHANGE_OK:1 PIXIT.RVCCLEANM.MODE_CHANGE_FAIL:2"`
+`./scripts/tests/run_python_test.py --script src/python_testing/TC_RVCCLEANM_2_1.py --script-args "--storage-path admin_storage.json --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --int-arg PIXIT.RVCCLEANM.MODE_CHANGE_FAIL:1 PIXIT.RVCCLEANM.MODE_CHANGE_OK:2"`
 
 When asked "Manually put the device in a state from which it will FAIL to
 transition to mode 1", set the `RvcRunMode` to 1.
@@ -81,7 +81,7 @@ Example command:
 
 PIXIT: `PIXIT.RVCRUNM.MODE_CHANGE_FAIL:2 PIXIT.RVCRUNM.MODE_CHANGE_OK:0`  
 Example command:
-`./scripts/tests/run_python_test.py --script src/python_testing/TC_RVCRUNM_2_1.py --script-args "--storage-path admin_storage.json --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --int-arg PICS_SDK_CI_ONLY:1 PIXIT.RVCRUNM.MODE_CHANGE_OK:0 PIXIT.RVCRUNM.MODE_CHANGE_FAIL:2"`
+`./scripts/tests/run_python_test.py --script src/python_testing/TC_RVCRUNM_2_1.py --script-args "--storage-path admin_storage.json --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --int-arg PIXIT.RVCRUNM.MODE_CHANGE_OK:0 PIXIT.RVCRUNM.MODE_CHANGE_FAIL:2"`
 
 When asked "Manually put the device in a state from which it will FAIL to
 transition to mode 2", set the `RvcRunMode` to 1.

diff --git a/examples/rvc-app/rvc-common/pics/rvc-app-pics-values b/examples/rvc-app/rvc-common/pics/rvc-app-pics-values
@@ -7,8 +7,6 @@ RVCCLEANM.S.C00.Rsp=1
 RVCCLEANM.S.C01.Tx=1
 RVCCLEANM.S.F00=0
 RVCCLEANM.S.M.CAN_TEST_MODE_FAILURE=1
-PIXIT.RVCCLEANM.MODE_CHANGE_FAIL=1
-PIXIT.RVCCLEANM.MODE_CHANGE_OK=1
 
 RVCOPSTATE.S=1
 RVCOPSTATE.S.A0000=1
@@ -51,5 +49,3 @@ RVCRUNM.S.C01.Tx=1
 RVCRUNM.S.F00=0
 RVCRUNM.S.M.CAN_TEST_MODE_FAILURE=1
 RVCRUNM.S.M.CAN_MANUALLY_CONTROLLED=1
-PIXIT.RVCRUNM.MODE_CHANGE_FAIL=1
-PIXIT.RVCRUNM.MODE_CHANGE_OK=1
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -1232,7 +1232,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 0x0001;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 

diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -1426,14 +1426,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -1502,7 +1494,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -1518,7 +1510,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -1534,7 +1526,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -1550,7 +1542,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,