Update rvc app integrate service area

examples/rvc-app/rvc-common/include/rvc-device.h

@@ -59,6 +59,11 @@ class RvcDevice
         mOperationalStateDelegate.SetPauseCallback(&RvcDevice::HandleOpStatePauseCallback, this);
         mOperationalStateDelegate.SetResumeCallback(&RvcDevice::HandleOpStateResumeCallback, this);
         mOperationalStateDelegate.SetGoHomeCallback(&RvcDevice::HandleOpStateGoHomeCallback, this);
+
+        mServiceAreaDelegate.SetIsSetSelectedAreasAllowedCallback(&RvcDevice::SaIsSetSelectedAreasAllowed, this);
+        mServiceAreaDelegate.SetHandleSkipCurrentAreaCallback(&RvcDevice::SaHandleSkipCurrentArea, this);
+        mServiceAreaDelegate.SetIsSupportedAreasChangeAllowedCallback(&RvcDevice::SaIsSupportedAreasChangeAllowed, this);
+        mServiceAreaDelegate.SetIsSupportedMapChangeAllowedCallback(&RvcDevice::SaIsSupportedMapChangeAllowed, this);
     }
 
     /**
@@ -97,6 +102,14 @@ class RvcDevice
      */
     void HandleOpStateGoHomeCallback(Clusters::OperationalState::GenericOperationalError & err);
 
+    bool SaIsSetSelectedAreasAllowed(MutableCharSpan statusText);
+
+    bool SaHandleSkipCurrentArea(uint32_t skippedArea, MutableCharSpan skipStatusText);
+
+    bool SaIsSupportedAreasChangeAllowed();
+
+    bool SaIsSupportedMapChangeAllowed();
+
     /**
      * Updates the state machine when the device becomes fully-charged.
      */

examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h

@@ -29,6 +29,12 @@ namespace Clusters {
 
 class RvcDevice;
 
+typedef bool (RvcDevice::*IsSetSelectedAreasAllowedCallback)(MutableCharSpan statusText);
+typedef bool (RvcDevice::*IsValidSelectAreasSetCallback)(const ServiceArea::Commands::SelectAreas::DecodableType & req,
+                                                         ServiceArea::SelectAreasStatus & areaStatus, MutableCharSpan statusText);
+typedef bool (RvcDevice::*HandleSkipCurrentAreaCallback)(uint32_t skippedArea, MutableCharSpan skipStatusText);
+typedef bool (RvcDevice::*IsChangeAllowedSimpleCallback)();
+
 namespace ServiceArea {
 
 class RvcServiceAreaDelegate : public Delegate
@@ -40,32 +46,60 @@ class RvcServiceAreaDelegate : public Delegate
     std::vector<uint32_t> mSelectedAreas;
     std::vector<ServiceArea::Structs::ProgressStruct::Type> mProgressList;
 
+    RvcDevice * mIsSetSelectedAreasAllowedDeviceInstance;
+    IsSetSelectedAreasAllowedCallback mIsSetSelectedAreasAllowedCallback;
+    RvcDevice * mHandleSkipCurrentAreaDeviceInstance;
+    HandleSkipCurrentAreaCallback mHandleSkipCurrentAreaCallback;
+    RvcDevice * mIsSupportedAreasChangeAllowedDeviceInstance;
+    IsChangeAllowedSimpleCallback mIsSupportedAreasChangeAllowedCallback;
+    RvcDevice * mIsSupportedMapChangeAllowedDeviceInstance;
+    IsChangeAllowedSimpleCallback mIsSupportedMapChangeAllowedCallback;
+
+    // hardcoded values for SUPPORTED MAPS.
+    const uint32_t supportedMapId_XX = 3;
+    const uint32_t supportedMapId_YY = 245;
+
+    // hardcoded values for SUPPORTED AREAS.
+    const uint32_t supportedAreaID_A = 7;
+    const uint32_t supportedAreaID_B = 1234567;
+    const uint32_t supportedAreaID_C = 10050;
+    const uint32_t supportedAreaID_D = 0x88888888;
+
+    /**
+     * Set the SupportedMaps and SupportedAreas where the SupportedMaps is not null.
+     */
+    void SetMapTopology();
+
+    /**
+     * Set the SupportedMaps and SupportedAreas where the SupportedMaps is null.
+     */
+    void SetNoMapTopology();
+
 public:
     CHIP_ERROR Init() override;
 
     // command support
-    bool IsSetSelectedAreasAllowed(MutableCharSpan statusText) override;
+    bool IsSetSelectedAreasAllowed(MutableCharSpan & statusText) override;
 
     bool IsValidSelectAreasSet(const ServiceArea::Commands::SelectAreas::DecodableType & req,
-                               ServiceArea::SelectAreasStatus & locationStatus, MutableCharSpan statusText) override;
+                               ServiceArea::SelectAreasStatus & areaStatus, MutableCharSpan & statusText) override;
 
-    bool HandleSkipCurrentArea(uint32_t skippedArea, MutableCharSpan skipStatusText) override;
+    bool HandleSkipCurrentArea(uint32_t skippedArea, MutableCharSpan & skipStatusText) override;
 
     //*************************************************************************
-    // Supported Locations accessors
+    // Supported Areas accessors
 
     bool IsSupportedAreasChangeAllowed() override;
 
     uint32_t GetNumberOfSupportedAreas() override;
 
-    bool GetSupportedLocationByIndex(uint32_t listIndex, ServiceArea::AreaStructureWrapper & supportedLocation) override;
+    bool GetSupportedAreaByIndex(uint32_t listIndex, AreaStructureWrapper & supportedArea) override;
 
-    bool GetSupportedLocationById(uint32_t aAreaId, uint32_t & listIndex,
-                                  ServiceArea::AreaStructureWrapper & supportedLocation) override;
+    bool GetSupportedAreaById(uint32_t aAreaId, uint32_t & listIndex, AreaStructureWrapper & supportedArea) override;
 
-    bool AddSupportedLocation(const ServiceArea::AreaStructureWrapper & newArea, uint32_t & listIndex) override;
+    bool AddSupportedArea(const AreaStructureWrapper & newArea, uint32_t & listIndex) override;
 
-    bool ModifySupportedLocation(uint32_t listIndex, const ServiceArea::AreaStructureWrapper & modifiedLocation) override;
+    bool ModifySupportedArea(uint32_t listIndex, const AreaStructureWrapper & modifiedArea) override;
 
     bool ClearSupportedAreas() override;
 
@@ -87,15 +121,13 @@ class RvcServiceAreaDelegate : public Delegate
     bool ClearSupportedMaps() override;
 
     //*************************************************************************
-    // Selected Locations accessors
+    // Selected Areas accessors
 
     uint32_t GetNumberOfSelectedAreas() override;
 
-    bool GetSelectedLocationByIndex(uint32_t listIndex, uint32_t & selectedLocation) override;
-
-    // IsSelectedLocation() no override
+    bool GetSelectedAreaByIndex(uint32_t listIndex, uint32_t & selectedArea) override;
 
-    bool AddSelectedLocation(uint32_t aAreaId, uint32_t & listIndex) override;
+    bool AddSelectedArea(uint32_t aAreaId, uint32_t & listIndex) override;
 
     bool ClearSelectedAreas() override;
 
@@ -115,6 +147,33 @@ class RvcServiceAreaDelegate : public Delegate
                                const ServiceArea::Structs::ProgressStruct::Type & modifiedProgressElement) override;
 
     bool ClearProgress() override;
