Add README and fix migration issues for RelativeHumidityMeasurement cluster

Elen777300 · Elen777300 · commit 4ab260943663 · 2026-04-10T13:07:14.000+04:00
diff --git a/examples/air-purifier-app/air-purifier-common/include/relative-humidity-sensor-manager.h b/examples/air-purifier-app/air-purifier-common/include/relative-humidity-sensor-manager.h
@@ -30,12 +30,7 @@ class RelativeHumiditySensorManager
 public:
     RelativeHumiditySensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId){};
 
-    void Init()
-    {
-        ReturnAndLogOnFailure(RelativeHumidityMeasurement::SetMeasuredValueRange(mEndpointId, DataModel::MakeNullable(uint16_t(0)),
-                                                                                 DataModel::MakeNullable(uint16_t(10000))),
-                              NotSpecified, "Failed to set RelativeHumidityMeasurement min/max range");
-    };
+    void Init() {};
 
     void OnHumidityChangeHandler(uint16_t newValue)
     {
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/include/relative-humidity-sensor-manager.h b/examples/air-quality-sensor-app/air-quality-sensor-common/include/relative-humidity-sensor-manager.h
@@ -10,14 +10,7 @@ namespace Clusters {
 class RelativeHumiditySensorManager
 {
 public:
-    RelativeHumiditySensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId)
-    {
-        CHIP_ERROR err = RelativeHumidityMeasurement::SetMeasuredValueRange(mEndpointId, DataModel::MakeNullable<uint16_t>(0),
-                                                                            DataModel::MakeNullable<uint16_t>(100));
-        VerifyOrReturn(CHIP_NO_ERROR == err,
-                       ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement min/max range: %" CHIP_ERROR_FORMAT,
-                                    err.Format()));
-    };
+    RelativeHumiditySensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId) {};
 
     void OnHumidityChangeHandler(uint16_t newValue)
     {
diff --git a/src/app/clusters/relative-humidity-measurement-server/CodegenIntegration.cpp b/src/app/clusters/relative-humidity-measurement-server/CodegenIntegration.cpp
@@ -43,43 +43,40 @@ class IntegrationDelegate : public CodegenClusterIntegration::Delegate
     ServerClusterRegistration & CreateRegistration(EndpointId endpointId, unsigned clusterInstanceIndex,
                                                    uint32_t optionalAttributeBits, uint32_t featureMap) override
     {
-        RelativeHumidityMeasurementCluster::OptionalAttributeSet optionalAttributeSet(optionalAttributeBits);
         using namespace chip::Protocols::InteractionModel;
 
         // Read default values from the Ember attribute store. Not all apps set
         // defaults, so failure is tolerated.
-        DataModel::Nullable<uint16_t> minMeasuredValue{};
-        if (MinMeasuredValue::Get(endpointId, minMeasuredValue) != Status::Success)
+        RelativeHumidityMeasurementCluster::Config config;
+
+        if (MinMeasuredValue::Get(endpointId, config.minMeasuredValue) != Status::Success)
         {
-            minMeasuredValue.SetNull();
+            config.minMeasuredValue.SetNull();
         }
 
-        DataModel::Nullable<uint16_t> maxMeasuredValue{};
-        if (MaxMeasuredValue::Get(endpointId, maxMeasuredValue) != Status::Success)
+        if (MaxMeasuredValue::Get(endpointId, config.maxMeasuredValue) != Status::Success)
         {
-            maxMeasuredValue.SetNull();
+            config.maxMeasuredValue.SetNull();
         }
 
         // If both values are non-null but form an invalid range (e.g. ZAP defaults of 0/0),
         // treat both as null rather than crashing.
-        if (!minMeasuredValue.IsNull() && !maxMeasuredValue.IsNull() && maxMeasuredValue.Value() < minMeasuredValue.Value() + 1)
+        if (!config.minMeasuredValue.IsNull() && !config.maxMeasuredValue.IsNull() &&
+            config.maxMeasuredValue.Value() < config.minMeasuredValue.Value() + 1)
         {
-            minMeasuredValue.SetNull();
-            maxMeasuredValue.SetNull();
+            config.minMeasuredValue.SetNull();
+            config.maxMeasuredValue.SetNull();
         }
 
-        uint16_t tolerance{};
+        RelativeHumidityMeasurementCluster::OptionalAttributeSet optionalAttributeSet(optionalAttributeBits);
         if (optionalAttributeSet.IsSet(Tolerance::Id))
         {
+            uint16_t tolerance{};
             VerifyOrDie(Tolerance::Get(endpointId, &tolerance) == Status::Success);
+            config.WithTolerance(tolerance);
         }
 
-        gServers[clusterInstanceIndex].Create(endpointId, optionalAttributeSet,
-                                              RelativeHumidityMeasurementCluster::StartupConfiguration{
-                                                  .minMeasuredValue = minMeasuredValue,
-                                                  .maxMeasuredValue = maxMeasuredValue,
-                                                  .tolerance        = tolerance,
-                                              });
+        gServers[clusterInstanceIndex].Create(endpointId, config);
         return gServers[clusterInstanceIndex].Registration();
     }
 
@@ -149,12 +146,5 @@ CHIP_ERROR SetMeasuredValue(EndpointId endpointId, DataModel::Nullable<uint16_t>
     return cluster->SetMeasuredValue(measuredValue);
 }
 
-CHIP_ERROR SetMeasuredValueRange(EndpointId endpointId, DataModel::Nullable<uint16_t> minMeasuredValue,
-                                 DataModel::Nullable<uint16_t> maxMeasuredValue)
-{
-    auto * cluster = FindClusterOnEndpoint(endpointId);
-    VerifyOrReturnError(cluster != nullptr, CHIP_ERROR_NOT_FOUND);
-    return cluster->SetMeasuredValueRange(minMeasuredValue, maxMeasuredValue);
-}
 
 } // namespace chip::app::Clusters::RelativeHumidityMeasurement
