Regen ZAP

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

@@ -6904,6 +6904,7 @@ internal cluster UnitTesting = 4294048773 {
 
   response struct TestDifferentVendorMeiResponse = 4294049979 {
     int8u arg1 = 0;
+    int64u eventNumber = 1;
   }
 
   /** Simple command without any parameters and without a specific response.
@@ -6976,7 +6977,7 @@ internal cluster UnitTesting = 4294048773 {
   command TestBatchHelperRequest(TestBatchHelperRequestRequest): TestBatchHelperResponse = 22;
   /** Second command that responds after sleepBeforeResponseTimeMs with an octet_string the size requested with fillCharacter. */
   command TestSecondBatchHelperRequest(TestSecondBatchHelperRequestRequest): TestBatchHelperResponse = 23;
-  /** Command having a different MEI vendor ID than the cluster. */
+  /** Command having a different MEI vendor ID than the cluster. Also emits TestDifferentVendorMeiEvent. */
   command TestDifferentVendorMeiRequest(TestDifferentVendorMeiRequestRequest): TestDifferentVendorMeiResponse = 4294049962;
 }
 

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

@@ -5779,6 +5779,7 @@ internal cluster UnitTesting = 4294048773 {
 
   response struct TestDifferentVendorMeiResponse = 4294049979 {
     int8u arg1 = 0;
+    int64u eventNumber = 1;
   }
 
   /** Simple command without any parameters and without a specific response.
@@ -5851,7 +5852,7 @@ internal cluster UnitTesting = 4294048773 {
   command TestBatchHelperRequest(TestBatchHelperRequestRequest): TestBatchHelperResponse = 22;
   /** Second command that responds after sleepBeforeResponseTimeMs with an octet_string the size requested with fillCharacter. */
   command TestSecondBatchHelperRequest(TestSecondBatchHelperRequestRequest): TestBatchHelperResponse = 23;
-  /** Command having a different MEI vendor ID than the cluster. */
+  /** Command having a different MEI vendor ID than the cluster. Also emits TestDifferentVendorMeiEvent. */
   command TestDifferentVendorMeiRequest(TestDifferentVendorMeiRequestRequest): TestDifferentVendorMeiResponse = 4294049962;
 }
 

src/app/tests/suites/TestUnitTestingClusterMei.yaml

@@ -28,17 +28,6 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Send MEI command in cluster"
-      command: "TestDifferentVendorMeiRequest"
-      arguments:
-          values:
-              - name: "arg1"
-                value: 76
-      response:
-          values:
-              - name: "arg1"
-                value: 76
-
     - label: "Write different vendor MEI attribute"
       command: "writeAttribute"
       attribute: "mei_int8u"
@@ -73,6 +62,26 @@ tests:
               type: list
               contains: [4294070017]
 
+    - label: "Send MEI command and force event generation"
+      command: "TestDifferentVendorMeiRequest"
+      arguments:
+          values:
+              - name: "arg1"
+                value: 76
+      response:
+          values:
+              - name: "arg1"
+                value: 76
+              - name: "eventNumber"
+                saveAs: firstMeiEventNumber
+
+    - label: "Validate event generation 1/2"
+      command: "readEvent"
+      event: "TestDifferentVendorMeiEvent"
+      eventNumber: firstMeiEventNumber
+      response:
+          value: { arg1: 76 }
+
     - label: "Force event generation"
       command: "TestEmitTestEventRequest"
       arguments:
@@ -88,14 +97,7 @@ tests:
               - name: "value"
                 saveAs: firstEventNumber
 
-    - label: "Validate event generation 1/2"
-      command: "readEvent"
-      event: "TestDifferentVendorMeiEvent"
-      eventNumber: firstEventNumber
-      response:
-          value: { arg1: 42 }
-
     - label: "Validate event generation 2/2"
       command: "readEvent"
       event: "TestEvent"
-      eventNumber: "LastReceivedEventNumber + 1"
+      eventNumber: firstEventNumber

src/controller/data_model/controller-clusters.matter

