From c60928ef4f97770716e1e1c7c4d4378692b89500 Mon Sep 17 00:00:00 2001 From: William Hicklin Date: Mon, 5 Feb 2024 14:05:52 +0000 Subject: [PATCH 1/5] Updated the rvc-app readme. --- examples/rvc-app/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/rvc-app/README.md b/examples/rvc-app/README.md index 07aa619ca33318..2943f54103f828 100644 --- 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. From 08f2cce32634cc3ed7933d55376855f4b29e0643 Mon Sep 17 00:00:00 2001 From: William Hicklin Date: Mon, 5 Feb 2024 14:37:02 +0000 Subject: [PATCH 2/5] Removed PIXIT settings from the rvc-app-pics values. --- examples/rvc-app/rvc-common/pics/rvc-app-pics-values | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/rvc-app/rvc-common/pics/rvc-app-pics-values b/examples/rvc-app/rvc-common/pics/rvc-app-pics-values index 60ccab07c06cdd..6b094132ed5c22 100644 --- a/examples/rvc-app/rvc-common/pics/rvc-app-pics-values +++ b/examples/rvc-app/rvc-common/pics/rvc-app-pics-values @@ -5,8 +5,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 @@ -49,5 +47,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 \ No newline at end of file From 3a4321b629d123bd76988a0ee9a068a6aa1d7aae Mon Sep 17 00:00:00 2001 From: William Hicklin Date: Mon, 5 Feb 2024 15:50:42 +0000 Subject: [PATCH 3/5] Excluded all binary files from the lint check for %zu. --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 67c9fe25cbdac3..b98045b772a3cf 100644 --- 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 From 0ece58db85cb86f9b1fddc46eb9215a22c342a16 Mon Sep 17 00:00:00 2001 From: William Hicklin Date: Wed, 7 Feb 2024 10:29:58 +0000 Subject: [PATCH 4/5] Re-removed the OpenBasicCommissioningWindow command of the Administrator Commissioning cluster in the rvc-app due to security concerns. --- examples/rvc-app/rvc-common/rvc-app.zap | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap index 73009595c4bf99..95baba55bc5986 100644 --- 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, From ebb88936a05283ef1a1699a0554d25676de445bc Mon Sep 17 00:00:00 2001 From: William Hicklin Date: Wed, 7 Feb 2024 10:42:41 +0000 Subject: [PATCH 5/5] Updated the rvc-app .matter file. --- examples/rvc-app/rvc-common/rvc-app.matter | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index 2bbc7803f4be1b..4a44e74f963301 100644 --- 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; }