Add setting Features in Meter Indetification cluster

Author: Michail-Antropov

examples/all-clusters-app/all-clusters-common/src/meter-identification-stub.cpp

@@ -25,6 +25,7 @@ using Feature = chip::app::Clusters::MeterIdentification::Feature;
 
 static std::unique_ptr<MeterIdentificationDelegate> gMIDelegate;
 static std::unique_ptr<MeterIdentificationInstance> gMIInstance;
+static BitMask<Feature> gMIFeature = BitMask<Feature, uint32_t>(Feature::kPowerThreshold);
 
 void emberAfMeterIdentificationClusterInitCallback(chip::EndpointId endpointId)
 {
@@ -39,7 +40,7 @@ void emberAfMeterIdentificationClusterInitCallback(chip::EndpointId endpointId)
         gMIDelegate->Init();
 
         gMIInstance = std::make_unique<MeterIdentificationInstance>(endpointId, *gMIDelegate,
-                                                                    BitMask<Feature, uint32_t>(Feature::kPowerThreshold));
+                                                                    gMIFeature);
 
         gMIInstance->Init();
     }
@@ -49,3 +50,18 @@ MeterIdentificationDelegate * chip::app::Clusters::MeterIdentification::GetDeleg
 {
     return &(*gMIDelegate);
 }
+
+namespace chip::app::Clusters::MeterIdentification {
+
+void RestartServer(uint32_t features)
+{
+    gMIFeature = static_cast<BitMask<Feature>>(features);
+
+    VerifyOrDie(gMIInstance);
+    gMIInstance.reset();
+
+    gMIInstance = std::make_unique<MeterIdentificationInstance>(1, *gMIDelegate, gMIFeature);
+    gMIInstance->Init();
+}
+
+}

examples/energy-management-app/energy-management-common/include/MeterIdentificationDelegate.h

@@ -41,22 +41,22 @@ class MeterIdentificationDelegate : public MeterIdentification::Delegate
     DataModel::Nullable<MeterTypeEnum> GetMeterType() override { return mMeterType; };
     DataModel::Nullable<CharSpan> GetUtilityName() override { return mUtilityName; };
     DataModel::Nullable<CharSpan> GetPointOfDelivery() override { return mPointOfDelivery; };
-    DataModel::Nullable<uint64_t> GetPowerThreshold() override { return mPowerThreshold; };
+    DataModel::Nullable<int64_t> GetPowerThreshold() override { return mPowerThreshold; };
     DataModel::Nullable<PowerThresholdSourceEnum> GetPowerThresholdSource() override { return mPowerThresholdSource; };
 
     // Internal Application API to set attribute values
     CHIP_ERROR SetMeterType(DataModel::Nullable<MeterTypeEnum>);
     CHIP_ERROR SetUtilityName(DataModel::Nullable<CharSpan> value);
     CHIP_ERROR SetPointOfDelivery(DataModel::Nullable<CharSpan> value);
-    CHIP_ERROR SetPowerThreshold(DataModel::Nullable<uint64_t>);
+    CHIP_ERROR SetPowerThreshold(DataModel::Nullable<int64_t>);
     CHIP_ERROR SetPowerThresholdSource(DataModel::Nullable<PowerThresholdSourceEnum>);
 
 private:
     // Attribute storage
     DataModel::Nullable<MeterTypeEnum> mMeterType;
     DataModel::Nullable<CharSpan> mUtilityName;
     DataModel::Nullable<CharSpan> mPointOfDelivery;
-    DataModel::Nullable<uint64_t> mPowerThreshold;
+    DataModel::Nullable<int64_t> mPowerThreshold;
     DataModel::Nullable<PowerThresholdSourceEnum> mPowerThresholdSource;
 };
 

examples/energy-management-app/energy-management-common/src/MeterIdentificationDelegate.cpp

@@ -34,6 +34,10 @@ using chip::app::Clusters::MeterIdentification::PowerThresholdSourceEnum;
 constexpr size_t kUtilityNameSize = 16;
 constexpr size_t kPointOfDeliverySize = 16;
 
+namespace chip::app::Clusters::MeterIdentification {
+    void RestartServer(uint32_t features);
+}
+
 CHIP_ERROR MeterIdentificationInstance::Init()
 {
     return Instance::Init();
@@ -74,6 +78,16 @@ CHIP_ERROR MeterIdentificationDelegate::LoadJson(Json::Value & root)
 {
     Json::Value value;
 
+    if (root.isMember("Features"))
+    {
+        value = root.get("Features", Json::Value());
+        if (value.isUInt() && value.asUInt() <= 0x01)
+        {
+            RestartServer(value.asUInt());
+            return CHIP_NO_ERROR;
+        }
+    }
+
     if (root.isMember("MeterType"))
     {
         value = root.get("MeterType", Json::Value());
@@ -86,7 +100,7 @@ CHIP_ERROR MeterIdentificationDelegate::LoadJson(Json::Value & root)
             SetMeterType(std::nullopt);
         }
     }
-
+ 
     if (root.isMember("UtilityName"))
     {
         value = root.get("UtilityName", Json::Value());
@@ -209,7 +223,7 @@ CHIP_ERROR MeterIdentificationDelegate::SetPointOfDelivery(DataModel::Nullable<C
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR MeterIdentificationDelegate::SetPowerThreshold(DataModel::Nullable<uint64_t> newValue)
+CHIP_ERROR MeterIdentificationDelegate::SetPowerThreshold(DataModel::Nullable<int64_t> newValue)
 {
     // DataModel::Nullable<uint64_t> oldValue = mPowerThreshold;
 

src/app/clusters/energy-calendar-server/energy-calendar-server.cpp

@@ -521,12 +521,12 @@ CHIP_ERROR EnergyCalendarServer::Read(const ConcreteReadAttributePath & aPath, A
         if (feature.Has(Feature::kPeakPeriod))
             return aEncoder.Encode(provider->GetCurrentPeakPeriod());
         else
-            return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
+            return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
     case NextPeakPeriod::Id:
         if (feature.Has(Feature::kPeakPeriod))
             return aEncoder.Encode(provider->GetNextPeakPeriod());
         else
-            return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
+            return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
     /* FeatureMap - is held locally */
     case FeatureMap::Id:
         return aEncoder.Encode(feature);

src/app/clusters/meter-identification-server/meter-identification-server.cpp

@@ -84,11 +84,17 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
         break;
 
     case PowerThreshold::Id:
-        ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerThreshold()));
+        if (HasFeature(Feature::kPowerThreshold))
+            ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerThreshold()));
+        else
+            return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
         break;
 
     case PowerThresholdSource::Id:
-        ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerThresholdSource()));
+        if (HasFeature(Feature::kPowerThreshold))
+            ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerThresholdSource()));
+        else
+            return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
         break;
     }
     return CHIP_NO_ERROR;

src/app/clusters/meter-identification-server/meter-identification-server.h

@@ -46,7 +46,7 @@ struct Delegate
     virtual DataModel::Nullable<MeterTypeEnum> GetMeterType()                       = 0;
     virtual DataModel::Nullable<CharSpan> GetUtilityName()                          = 0;
     virtual DataModel::Nullable<CharSpan> GetPointOfDelivery()                      = 0;
-    virtual DataModel::Nullable<uint64_t> GetPowerThreshold()                       = 0;
+    virtual DataModel::Nullable<int64_t> GetPowerThreshold()                        = 0;
     virtual DataModel::Nullable<PowerThresholdSourceEnum> GetPowerThresholdSource() = 0;
 
 protected: