[Pump] Add feature map support

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -2496,6 +2496,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

@@ -2149,6 +2149,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;

examples/placeholder/linux/apps/app1/config.matter

@@ -1668,6 +1668,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;

examples/placeholder/linux/apps/app2/config.matter

@@ -1668,6 +1668,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;

examples/pump-app/pump-common/pump-app.matter

@@ -1105,6 +1105,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
@@ -1498,8 +1508,8 @@ endpoint 1 {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute featureMap default = 31;
+    ram      attribute clusterRevision default = 4;
   }
 
   server cluster TemperatureMeasurement {

examples/pump-app/pump-common/pump-app.zap

@@ -1,5 +1,5 @@
 {
-  "featureLevel": 81,
+  "featureLevel": 87,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -6207,7 +6207,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap8",
+              "type": "LevelControlOptions",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7150,7 +7150,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "31",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7166,7 +7166,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7914,5 +7914,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 771
     }
-  ]
+  ],
+  "log": []
 }

examples/pump-controller-app/pump-controller-common/pump-controller-app.matter

@@ -1004,6 +1004,16 @@ client cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;

src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp

@@ -68,7 +68,7 @@ static RemoteSensorType detectRemoteSensorConnected()
     return RemoteSensorType::kNoSensor;
 }
 
-static void updateAttributeLinks(EndpointId endpoint)
+static void setEffectiveOperationAndControlMode(EndpointId endpoint)
 {
     PumpControlMode controlMode;
     PumpOperationMode operationMode;
@@ -271,80 +271,20 @@ CHIP_ERROR PumpConfigurationAndControlAttrAccess::Write(const ConcreteDataAttrib
 }
 } // namespace
 
-// SDK Callbacks
-
-template <typename T1, typename T2>
-bool IsFeatureSupported(EndpointId endpoint, EmberAfStatus (*getFn1)(chip::EndpointId endpointId, T1 & value),
-                        EmberAfStatus (*getFn2)(chip::EndpointId endpointId, T2 & value))
+bool PumpHasFeature(EndpointId endpoint, PumpFeature feature)
 {
-    EmberAfStatus status;
-
-    T1 value1;
-    T2 value2;
-
-    status = getFn1(endpoint, value1);
-    if (status == EMBER_ZCL_STATUS_SUCCESS)
-    {
-        if (!value1.IsNull())
-        {
-            status = getFn2(endpoint, value2);
-            if (status == EMBER_ZCL_STATUS_SUCCESS)
-            {
-                if (!value2.IsNull())
-                {
-                    return true;
-                }
-            }
-        }
-    }
+    bool hasFeature;
+    uint32_t featureMap;
+    hasFeature = (Attributes::FeatureMap::Get(endpoint, &featureMap) == EMBER_ZCL_STATUS_SUCCESS);
 
-    return false;
+    return hasFeature ? ((featureMap & to_underlying(feature)) != 0) : false;
 }
 
