closure control cluster zap generated code

Author: senthilku

docs/ids_and_codes/zap_clusters.md

@@ -89,6 +89,7 @@ Generally regenerate using one of:
 |        159 |       0x9F | DeviceEnergyManagementMode                              |
 |        257 |      0x101 | DoorLock                                                |
 |        258 |      0x102 | WindowCovering                                          |
+|        260 |      0x104 | ClosureControl                                          |
 |        336 |      0x150 | ServiceArea                                             |
 |        512 |      0x200 | PumpConfigurationAndControl                             |
 |        513 |      0x201 | Thermostat                                              |

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h

@@ -98,6 +98,7 @@
 #define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1)
+#define MATTER_DM_CLOSURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_SERVICE_AREA_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1)
 #define MATTER_DM_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1)
@@ -229,6 +230,7 @@
 #define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_DOOR_LOCK_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_WINDOW_COVERING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
+#define MATTER_DM_CLOSURE_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_SERVICE_AREA_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_THERMOSTAT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h

@@ -98,6 +98,7 @@
 #define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (0)
+#define MATTER_DM_CLOSURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_SERVICE_AREA_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (0)
 #define MATTER_DM_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -229,6 +230,7 @@
 #define MATTER_DM_DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_DOOR_LOCK_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_WINDOW_COVERING_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
+#define MATTER_DM_CLOSURE_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_SERVICE_AREA_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
 #define MATTER_DM_THERMOSTAT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

src/app/zap-templates/zcl/data-model/chip/closure-control-cluster.xml

@@ -93,6 +93,11 @@ Git: 0.7-summer-2025-5-g06c4d5596-dirty
 
   <enum name="TriggerPositionEnum" type="enum8">
     <cluster code="0x0104"/>
+    <item name="AtFullyClosed" value="0x00"/>
+    <item name="AtFullyOpened" value="0x01"/>
+    <item name="InBetween" value="0x02"/>
+    <item name="AtVentilation" value="0x03"/>
+    <item name="AtPedestrian" value="0x04"/>
   </enum>
 
   <struct name="OverallStateStruct" apiMaturity="provisional">
@@ -139,7 +144,7 @@ Git: 0.7-summer-2025-5-g06c4d5596-dirty
         <feature name="FB"/>
       </mandatoryConform>
     </attribute>
-    <attribute code="0x0007" side="server" define="TRIGGER_POSITION" type="TriggerPositionEnum" optional="true">
+    <attribute code="0x0007" side="server" define="TRIGGER_POSITION" type="TriggerPositionEnum" optional="true" min="0x00" max="0x04">
       <description>TriggerPosition</description>
       <mandatoryConform>
         <feature name="FB"/>
@@ -185,7 +190,7 @@ Git: 0.7-summer-2025-5-g06c4d5596-dirty
       <description>Upon receipt, this SHALL configure the Fallback feature behavior using the data as follows: </description>
       <arg id="0" name="RestingProcedure" type="RestingProcedureEnum" optional="true" min="0x00" max="0x02"/>
       <arg id="1" name="TriggerCondition" type="TriggerConditionEnum" optional="true" min="0x00" max="0x02"/>
-      <arg id="2" name="TriggerPosition" type="TriggerPositionEnum" optional="true"/>
+      <arg id="2" name="TriggerPosition" type="TriggerPositionEnum" optional="true" min="0x00" max="0x04"/>
       <arg id="3" name="WaitingDelay" type="elapsed_s" optional="true" max="86400"/>
       <mandatoryConform>
         <feature name="FB"/>

src/app/zap-templates/zcl/zcl-with-test-extensions.json

@@ -201,6 +201,11 @@
         ],
         "Bridged Device Basic Information": ["ProductAppearance"],
         "Chime": ["ActiveChimeID", "Enabled"],
+        "Closure Control": [
+            "OverallState",
+            "OverallTarget",
+            "FeatureMap"
+        ],
         "Descriptor": ["ClusterRevision", "FeatureMap"],
         "Device Energy Management": [
             "ESAType",

src/app/zap-templates/zcl/zcl.json

@@ -195,6 +195,11 @@
         ],
         "Bridged Device Basic Information": ["ProductAppearance"],
         "Chime": ["ActiveChimeID", "Enabled"],