+
+    //*************************************************************************
+    // RVC device callback setters
+
+    void SetIsSetSelectedAreasAllowedCallback(IsSetSelectedAreasAllowedCallback callback, RvcDevice * instance)
+    {
+        mIsSetSelectedAreasAllowedCallback       = callback;
+        mIsSetSelectedAreasAllowedDeviceInstance = instance;
+    }
+
+    void SetHandleSkipCurrentAreaCallback(HandleSkipCurrentAreaCallback callback, RvcDevice * instance)
+    {
+        mHandleSkipCurrentAreaCallback       = callback;
+        mHandleSkipCurrentAreaDeviceInstance = instance;
+    }
+
+    void SetIsSupportedAreasChangeAllowedCallback(IsChangeAllowedSimpleCallback callback, RvcDevice * instance)
+    {
+        mIsSupportedAreasChangeAllowedCallback       = callback;
+        mIsSupportedAreasChangeAllowedDeviceInstance = instance;
+    }
+
+    void SetIsSupportedMapChangeAllowedCallback(IsChangeAllowedSimpleCallback callback, RvcDevice * instance)
+    {
+        mIsSupportedMapChangeAllowedCallback       = callback;
+        mIsSupportedMapChangeAllowedDeviceInstance = instance;
+    }
 };
 
 } // namespace ServiceArea

examples/rvc-app/rvc-common/src/rvc-device.cpp

@@ -161,6 +161,52 @@ void RvcDevice::HandleOpStateGoHomeCallback(Clusters::OperationalState::GenericO
     }
 }
 
+bool RvcDevice::SaIsSetSelectedAreasAllowed(MutableCharSpan statusText)
+{
+    if (mOperationalStateInstance.GetCurrentOperationalState() == to_underlying(OperationalState::OperationalStateEnum::kRunning))
+    {
+        CopyCharSpanToMutableCharSpan("cannot set the Selected Areas while the device is running"_span, statusText);
+        return false;
+    }
+    return true;
+}
+
+bool RvcDevice::SaHandleSkipCurrentArea(uint32_t skippedArea, MutableCharSpan skipStatusText)
+{
+    if (mServiceAreaInstance.GetCurrentArea() != skippedArea)
+    {
+        // This device only supports skipping the current location.
+        CopyCharSpanToMutableCharSpan("the skipped area does not match the current area"_span, skipStatusText);
+        return false;
+    }
+
+    // Call the device's skip command.
+    // if successful
+
+    if (!mServiceAreaInstance.HasFeature(ServiceArea::Feature::kProgressReporting) ||
+        mServiceAreaDelegate.GetNumberOfProgressElements() == 0)
+    {
+        // notting else to do since there is no progress data.
+        return true;
+    }
+
+    mServiceAreaInstance.SetProgressStatus(skippedArea, ServiceArea::OperationalStatusEnum::kSkipped);
+
+    return true;
+}
+
+bool RvcDevice::SaIsSupportedAreasChangeAllowed()
+{
+    return mOperationalStateInstance.GetCurrentOperationalState() !=
+        to_underlying(OperationalState::OperationalStateEnum::kRunning);
+}
+
+bool RvcDevice::SaIsSupportedMapChangeAllowed()
+{
+    return mOperationalStateInstance.GetCurrentOperationalState() !=
+        to_underlying(OperationalState::OperationalStateEnum::kRunning);
+}
+
 void RvcDevice::HandleChargedMessage()
 {
     if (mOperationalStateInstance.GetCurrentOperationalState() !=