-template <typename T1, typename T2>
-const char * FeatureSupportedDebugString(EndpointId endpoint, EmberAfStatus (*getFn1)(chip::EndpointId endpointId, T1 & value),
-                                         EmberAfStatus (*getFn2)(chip::EndpointId endpointId, T2 & value))
-{
-    return IsFeatureSupported(endpoint, getFn1, getFn2) ? "Supported" : "Not Supported";
-}
+// SDK Callbacks
 
 void emberAfPumpConfigurationAndControlClusterServerInitCallback(EndpointId endpoint)
 {
     emberAfDebugPrintln("Initialize PCC Server Cluster [EP:%d]", endpoint);
-
-    // Determine the internal feature set of the pump, depending on the pump
-    // specific attributes available, and their values. This is a temporary
-    // implementation to get a kind of "pseudo-FeatureMap" until we get a real
-    // FeatureMap implementation in the PCC cluster. If an attribute is
-    // present/available, then there is a possibility for the associated
-    // feature being present as well. But we will have to distinguis between
-    // the attributes being available and null also. At this point (init)
-    // we can only examine the list of attributes available, and then detect
-    // if they each have a NonNull value. Later on, when the pump application
-    // has finished its init process, it might setup these attributevalues
-    // to something NonNull, and then we must re-calcualte the feature set.
-
-    emberAfDebugPrintln(
-        "Constant Pressure %s",
-        FeatureSupportedDebugString(endpoint, Attributes::MinConstPressure::Get, Attributes::MaxConstPressure::Get));
-    emberAfDebugPrintln("PCC Server: Constant Proportional Pressure %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinCompPressure::Get, Attributes::MaxCompPressure::Get));
-    emberAfDebugPrintln("PCC Server: Constant Flow %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinConstFlow::Get, Attributes::MaxConstFlow::Get));
-    emberAfDebugPrintln("PCC Server: Constant Temperature %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinConstTemp::Get, Attributes::MaxConstTemp::Get));
-    emberAfDebugPrintln("PCC Server: Constant Speed %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get));
-
-    if (!emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::ControlMode::Id))
-    {
-        emberAfDebugPrintln("PCC Server: ControlMode attribute not available");
-    }
-
-    if (!emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::PumpStatus::Id))
-    {
-        emberAfDebugPrintln("PCC Server: PumpStatus attribute not available");
-    }
 }
 
 chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClusterServerPreAttributeChangedCallback(
@@ -365,38 +305,40 @@ chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClust
         switch (controlMode)
         {
         case PumpControlMode::kConstantFlow:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstFlow::Get, Attributes::MaxConstFlow::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kConstantFlow))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kConstantPressure:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstPressure::Get,
-                                    Attributes::MaxConstPressure::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kConstantPressure))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kConstantSpeed:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kConstantTemperature:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstTemp::Get, Attributes::MaxConstTemp::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kConstantTemperature))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kProportionalPressure:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinCompPressure::Get, Attributes::MaxCompPressure::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kCompensatedPressure))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kAutomatic:
-            status = Protocols::InteractionModel::Status::Success;
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kAutomatic))
+            {
+                status = Protocols::InteractionModel::Status::ConstraintError;
+            }
             break;
         case PumpControlMode::kUnknownEnumValue:
             status = Protocols::InteractionModel::Status::ConstraintError;
@@ -414,18 +356,23 @@ chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClust
         switch (operationMode)
         {
         case PumpOperationMode::kMinimum:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpOperationMode::kMaximum:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get))
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpOperationMode::kLocal:
+            if (!PumpHasFeature(attributePath.mEndpointId, PumpFeature::kLocal))
+            {
+                status = Protocols::InteractionModel::Status::ConstraintError;
+            }
+            break;
         case PumpOperationMode::kNormal:
             status = Protocols::InteractionModel::Status::Success;
             break;
@@ -450,11 +397,11 @@ void MatterPumpConfigurationAndControlClusterServerAttributeChangedCallback(cons
     switch (attributePath.mAttributeId)
     {
     case Attributes::ControlMode::Id: {
-        updateAttributeLinks(attributePath.mEndpointId);
+        setEffectiveOperationAndControlMode(attributePath.mEndpointId);
     }
     break;
     case Attributes::OperationMode::Id: {
-        updateAttributeLinks(attributePath.mEndpointId);
+        setEffectiveOperationAndControlMode(attributePath.mEndpointId);
     }
     break;
     default:

src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml

@@ -149,4 +149,15 @@ limitations under the License.
     <item name="Automatic" value="0x7"/>
   </enum>
 
+  <bitmap name="PumpFeature" type="BITMAP32">
+    <cluster code="0x0200"/>
+    <field mask="0x01" name="ConstantPressure" />
+    <field mask="0x02" name="CompensatedPressure" />
+    <field mask="0x04" name="ConstantFlow"/>
+    <field mask="0x08" name="ConstantSpeed"/>
+    <field mask="0x10" name="ConstantTemperature"/>
+    <field mask="0x20" name="Automatic"/>
+    <field mask="0x40" name="Local"/>
+  </bitmap>
+
 </configurator>

src/controller/data_model/controller-clusters.matter

@@ -2791,6 +2791,16 @@ client cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;