From 529032952f10fe4ed7f5c6567578f4f6a56bcbe8 Mon Sep 17 00:00:00 2001
From: erwinpan1 <erwinpan1@gmail.com>
Date: Thu, 11 Jan 2024 10:15:28 +0800
Subject: [PATCH] Fix Chef RVC compilation failure

---
 .../chef-rvc-operational-state-delegate.cpp      |  6 +++---
 ...otnode_roboticvacuumcleaner_1807ff0c49.matter |  2 ++
 .../rootnode_roboticvacuumcleaner_1807ff0c49.zap | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/examples/chef/common/chef-rvc-operational-state-delegate.cpp b/examples/chef/common/chef-rvc-operational-state-delegate.cpp
index 9e376567b10f48..e0a8c1d332ee40 100644
--- a/examples/chef/common/chef-rvc-operational-state-delegate.cpp
+++ b/examples/chef/common/chef-rvc-operational-state-delegate.cpp
@@ -128,7 +128,7 @@ void emberAfOperationalStateClusterInitCallback(chip::EndpointId endpointId)
 
     gOperationalStateDelegate           = new OperationalStateDelegate;
     EndpointId operationalStateEndpoint = 0x01;
-    gOperationalStateInstance = new Instance(gOperationalStateDelegate, operationalStateEndpoint, Clusters::OperationalState::Id);
+    gOperationalStateInstance = new OperationalState::Instance(gOperationalStateDelegate, operationalStateEndpoint);
 
     gOperationalStateInstance->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped));
 
@@ -137,7 +137,7 @@ void emberAfOperationalStateClusterInitCallback(chip::EndpointId endpointId)
 
 // Init RVC Operational State cluster
 
-static OperationalState::Instance * gRvcOperationalStateInstance  = nullptr;
+static RvcOperationalState::Instance * gRvcOperationalStateInstance  = nullptr;
 static RvcOperationalStateDelegate * gRvcOperationalStateDelegate = nullptr;
 
 void RvcOperationalState::Shutdown()
@@ -162,7 +162,7 @@ void emberAfRvcOperationalStateClusterInitCallback(chip::EndpointId endpointId)
     gRvcOperationalStateDelegate        = new RvcOperationalStateDelegate;
     EndpointId operationalStateEndpoint = 0x01;
     gRvcOperationalStateInstance =
-        new Instance(gRvcOperationalStateDelegate, operationalStateEndpoint, Clusters::RvcOperationalState::Id);
+        new RvcOperationalState::Instance(gRvcOperationalStateDelegate, operationalStateEndpoint);
 
     gRvcOperationalStateInstance->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped));
 
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index ddc12bda428fcb..fb79f75aa6244a 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -1451,6 +1451,8 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
 
     handle command Pause;
+    handle command Stop;
+    handle command Start;
     handle command Resume;
     handle command OperationalCommandResponse;
   }
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 8c2a294fa04525..c186be39575abf 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -2837,6 +2837,22 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
+            {
+              "name": "Stop",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "Start",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
             {
               "name": "Resume",
               "code": 3,