From b5dfe72508a27018af00520ac895f8e24c002385 Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Fri, 24 Nov 2023 10:50:23 -0500
Subject: [PATCH] RVC: Fix conformance (#30600)

- admin commissioning doesn't have the BCW feature, but had the
  command on - turned off command
- Identify cluster revision is now 4. It already included the
  v4 attribute, it was just the revision that was incorrect.
---
 examples/rvc-app/rvc-common/rvc-app.matter |  8 +-------
 examples/rvc-app/rvc-common/rvc-app.zap    | 10 +---------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index 03773df659e16b..2c565deef1c480 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -664,12 +664,7 @@ server cluster AdministratorCommissioning = 60 {
     octet_string<32> salt = 4;
   }
 
-  request struct OpenBasicCommissioningWindowRequest {
-    int16u commissioningTimeout = 0;
-  }
-
   timed command access(invoke: administer) OpenCommissioningWindow(OpenCommissioningWindowRequest): DefaultSuccess = 0;
-  timed command access(invoke: administer) OpenBasicCommissioningWindow(OpenBasicCommissioningWindowRequest): DefaultSuccess = 1;
   timed command access(invoke: administer) RevokeCommissioning(): DefaultSuccess = 2;
 }
 
@@ -1162,7 +1157,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 0x0001;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
@@ -1218,7 +1212,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList default = 0;
     ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 4;
 
     handle command Identify;
     handle command TriggerEffect;
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index a8453c00f44c68..e81e19248c72bb 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,
@@ -2095,7 +2087,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,