diff --git a/src/app/clusters/relative-humidity-measurement-server/CodegenIntegration.h b/src/app/clusters/relative-humidity-measurement-server/CodegenIntegration.h
@@ -28,8 +28,5 @@ RelativeHumidityMeasurementCluster * FindClusterOnEndpoint(EndpointId endpointId
 /// Convenience helper — pushes a new measured value to the cluster on the given endpoint.
 CHIP_ERROR SetMeasuredValue(EndpointId endpointId, DataModel::Nullable<uint16_t> measuredValue);
 
-/// Convenience helper — updates the min/max measured value range on the given endpoint.
-CHIP_ERROR SetMeasuredValueRange(EndpointId endpointId, DataModel::Nullable<uint16_t> minMeasuredValue,
-                                 DataModel::Nullable<uint16_t> maxMeasuredValue);
 
 } // namespace chip::app::Clusters::RelativeHumidityMeasurement
diff --git a/src/app/clusters/relative-humidity-measurement-server/README.md b/src/app/clusters/relative-humidity-measurement-server/README.md
@@ -0,0 +1,59 @@
+# Relative Humidity Measurement Cluster
+
+This cluster uses the code-driven approach. The Ember attribute accessors for
+`MeasuredValue`, `MinMeasuredValue`, `MaxMeasuredValue`, and `Tolerance` are no
+longer available.
+
+## Setting a new humidity reading
+
+### BEFORE (using Ember accessors)
+
+```cpp
+RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(endpointId, newValue);
+```
+
+### NOW (code-driven)
+
+```cpp
+CHIP_ERROR err = RelativeHumidityMeasurement::SetMeasuredValue(endpointId,
+                     DataModel::MakeNullable(uint16_t(newValue)));
+if (err != CHIP_NO_ERROR)
+{
+    // handle error
+}
+```
+
+## Configuring min/max range and tolerance
+
+`MinMeasuredValue`, `MaxMeasuredValue`, and `Tolerance` are fixed hardware
+characteristics. They are configured once at startup via the `Config` struct and
+cannot be changed at runtime.
+
+The default values are read from the ZAP-configured Ember attribute store at
+init time. If your app needs specific values, configure them in the ZAP file
+(`.zap`) for the endpoint.
+
+If you need to set them programmatically (e.g. in tests or for dynamic
+endpoints), pass a `Config` at construction time:
+
+```cpp
+// Min/max only
+RelativeHumidityMeasurementCluster::Config config;
+config.minMeasuredValue = DataModel::MakeNullable(uint16_t(0));
+config.maxMeasuredValue = DataModel::MakeNullable(uint16_t(10000));
+auto cluster = RelativeHumidityMeasurementCluster(endpointId, config);
+
+// With optional Tolerance attribute
+RelativeHumidityMeasurementCluster::Config config;
+config.minMeasuredValue = DataModel::MakeNullable(uint16_t(0));
+config.maxMeasuredValue = DataModel::MakeNullable(uint16_t(10000));
+config.WithTolerance(100);
+auto cluster = RelativeHumidityMeasurementCluster(endpointId, config);
+```
+
+### BEFORE (using Ember accessors)
+
+```cpp
+RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Set(endpointId, 0);
+RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Set(endpointId, 10000);
+```
diff --git a/src/app/clusters/relative-humidity-measurement-server/RelativeHumidityMeasurementCluster.cpp b/src/app/clusters/relative-humidity-measurement-server/RelativeHumidityMeasurementCluster.cpp
@@ -24,21 +24,37 @@ namespace chip::app::Clusters {
 
 using namespace RelativeHumidityMeasurement::Attributes;
 
-// Per the Matter spec (Relative Humidity Measurement cluster):
-// MinMeasuredValue is constrained to [0, 9999]
+// Spec-defined upper bound for MinMeasuredValue
 constexpr uint16_t kMinMeasuredValueMax = 9999;
-// Global ceiling for any measured humidity value (applies to MeasuredValue and MaxMeasuredValue)
+// Spec-defined upper bound for MeasuredValue and MaxMeasuredValue
 constexpr uint16_t kMeasuredValueMax = 10000;
+// Spec-defined upper bound for Tolerance
+constexpr uint16_t kMaxTolerance = 2048;
 
-RelativeHumidityMeasurementCluster::RelativeHumidityMeasurementCluster(EndpointId endpointId,
-                                                                       const OptionalAttributeSet & optionalAttributeSet,
-                                                                       const StartupConfiguration & config) :
+RelativeHumidityMeasurementCluster::RelativeHumidityMeasurementCluster(EndpointId endpointId, const Config & config) :
     DefaultServerCluster({ endpointId, RelativeHumidityMeasurement::Id }),
-    mOptionalAttributeSet(optionalAttributeSet)
+    mOptionalAttributeSet(config.mOptionalAttributeSet)
 {
+    if (!config.minMeasuredValue.IsNull())
+    {
+        VerifyOrDie(config.minMeasuredValue.Value() <= kMinMeasuredValueMax);
+
+        if (!config.maxMeasuredValue.IsNull())
+        {
+            VerifyOrDie(config.maxMeasuredValue.Value() >= config.minMeasuredValue.Value() + 1);
+        }
+    }
+
+    if (!config.maxMeasuredValue.IsNull())
+    {
+        VerifyOrDie(config.maxMeasuredValue.Value() <= kMeasuredValueMax);
+    }
+
+    VerifyOrDie(!mOptionalAttributeSet.IsSet(Tolerance::Id) || config.mTolerance <= kMaxTolerance);
+
     mMinMeasuredValue = config.minMeasuredValue;
     mMaxMeasuredValue = config.maxMeasuredValue;
-    mTolerance        = config.tolerance;
+    mTolerance        = config.mTolerance;
 }
 
 DataModel::ActionReturnStatus RelativeHumidityMeasurementCluster::ReadAttribute(const DataModel::ReadAttributeRequest & request,
@@ -96,27 +112,4 @@ CHIP_ERROR RelativeHumidityMeasurementCluster::SetMeasuredValue(DataModel::Nulla
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR RelativeHumidityMeasurementCluster::SetMeasuredValueRange(DataModel::Nullable<uint16_t> minMeasuredValue,
-                                                                     DataModel::Nullable<uint16_t> maxMeasuredValue)
-{
-    if (!minMeasuredValue.IsNull())
-    {
-        VerifyOrReturnError(minMeasuredValue.Value() <= kMinMeasuredValueMax, CHIP_IM_GLOBAL_STATUS(ConstraintError));
-
-        if (!maxMeasuredValue.IsNull())
-        {
-            VerifyOrReturnError(maxMeasuredValue.Value() >= minMeasuredValue.Value() + 1, CHIP_IM_GLOBAL_STATUS(ConstraintError));
-        }
-    }
-
-    if (!maxMeasuredValue.IsNull())
-    {
-        VerifyOrReturnError(maxMeasuredValue.Value() <= kMeasuredValueMax, CHIP_IM_GLOBAL_STATUS(ConstraintError));
-    }
-
-    SetAttributeValue(mMinMeasuredValue, minMeasuredValue, MinMeasuredValue::Id);
-    SetAttributeValue(mMaxMeasuredValue, maxMeasuredValue, MaxMeasuredValue::Id);
-    return CHIP_NO_ERROR;
-}
-
 } // namespace chip::app::Clusters
diff --git a/src/app/clusters/relative-humidity-measurement-server/RelativeHumidityMeasurementCluster.h b/src/app/clusters/relative-humidity-measurement-server/RelativeHumidityMeasurementCluster.h
@@ -24,30 +24,47 @@
 
 namespace chip::app::Clusters {
 
-class RelativeHumidityMeasurementCluster : public DefaultServerCluster
+class RelativeHumidityMeasurementCluster;
+
+// Fixed configuration for RelativeHumidityMeasurementCluster. MinMeasuredValue,
+// MaxMeasuredValue, and Tolerance reflect hardware characteristics and do not
+// change at runtime. Use WithTolerance() to enable the optional Tolerance
+// attribute — this ensures both the value and the attribute presence flag are
+// always set together.
+class RelativeHumidityMeasurementConfig
 {
 public:
-    using OptionalAttributeSet = app::OptionalAttributeSet<RelativeHumidityMeasurement::Attributes::Tolerance::Id>;
+    DataModel::Nullable<uint16_t> minMeasuredValue{};
+    DataModel::Nullable<uint16_t> maxMeasuredValue{};
 
-    struct StartupConfiguration
+    RelativeHumidityMeasurementConfig & WithTolerance(uint16_t value)
     {
-        DataModel::Nullable<uint16_t> minMeasuredValue{};
-        DataModel::Nullable<uint16_t> maxMeasuredValue{};
-        uint16_t tolerance{};
-    };
+        mTolerance = value;
+        mOptionalAttributeSet.template Set<RelativeHumidityMeasurement::Attributes::Tolerance::Id>();
+        return *this;
+    }
+
+private:
+    friend class RelativeHumidityMeasurementCluster;
+    app::OptionalAttributeSet<RelativeHumidityMeasurement::Attributes::Tolerance::Id> mOptionalAttributeSet{};
+    uint16_t mTolerance{};
+};
+
+class RelativeHumidityMeasurementCluster : public DefaultServerCluster
+{
+public:
+    using OptionalAttributeSet = app::OptionalAttributeSet<RelativeHumidityMeasurement::Attributes::Tolerance::Id>;
+    using Config               = RelativeHumidityMeasurementConfig;
 
-    RelativeHumidityMeasurementCluster(EndpointId endpointId, const OptionalAttributeSet & optionalAttributeSet,
-                                       const StartupConfiguration & config);
+    RelativeHumidityMeasurementCluster(EndpointId endpointId, const Config & config = {});
 
     // ServerClusterInterface implementation
     DataModel::ActionReturnStatus ReadAttribute(const DataModel::ReadAttributeRequest & request,
                                                 AttributeValueEncoder & encoder) override;
     CHIP_ERROR Attributes(const ConcreteClusterPath & path, ReadOnlyBufferBuilder<DataModel::AttributeEntry> & builder) override;
 
-    // Setters — intended for application use to push new sensor readings
+    // Setter — intended for application use to push new sensor readings
     CHIP_ERROR SetMeasuredValue(DataModel::Nullable<uint16_t> measuredValue);
-    CHIP_ERROR SetMeasuredValueRange(DataModel::Nullable<uint16_t> minMeasuredValue,
-                                     DataModel::Nullable<uint16_t> maxMeasuredValue);
 
     // Getters
     DataModel::Nullable<uint16_t> GetMeasuredValue() const { return mMeasuredValue; }
diff --git a/src/app/clusters/relative-humidity-measurement-server/tests/TestRelativeHumidityMeasurementCluster.cpp b/src/app/clusters/relative-humidity-measurement-server/tests/TestRelativeHumidityMeasurementCluster.cpp
