Adding TimeoutMs to KeepActive command

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

@@ -2704,6 +2704,7 @@ cluster BridgedDeviceBasicInformation = 57 {
 
   request struct KeepActiveRequest {
     int32u stayActiveDuration = 0;
+    int32u timeoutMs = 1;
   }
 
   /** The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active. */

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

@@ -2661,6 +2661,7 @@ cluster BridgedDeviceBasicInformation = 57 {
 
   request struct KeepActiveRequest {
     int32u stayActiveDuration = 0;
+    int32u timeoutMs = 1;
   }
 
   /** The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active. */

src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml

@@ -97,7 +97,8 @@ limitations under the License.
 
         <command source="client" code="0x80" name="KeepActive" optional="true" apiMaturity="provisional">
           <description> The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active.</description>
-          <arg name="StayActiveDuration" type="int32u"/>
+          <arg id="0" name="StayActiveDuration" type="int32u"/>
+          <arg id="1" name="TimeoutMs" type="int32u" min="30000" max="3600000"/>
         </command>
 
         <event side="server" code="0x00" name="StartUp" priority="critical" optional="true">

src/controller/data_model/controller-clusters.matter

@@ -2587,6 +2587,7 @@ cluster BridgedDeviceBasicInformation = 57 {
 
   request struct KeepActiveRequest {
     int32u stayActiveDuration = 0;
+    int32u timeoutMs = 1;
   }
 
   /** The server SHALL attempt to keep the devices specified active for StayActiveDuration milliseconds when they are next active. */

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

@@ -15197,18 +15197,22 @@ public long initWithDevice(long devicePtr, int endpointId) {
       return 0L;
     }
 
-    public void keepActive(DefaultClusterCallback callback, Long stayActiveDuration) {
-      keepActive(callback, stayActiveDuration, 0);
+    public void keepActive(DefaultClusterCallback callback, Long stayActiveDuration, Long timeoutMs) {
+      keepActive(callback, stayActiveDuration, timeoutMs, 0);
     }
 
-    public void keepActive(DefaultClusterCallback callback, Long stayActiveDuration, int timedInvokeTimeoutMs) {
+    public void keepActive(DefaultClusterCallback callback, Long stayActiveDuration, Long timeoutMs, int timedInvokeTimeoutMs) {
       final long commandId = 128L;
 
       ArrayList<StructElement> elements = new ArrayList<>();
       final long stayActiveDurationFieldID = 0L;
       BaseTLVType stayActiveDurationtlvValue = new UIntType(stayActiveDuration);
       elements.add(new StructElement(stayActiveDurationFieldID, stayActiveDurationtlvValue));
 
+      final long timeoutMsFieldID = 1L;
+      BaseTLVType timeoutMstlvValue = new UIntType(timeoutMs);
+      elements.add(new StructElement(timeoutMsFieldID, timeoutMstlvValue));
+
       StructType commandArgs = new StructType(elements);
       invoke(new InvokeCallbackImpl(callback) {
           @Override

src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java

@@ -4543,7 +4543,7 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum KeepActiveCommandField {StayActiveDuration(0),;
+        }public enum KeepActiveCommandField {StayActiveDuration(0),TimeoutMs(1),;
                     private final int id;
                     KeepActiveCommandField(int id) {
                         this.id = id;

src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java

@@ -24443,12 +24443,17 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
 
     CommandParameterInfo bridgedDeviceBasicInformationkeepActivestayActiveDurationCommandParameterInfo = new CommandParameterInfo("stayActiveDuration", Long.class, Long.class);
     bridgedDeviceBasicInformationkeepActiveCommandParams.put("stayActiveDuration",bridgedDeviceBasicInformationkeepActivestayActiveDurationCommandParameterInfo);
+
+    CommandParameterInfo bridgedDeviceBasicInformationkeepActivetimeoutMsCommandParameterInfo = new CommandParameterInfo("timeoutMs", Long.class, Long.class);
+    bridgedDeviceBasicInformationkeepActiveCommandParams.put("timeoutMs",bridgedDeviceBasicInformationkeepActivetimeoutMsCommandParameterInfo);
     InteractionInfo bridgedDeviceBasicInformationkeepActiveInteractionInfo = new InteractionInfo(
       (cluster, callback, commandArguments) -> {
         ((ChipClusters.BridgedDeviceBasicInformationCluster) cluster)
         .keepActive((DefaultClusterCallback) callback
         , (Long)
         commandArguments.get("stayActiveDuration")
+        , (Long)
+        commandArguments.get("timeoutMs")
         );
       },
       () -> new DelegatedDefaultClusterCallback(),

src/controller/java/generated/java/matter/controller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt

@@ -101,14 +101,21 @@ class BridgedDeviceBasicInformationCluster(
     object SubscriptionEstablished : AttributeListAttributeSubscriptionState()
   }
 
-  suspend fun keepActive(stayActiveDuration: UInt, timedInvokeTimeout: Duration? = null) {
+  suspend fun keepActive(
+    stayActiveDuration: UInt,
+    timeoutMs: UInt,
+    timedInvokeTimeout: Duration? = null,
+  ) {
     val commandId: UInt = 128u
 
     val tlvWriter = TlvWriter()
     tlvWriter.startStructure(AnonymousTag)
 
     val TAG_STAY_ACTIVE_DURATION_REQ: Int = 0
     tlvWriter.put(ContextSpecificTag(TAG_STAY_ACTIVE_DURATION_REQ), stayActiveDuration)
+
+    val TAG_TIMEOUT_MS_REQ: Int = 1
+    tlvWriter.put(ContextSpecificTag(TAG_TIMEOUT_MS_REQ), timeoutMs)
     tlvWriter.endStructure()
 
     val request: InvokeRequest =