Start new cycle when RVC Run Mode is changed from idle to cleaning/mapping

Author: sxb427

examples/chef/common/chef-rvc-mode-delegate.cpp

@@ -29,6 +29,11 @@ using ModeTagStructType = chip::app::Clusters::detail::Structs::ModeTagStruct::T
 
 #ifdef MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
 #include <chef-rvc-mode-delegate.h>
+
+#ifdef MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
+#include <chef-rvc-operational-state-delegate.h>
+#endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
+
 using namespace chip::app::Clusters::RvcRunMode;
 
 static std::unique_ptr<RvcRunModeDelegate> gRvcRunModeDelegate;
@@ -51,7 +56,35 @@ void RvcRunModeDelegate::HandleChangeToMode(uint8_t NewMode, ModeBase::Commands:
         return;
     }
 
+#ifdef MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
+    OperationalState::GenericOperationalError err(to_underlying(OperationalState::ErrorStateEnum::kNoError));
+    if (NewMode == RvcRunMode::ModeIdle)
+    {
+        if (currentMode != RvcRunMode::ModeIdle)
+        { // Stop existing cycle when going from cleaning/mapping to idle.
+            ChipLogProgress(DeviceLayer, "Stopping RVC cycle: %d", currentMode);
+            gRvcOperationalStateDelegate->HandleStopStateCallback(err);
+        }
+    }
+    else
+    {
+        if (currentMode == RvcRunMode::ModeIdle)
+        { // Start a new cycle when going from idle to clening/mapping.
+            ChipLogProgress(DeviceLayer, "Starting new RVC cycle: %d", NewMode);
+            gRvcOperationalStateDelegate->HandleStartStateCallback(err);
+        }
+    }
+    if (err.IsEqual(OperationalState::GenericOperationalError(to_underlying(OperationalState::ErrorStateEnum::kNoError))))
+    {
+        response.status = to_underlying(ModeBase::StatusCode::kSuccess);
+    }
+    else
+    {
+        response.status = to_underlying(ModeBase::StatusCode::kGenericFailure);
+    }
+#else
     response.status = to_underlying(ModeBase::StatusCode::kSuccess);
+#endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
 }
 
 CHIP_ERROR RvcRunModeDelegate::GetModeLabelByIndex(uint8_t modeIndex, chip::MutableCharSpan & label)
@@ -296,3 +329,4 @@ void emberAfRvcCleanModeClusterInitCallback(chip::EndpointId endpointId)
     gRvcCleanModeInstance->Init();
 }
 #endif // MATTER_DM_PLUGIN_RVC_CLEAN_MODE_SERVER
+

examples/chef/common/chef-rvc-operational-state-delegate.cpp

@@ -28,7 +28,7 @@ using namespace chip::app::Clusters::OperationalState;
 using namespace chip::app::Clusters::RvcOperationalState;
 using chip::Protocols::InteractionModel::Status;
 
-static std::unique_ptr<RvcOperationalStateDelegate> gRvcOperationalStateDelegate;
+std::unique_ptr<RvcOperationalStateDelegate> gRvcOperationalStateDelegate;
 static std::unique_ptr<RvcOperationalState::Instance> gRvcOperationalStateInstance;
 
 static void onOperationalStateTimerTick(System::Layer * systemLayer, void * data);
@@ -327,3 +327,4 @@ void emberAfRvcOperationalStateClusterInitCallback(chip::EndpointId endpointId)
     gRvcOperationalStateInstance->Init();
 }
 #endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
+

examples/chef/common/chef-rvc-operational-state-delegate.h

@@ -121,10 +121,13 @@ void Shutdown();
 } // namespace app
 } // namespace chip
 
+extern std::unique_ptr<chip::app::Clusters::RvcOperationalState::RvcOperationalStateDelegate> gRvcOperationalStateDelegate;
+
 chip::Protocols::InteractionModel::Status chefRvcOperationalStateWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
                                                                                const EmberAfAttributeMetadata * attributeMetadata,
                                                                                uint8_t * buffer);
 chip::Protocols::InteractionModel::Status chefRvcOperationalStateReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
                                                                               const EmberAfAttributeMetadata * attributeMetadata,
                                                                               uint8_t * buffer, uint16_t maxReadLength);
 #endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
+