@@ -9022,6 +9022,7 @@ internal cluster UnitTesting = 4294048773 {
 
   response struct TestDifferentVendorMeiResponse = 4294049979 {
     int8u arg1 = 0;
+    int64u eventNumber = 1;
   }
 
   /** Simple command without any parameters and without a specific response.
@@ -9094,7 +9095,7 @@ internal cluster UnitTesting = 4294048773 {
   command TestBatchHelperRequest(TestBatchHelperRequestRequest): TestBatchHelperResponse = 22;
   /** Second command that responds after sleepBeforeResponseTimeMs with an octet_string the size requested with fillCharacter. */
   command TestSecondBatchHelperRequest(TestSecondBatchHelperRequestRequest): TestBatchHelperResponse = 23;
-  /** Command having a different MEI vendor ID than the cluster. */
+  /** Command having a different MEI vendor ID than the cluster. Also emits TestDifferentVendorMeiEvent. */
   command TestDifferentVendorMeiRequest(TestDifferentVendorMeiRequestRequest): TestDifferentVendorMeiResponse = 4294049962;
 }
 

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

@@ -60051,15 +60051,22 @@ public void testDifferentVendorMeiRequest(TestDifferentVendorMeiResponseCallback
           public void onResponse(StructType invokeStructValue) {
           final long arg1FieldID = 0L;
           Integer arg1 = null;
+          final long eventNumberFieldID = 1L;
+          Long eventNumber = null;
           for (StructElement element: invokeStructValue.value()) {
             if (element.contextTagNum() == arg1FieldID) {
               if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
                 UIntType castingValue = element.value(UIntType.class);
                 arg1 = castingValue.value(Integer.class);
               }
+            } else if (element.contextTagNum() == eventNumberFieldID) {
+              if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+                UIntType castingValue = element.value(UIntType.class);
+                eventNumber = castingValue.value(Long.class);
+              }
             }
           }
-          callback.onSuccess(arg1);
+          callback.onSuccess(arg1, eventNumber);
         }}, commandId, value, timedInvokeTimeoutMs);
     }
 
@@ -60116,7 +60123,7 @@ public interface TestBatchHelperResponseCallback extends BaseClusterCallback {
     }
 
     public interface TestDifferentVendorMeiResponseCallback extends BaseClusterCallback {
-      void onSuccess(Integer arg1);
+      void onSuccess(Integer arg1, Long eventNumber);
     }
 
     public interface ListInt8uAttributeCallback extends BaseAttributeCallback {

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

@@ -18939,11 +18939,13 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer arg1) {
+    public void onSuccess(Integer arg1, Long eventNumber) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
 
       CommandResponseInfo arg1ResponseValue = new CommandResponseInfo("arg1", "Integer");
       responseValues.put(arg1ResponseValue, arg1);
+      CommandResponseInfo eventNumberResponseValue = new CommandResponseInfo("eventNumber", "Long");
+      responseValues.put(eventNumberResponseValue, eventNumber);
       callback.onSuccess(responseValues);
     }
 

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

@@ -121,7 +121,7 @@ class UnitTestingCluster(private val controller: MatterController, private val e
 
   class TestBatchHelperResponse(val buffer: ByteArray)
 
-  class TestDifferentVendorMeiResponse(val arg1: UByte)
+  class TestDifferentVendorMeiResponse(val arg1: UByte, val eventNumber: ULong)
 
   class ListInt8uAttribute(val value: List<UByte>)
 
@@ -2365,11 +2365,18 @@ class UnitTestingCluster(private val controller: MatterController, private val e
     val TAG_ARG1: Int = 0
     var arg1_decoded: UByte? = null
 
+    val TAG_EVENT_NUMBER: Int = 1
+    var eventNumber_decoded: ULong? = null
+
     while (!tlvReader.isEndOfContainer()) {
       val tag = tlvReader.peekElement().tag
 
       if (tag == ContextSpecificTag(TAG_ARG1)) {
         arg1_decoded = tlvReader.getUByte(tag)
+      }
+
+      if (tag == ContextSpecificTag(TAG_EVENT_NUMBER)) {
+        eventNumber_decoded = tlvReader.getULong(tag)
       } else {
         tlvReader.skipElement()
       }
@@ -2379,9 +2386,13 @@ class UnitTestingCluster(private val controller: MatterController, private val e
       throw IllegalStateException("arg1 not found in TLV")
     }
 
+    if (eventNumber_decoded == null) {
+      throw IllegalStateException("eventNumber not found in TLV")
+    }
+
     tlvReader.exitContainer()
 
-    return TestDifferentVendorMeiResponse(arg1_decoded)
+    return TestDifferentVendorMeiResponse(arg1_decoded, eventNumber_decoded)
   }
 
   suspend fun readBooleanAttribute(): Boolean {