Removed server handling of measured value and added allcluster command to simulate measured value

Author: ReneJosefsen

examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp

@@ -25,6 +25,7 @@
 #include <app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.h>
 #include <app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h>
 #include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
+#include <app/clusters/soil-measurement-server/soil-measurement-server.h>
 #include <app/clusters/switch-server/switch-server.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
@@ -555,6 +556,24 @@ void AllClustersAppCommandHandler::HandleCommand(intptr_t context)
     {
         SetRefrigeratorDoorStatusHandler(self->mJsonValue);
     }
+    else if (name == "SetSimulatedSoilMoisture")
+    {
+        uint8_t soilMoisture = static_cast<uint8_t>(self->mJsonValue["SoilMoistureValue"].asUInt());
+        EndpointId endpoint  = static_cast<EndpointId>(self->mJsonValue["EndpointId"].asUInt());
+
+        if (endpoint != 1)
+        {
+            ChipLogError(NotSpecified, "Invalid EndpointId to set Soil Moisture value.");
+        }
+        else if (soilMoisture < 0 || soilMoisture > 100)
+        {
+            ChipLogError(NotSpecified, "Invalid Soil Moisture value to set.");
+        }
+        else
+        {
+            self->OnSoilMoistureChange(endpoint, soilMoisture);
+        }
+    }
     else
     {
         ChipLogError(NotSpecified, "Unhandled command '%s': this should never happen", name.c_str());
@@ -917,6 +936,19 @@ void AllClustersAppCommandHandler::OnAirQualityChange(uint32_t aNewValue)
     }
 }
 
+void AllClustersAppCommandHandler::OnSoilMoistureChange(EndpointId endpointId, uint8_t soilMoisture)
+{
+    Protocols::InteractionModel::Status status =
+        SoilMeasurement::Attributes::SoilMoistureMeasuredValue::Set(endpointId, soilMoisture);
+    ChipLogDetail(NotSpecified, "Set Soil Moisture value to %u", soilMoisture);
+
+    if (status != Protocols::InteractionModel::Status::Success)
+    {
+        ChipLogDetail(NotSpecified, "Invalid value/endpoint to set.");
+        return;
+    }
+}
+
 void AllClustersAppCommandHandler::HandleSetOccupancyChange(EndpointId endpointId, uint8_t newOccupancyValue)
 {
     BitMask<chip::app::Clusters::OccupancySensing::OccupancyBitmap> currentOccupancy;

examples/all-clusters-app/linux/AllClustersCommandDelegate.h

@@ -101,6 +101,11 @@ class AllClustersAppCommandHandler
      */
     void OnAirQualityChange(uint32_t aEnum);
 
+    /**
+     * Should be called when it is necessary to change the measured moisture value.
+     */
+    void OnSoilMoistureChange(chip::EndpointId endpointId, uint8_t soilMoisture);
+
     /**
      * Should be called when it is necessary to change the operational state as a manual operation.
      */

src/app/clusters/soil-measurement-server/soil-measurement-server.cpp

@@ -52,7 +52,6 @@ CHIP_ERROR SoilMeasurementAttrAccess::Init()
     // Initialize the soil moisture measurement limits to default values
     for (auto & measurement : gMeasurements)
     {
-        measurement.soilMoistureMeasuredValue.SetNull();
         measurement.soilMoistureMeasurementLimits = { .measurementType  = MeasurementTypeEnum::kSoilMoisture,
                                                       .measured         = true,
                                                       .minMeasuredValue = 0,
@@ -80,12 +79,6 @@ CHIP_ERROR SoilMeasurementAttrAccess::Read(const ConcreteReadAttributePath & aPa
     case Attributes::SoilMoistureMeasurementLimits::Id: {
         return aEncoder.Encode(data->soilMoistureMeasurementLimits);
     }
-    case Attributes::SoilMoistureMeasuredValue::Id: {
-        return aEncoder.Encode(data->soilMoistureMeasuredValue);
-    }
-    case ClusterRevision::Id: {
-        return aEncoder.Encode(kClusterRevision);
-    }
     default: {
         break;
     }
@@ -111,18 +104,6 @@ MeasurementData * SoilMeasurementDataForEndpoint(EndpointId endpointId)
     return &gMeasurements[index];
 }
 
-CHIP_ERROR SetSoilMoistureMeasuredValue(EndpointId endpointId, const DataModel::Nullable<uint16_t> & soilMoistureMeasuredValue)
-{
-    MeasurementData * data = SoilMeasurementDataForEndpoint(endpointId);
-    VerifyOrReturnError(data != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
-
-    data->soilMoistureMeasuredValue = soilMoistureMeasuredValue;
-
-    MatterReportingAttributeChangeCallback(endpointId, SoilMeasurement::Id, SoilMoistureMeasuredValue::Id);
-
-    return CHIP_NO_ERROR;
-}
-
 // This function is intended for the application to set the soil measurement accuracy limits to the proper values during init.
 // Given the limits are fixed, it is not intended to be changes at runtime, hence why this function does not report the change.
 // The application should call this function only once during init.

src/app/clusters/soil-measurement-server/soil-measurement-server.h

@@ -33,11 +33,8 @@ namespace SoilMeasurement {
 struct MeasurementData
 {
     Structs::MeasurementAccuracyStruct::Type soilMoistureMeasurementLimits;
-    chip::app::DataModel::Nullable<uint16_t> soilMoistureMeasuredValue;
 };
 
-inline constexpr uint16_t kClusterRevision = 1;
-
 class SoilMeasurementAttrAccess : public AttributeAccessInterface
 {
 public:
@@ -54,7 +51,6 @@ class SoilMeasurementAttrAccess : public AttributeAccessInterface
 };
 
 CHIP_ERROR SetSoilMeasurementAccuracy(EndpointId endpointId, const Structs::MeasurementAccuracyStruct::Type & accuracy);
-CHIP_ERROR SetSoilMoistureMeasuredValue(EndpointId endpointId, const DataModel::Nullable<uint16_t> & soilMoistureMeasuredValue);
 
 MeasurementData * SoilMeasurementDataForEndpoint(EndpointId endpointId);