+        "Closure Control": [
+            "OverallState",
+            "OverallTarget",
+            "FeatureMap"
+        ],
         "Descriptor": ["ClusterRevision", "FeatureMap"],
         "Device Energy Management": [
             "ESAType",

src/controller/data_model/controller-clusters.matter

@@ -6478,6 +6478,147 @@ cluster WindowCovering = 258 {
   command GoToTiltPercentage(GoToTiltPercentageRequest): DefaultSuccess = 8;
 }
 
+/**  */
+cluster ClosureControl = 260 {
+  revision 1;
+
+  enum ClosureErrorEnum : enum8 {
+    kBlocked = 0;
+    kTemperatureLimited = 1;
+    kMaintenanceRequired = 2;
+    kInternalInterference = 3;
+  }
+
+  enum LatchingEnum : enum8 {
+    kLatchedAndSecured = 0;
+    kLatchedButNotSecured = 1;
+    kNotLatched = 2;
+  }
+
+  enum MainStateEnum : enum8 {
+    kStopped = 0;
+    kMoving = 1;
+    kWaitingForMotion = 2;
+    kError = 3;
+    kCalibrating = 4;
+    kProtected = 5;
+    kDisengaged = 6;
+    kSetupRequired = 7;
+    kPendingFallback = 8;
+  }
+
+  enum PositioningEnum : enum8 {
+    kFullyClosed = 0;
+    kFullyOpened = 1;
+    kPartiallyOpened = 2;
+    kOpenedForPedestrian = 3;
+    kOpenedForVentilation = 4;
+    kOpenedAtSignature = 5;
+  }
+
+  enum RestingProcedureEnum : enum8 {
+    kDoNothing = 0;
+    kReturnToFullyOpened = 1;
+    kReturnToFullyClosed = 2;
+  }
+
+  enum TagLatchEnum : enum8 {
+    kLatch = 0;
+    kUnlatch = 1;
+  }
+
+  enum TagPositionEnum : enum8 {
+    kCloseInFull = 0;
+    kOpenInFull = 1;
+    kPedestrian = 2;
+    kVentilation = 3;
+    kSignature = 4;
+    kSequenceNextStep = 5;
+    kPedestrianNextStep = 6;
+  }
+
+  enum TriggerConditionEnum : enum8 {
+    kAfterDelay = 0;
+    kAfterApplicativeTrigger = 1;
+    kAfterDelayOrApplicativeTrigger = 2;
+  }
+
+  enum TriggerPositionEnum : enum8 {
+    kAtFullyClosed = 0;
+    kAtFullyOpened = 1;
+    kInBetween = 2;
+    kAtVentilation = 3;
+    kAtPedestrian = 4;
+  }
+
+  bitmap Feature : bitmap32 {
+    kPositioning = 0x1;
+    kMotionLatching = 0x2;
+    kInstantaneous = 0x4;
+    kSpeed = 0x8;
+    kVentilation = 0x10;
+    kPedestrian = 0x20;
+    kCalibration = 0x40;
+    kProtection = 0x80;
+    kManuallyOperable = 0x100;
+    kFallback = 0x200;
+  }
+
+  struct OverallStateStruct {
+    optional PositioningEnum positioning = 0;
+    optional LatchingEnum latching = 1;
+    optional ThreeLevelAutoEnum speed = 2;
+    optional bitmap32 extraInfo = 3;
+  }
+
+  struct OverallTargetStruct {
+    optional TagPositionEnum tagPosition = 0;
+    optional TagLatchEnum tagLatch = 1;
+    optional ThreeLevelAutoEnum speed = 2;
+  }
+
+  readonly attribute optional nullable elapsed_s countdownTime = 0;
+  readonly attribute MainStateEnum mainState = 1;
+  readonly attribute ClosureErrorEnum currentErrorList[] = 2;
+  readonly attribute nullable OverallStateStruct overallState = 3;
+  readonly attribute nullable OverallTargetStruct overallTarget = 4;
+  readonly attribute optional RestingProcedureEnum restingProcedure = 5;
+  readonly attribute optional TriggerConditionEnum triggerCondition = 6;
+  readonly attribute optional TriggerPositionEnum triggerPosition = 7;
+  readonly attribute optional elapsed_s waitingDelay = 8;
+  readonly attribute optional elapsed_s kickoffTimer = 9;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct MoveToRequest {
+    optional TagPositionEnum tag = 0;
+    optional TagLatchEnum latch = 1;
+    optional ThreeLevelAutoEnum speed = 2;
+  }
+
+  request struct ConfigureFallbackRequest {
+    optional RestingProcedureEnum restingProcedure = 0;
+    optional TriggerConditionEnum triggerCondition = 1;
+    optional TriggerPositionEnum triggerPosition = 2;
+    optional elapsed_s waitingDelay = 3;
+  }
+
+  /** On receipt of this command, the device SHALL stop its operation if it is at a position where it is safe to do so and/or permitted. */
+  command Stop(): DefaultSuccess = 0;
+  /** Upon receipt, this SHALL move the product in the most fitting state following the data as follows: */
+  command MoveTo(MoveToRequest): DefaultSuccess = 1;
+  /** Upon receipt, this SHALL initiate a calibration. */
+  command access(invoke: manage) Calibrate(): DefaultSuccess = 2;
+  /** Upon receipt, this SHALL configure the Fallback feature behavior using the data as follows: */
+  command ConfigureFallback(ConfigureFallbackRequest): DefaultSuccess = 3;
+  /** Upon receipt, this SHALL cancel the current PendingFallback. */
+  command CancelFallback(): DefaultSuccess = 4;
+}
+
 /** The Service Area cluster provides an interface for controlling the areas where a device should operate, and for querying the current area being serviced. */
 provisional cluster ServiceArea = 336 {
   revision 1;