Update Generated files

project-chip · Oct 3, 2023 · 238da8b · 238da8b
1 parent 4119fc1
commit 238da8b
Show file tree

Hide file tree

Showing 152 changed files with 2,870 additions and 3,075 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2408,7 +2408,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1945,7 +1945,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -1676,7 +1676,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1558,7 +1558,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2713,7 +2713,6 @@ client cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/...vicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt b/...vicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
@@ -17,20 +17,22 @@
 package chip.devicecontroller.cluster.eventstructs
 
 import chip.devicecontroller.cluster.*
+import chip.tlv.AnonymousTag
 import chip.tlv.ContextSpecificTag
 import chip.tlv.Tag
+import chip.tlv.TlvParsingException
 import chip.tlv.TlvReader
 import chip.tlv.TlvWriter
 
-class AccessControlClusterAccessControlEntryChangedEvent(
-  val adminNodeID: ULong?,
-  val adminPasscodeID: UInt?,
-  val changeType: UInt,
-  val latestValue:
-    chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
-  val fabricIndex: UInt
-) {
-  override fun toString(): String = buildString {
+import java.util.Optional
+
+class AccessControlClusterAccessControlEntryChangedEvent (
+    val adminNodeID: ULong?,
+    val adminPasscodeID: UInt?,
+    val changeType: UInt,
+    val latestValue: chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
+    val fabricIndex: UInt) {
+  override fun toString(): String  = buildString {
     append("AccessControlClusterAccessControlEntryChangedEvent {\n")
     append("\tadminNodeID : $adminNodeID\n")
     append("\tadminPasscodeID : $adminPasscodeID\n")
@@ -44,21 +46,21 @@ class AccessControlClusterAccessControlEntryChangedEvent(
     tlvWriter.apply {
       startStructure(tlvTag)
       if (adminNodeID != null) {
-        put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
-      } else {
-        putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
-      }
+      put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
+    } else {
+      putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+    }
       if (adminPasscodeID != null) {
-        put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
-      } else {
-        putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
-      }
+      put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
+    } else {
+      putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+    }
       put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
       if (latestValue != null) {
-        latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
-      } else {
-        putNull(ContextSpecificTag(TAG_LATEST_VALUE))
-      }
+      latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
+    } else {
+      putNull(ContextSpecificTag(TAG_LATEST_VALUE))
+    }
       put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
       endStructure()
     }
@@ -71,45 +73,32 @@ class AccessControlClusterAccessControlEntryChangedEvent(
     private const val TAG_LATEST_VALUE = 4
     private const val TAG_FABRIC_INDEX = 254
 
-    fun fromTlv(
-      tlvTag: Tag,
-      tlvReader: TlvReader
-    ): AccessControlClusterAccessControlEntryChangedEvent {
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : AccessControlClusterAccessControlEntryChangedEvent {
       tlvReader.enterStructure(tlvTag)
-      val adminNodeID =
-        if (!tlvReader.isNull()) {
-          tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
-          null
-        }
-      val adminPasscodeID =
-        if (!tlvReader.isNull()) {
-          tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
-          null
-        }
+      val adminNodeID = if (!tlvReader.isNull()) {
+      tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+    } else {
+      tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+      null
+    }
+      val adminPasscodeID = if (!tlvReader.isNull()) {
+      tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+    } else {
+      tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+      null
+    }
       val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
-      val latestValue =
-        if (!tlvReader.isNull()) {
-          chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
-            .fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
-          null
-        }
+      val latestValue = if (!tlvReader.isNull()) {
+      chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
+    } else {
+      tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
+      null
+    }
       val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
-
+      
       tlvReader.exitContainer()
 
-      return AccessControlClusterAccessControlEntryChangedEvent(
-        adminNodeID,
-        adminPasscodeID,
-        changeType,
-        latestValue,
-        fabricIndex
-      )
+      return AccessControlClusterAccessControlEntryChangedEvent(adminNodeID, adminPasscodeID, changeType, latestValue, fabricIndex)
     }
   }
 }
diff --git a/...controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt b/...controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
@@ -17,20 +17,22 @@
 package chip.devicecontroller.cluster.eventstructs
 
 import chip.devicecontroller.cluster.*
+import chip.tlv.AnonymousTag
 import chip.tlv.ContextSpecificTag
 import chip.tlv.Tag
+import chip.tlv.TlvParsingException
 import chip.tlv.TlvReader
 import chip.tlv.TlvWriter
 
-class AccessControlClusterAccessControlExtensionChangedEvent(
-  val adminNodeID: ULong?,
-  val adminPasscodeID: UInt?,
-  val changeType: UInt,
-  val latestValue:
-    chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
-  val fabricIndex: UInt
-) {
-  override fun toString(): String = buildString {
+import java.util.Optional
+
+class AccessControlClusterAccessControlExtensionChangedEvent (
+    val adminNodeID: ULong?,
+    val adminPasscodeID: UInt?,
+    val changeType: UInt,
+    val latestValue: chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
+    val fabricIndex: UInt) {
+  override fun toString(): String  = buildString {
     append("AccessControlClusterAccessControlExtensionChangedEvent {\n")
     append("\tadminNodeID : $adminNodeID\n")
     append("\tadminPasscodeID : $adminPasscodeID\n")
@@ -44,21 +46,21 @@ class AccessControlClusterAccessControlExtensionChangedEvent(
     tlvWriter.apply {
       startStructure(tlvTag)
       if (adminNodeID != null) {
-        put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
-      } else {
-        putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
-      }
+      put(ContextSpecificTag(TAG_ADMIN_NODE_I_D), adminNodeID)
+    } else {
+      putNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+    }
       if (adminPasscodeID != null) {
-        put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
-      } else {
-        putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
-      }
+      put(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D), adminPasscodeID)
+    } else {
+      putNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+    }
       put(ContextSpecificTag(TAG_CHANGE_TYPE), changeType)
       if (latestValue != null) {
-        latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
-      } else {
-        putNull(ContextSpecificTag(TAG_LATEST_VALUE))
-      }
+      latestValue.toTlv(ContextSpecificTag(TAG_LATEST_VALUE), this)
+    } else {
+      putNull(ContextSpecificTag(TAG_LATEST_VALUE))
+    }
       put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
       endStructure()
     }
@@ -71,45 +73,32 @@ class AccessControlClusterAccessControlExtensionChangedEvent(
     private const val TAG_LATEST_VALUE = 4
     private const val TAG_FABRIC_INDEX = 254
 
-    fun fromTlv(
-      tlvTag: Tag,
-      tlvReader: TlvReader
-    ): AccessControlClusterAccessControlExtensionChangedEvent {
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : AccessControlClusterAccessControlExtensionChangedEvent {
       tlvReader.enterStructure(tlvTag)
-      val adminNodeID =
-        if (!tlvReader.isNull()) {
-          tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
-          null
-        }
-      val adminPasscodeID =
-        if (!tlvReader.isNull()) {
-          tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
-          null
-        }
+      val adminNodeID = if (!tlvReader.isNull()) {
+      tlvReader.getULong(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+    } else {
+      tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_NODE_I_D))
+      null
+    }
+      val adminPasscodeID = if (!tlvReader.isNull()) {
+      tlvReader.getUInt(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+    } else {
+      tlvReader.getNull(ContextSpecificTag(TAG_ADMIN_PASSCODE_I_D))
+      null
+    }
       val changeType = tlvReader.getUInt(ContextSpecificTag(TAG_CHANGE_TYPE))
-      val latestValue =
-        if (!tlvReader.isNull()) {
-          chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct
-            .fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
-          null
-        }
+      val latestValue = if (!tlvReader.isNull()) {
+      chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct.fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
+    } else {
+      tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
+      null
+    }
       val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
-
+      
       tlvReader.exitContainer()
 
-      return AccessControlClusterAccessControlExtensionChangedEvent(
-        adminNodeID,
-        adminPasscodeID,
-        changeType,
-        latestValue,
-        fabricIndex
-      )
+      return AccessControlClusterAccessControlExtensionChangedEvent(adminNodeID, adminPasscodeID, changeType, latestValue, fabricIndex)
     }
   }
 }
diff --git a/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt b/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
@@ -17,18 +17,21 @@
 package chip.devicecontroller.cluster.eventstructs
 
 import chip.devicecontroller.cluster.*
+import chip.tlv.AnonymousTag
 import chip.tlv.ContextSpecificTag
 import chip.tlv.Tag
+import chip.tlv.TlvParsingException
 import chip.tlv.TlvReader
 import chip.tlv.TlvWriter
 
-class ActionsClusterActionFailedEvent(
-  val actionID: UInt,
-  val invokeID: ULong,
-  val newState: UInt,
-  val error: UInt
-) {
-  override fun toString(): String = buildString {
+import java.util.Optional
+
+class ActionsClusterActionFailedEvent (
+    val actionID: UInt,
+    val invokeID: ULong,
+    val newState: UInt,
+    val error: UInt) {
+  override fun toString(): String  = buildString {
     append("ActionsClusterActionFailedEvent {\n")
     append("\tactionID : $actionID\n")
     append("\tinvokeID : $invokeID\n")
@@ -54,13 +57,13 @@ class ActionsClusterActionFailedEvent(
     private const val TAG_NEW_STATE = 2
     private const val TAG_ERROR = 3
 
-    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterActionFailedEvent {
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : ActionsClusterActionFailedEvent {
       tlvReader.enterStructure(tlvTag)
       val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D))
       val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D))
       val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))
       val error = tlvReader.getUInt(ContextSpecificTag(TAG_ERROR))
-
+      
       tlvReader.exitContainer()
 
       return ActionsClusterActionFailedEvent(actionID, invokeID, newState, error)

diff --git a/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt b/...erated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
@@ -17,13 +17,20 @@
 package chip.devicecontroller.cluster.eventstructs
 
 import chip.devicecontroller.cluster.*
+import chip.tlv.AnonymousTag
 import chip.tlv.ContextSpecificTag
 import chip.tlv.Tag
+import chip.tlv.TlvParsingException
 import chip.tlv.TlvReader
 import chip.tlv.TlvWriter
 
-class ActionsClusterStateChangedEvent(val actionID: UInt, val invokeID: ULong, val newState: UInt) {
-  override fun toString(): String = buildString {
+import java.util.Optional
+
+class ActionsClusterStateChangedEvent (
+    val actionID: UInt,
+    val invokeID: ULong,
+    val newState: UInt) {
+  override fun toString(): String  = buildString {
     append("ActionsClusterStateChangedEvent {\n")
     append("\tactionID : $actionID\n")
     append("\tinvokeID : $invokeID\n")
@@ -46,12 +53,12 @@ class ActionsClusterStateChangedEvent(val actionID: UInt, val invokeID: ULong, v
     private const val TAG_INVOKE_I_D = 1
     private const val TAG_NEW_STATE = 2
 
-    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ActionsClusterStateChangedEvent {
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : ActionsClusterStateChangedEvent {
       tlvReader.enterStructure(tlvTag)
       val actionID = tlvReader.getUInt(ContextSpecificTag(TAG_ACTION_I_D))
       val invokeID = tlvReader.getULong(ContextSpecificTag(TAG_INVOKE_I_D))
       val newState = tlvReader.getUInt(ContextSpecificTag(TAG_NEW_STATE))
-
+      
       tlvReader.exitContainer()
 
       return ActionsClusterStateChangedEvent(actionID, invokeID, newState)