Zap regen

examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

@@ -1465,8 +1465,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

@@ -1329,8 +1329,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

@@ -1408,8 +1408,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

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

@@ -5277,8 +5277,8 @@ server cluster OccupancySensing = 1030 {
   attribute access(write: manage) int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

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

@@ -5236,8 +5236,8 @@ server cluster OccupancySensing = 1030 {
   attribute access(write: manage) int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

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

@@ -1386,8 +1386,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

examples/pump-app/silabs/data_model/pump-thread-app.matter

@@ -1386,8 +1386,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

examples/pump-app/silabs/data_model/pump-wifi-app.matter

@@ -1386,8 +1386,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

src/controller/data_model/controller-clusters.matter

@@ -5188,8 +5188,8 @@ client cluster OccupancySensing = 1030 {
   attribute access(write: manage) optional int16u ultrasonicOccupiedToUnoccupiedDelay = 32;
   attribute access(write: manage) optional int16u ultrasonicUnoccupiedToOccupiedDelay = 33;
   attribute access(write: manage) optional int8u ultrasonicUnoccupiedToOccupiedThreshold = 34;
-  attribute access(write: manage) optional int16u physicalContactOccupiedToUnoccupiedDelay = 48;
-  attribute access(write: manage) optional int16u physicalContactUnoccupiedToOccupiedDelay = 49;
+  attribute access(write: manage) optional nullable int16u physicalContactOccupiedToUnoccupiedDelay = 48;
+  attribute access(write: manage) optional nullable int16u physicalContactUnoccupiedToOccupiedDelay = 49;
   attribute access(write: manage) optional int8u physicalContactUnoccupiedToOccupiedThreshold = 50;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;

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

@@ -21675,6 +21675,18 @@ public OccupancySensingCluster(long devicePtr, int endpointId) {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
+    public interface PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
+    public interface PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+      void onError(Exception ex);
+      default void onSubscriptionEstablished(long subscriptionId) {}
+    }
+
     public interface GeneratedCommandListAttributeCallback {
       void onSuccess(List<Long> value);
       void onError(Exception ex);
@@ -21838,7 +21850,7 @@ public void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
     }
 
     public void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
+        PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback callback) {
         readPhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
     }
 
@@ -21851,12 +21863,12 @@ public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultCluste
     }
 
     public void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback callback, int minInterval, int maxInterval) {
         subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(
-        IntegerAttributeCallback callback) {
+        PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback callback) {
         readPhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
     }
 
@@ -21869,7 +21881,7 @@ public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultCluste
     }
 
     public void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+        PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback callback, int minInterval, int maxInterval) {
         subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -21999,17 +22011,17 @@ public void subscribeClusterRevisionAttribute(
 
     private native void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readPhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback callback);
 
     private native void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(long chipClusterPtr, PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback callback, int minInterval, int maxInterval);
 
-    private native void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void readPhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback callback);
 
     private native void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    private native void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(long chipClusterPtr, PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback callback, int minInterval, int maxInterval);
 
     private native void readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 

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

@@ -11811,6 +11811,48 @@ public void onError(Exception ex) {
     }
   }
 
+  public static class DelegatedOccupancySensingClusterPhysicalContactOccupiedToUnoccupiedDelayAttributeCallback implements ChipClusters.OccupancySensingCluster.PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
+  public static class DelegatedOccupancySensingClusterPhysicalContactUnoccupiedToOccupiedDelayAttributeCallback implements ChipClusters.OccupancySensingCluster.PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(@Nullable Integer value) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception ex) {
+      callback.onFailure(ex);
+    }
+  }
+
   public static class DelegatedOccupancySensingClusterGeneratedCommandListAttributeCallback implements ChipClusters.OccupancySensingCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override

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

@@ -11743,21 +11743,21 @@ private static Map<String, InteractionInfo> readOccupancySensingInteractionInfo(
         InteractionInfo readOccupancySensingPhysicalContactOccupiedToUnoccupiedDelayAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
             ((ChipClusters.OccupancySensingCluster) cluster).readPhysicalContactOccupiedToUnoccupiedDelayAttribute(
-              (ChipClusters.IntegerAttributeCallback) callback
+              (ChipClusters.OccupancySensingCluster.PhysicalContactOccupiedToUnoccupiedDelayAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          () -> new ClusterInfoMapping.DelegatedOccupancySensingClusterPhysicalContactOccupiedToUnoccupiedDelayAttributeCallback(),
           readOccupancySensingPhysicalContactOccupiedToUnoccupiedDelayCommandParams
         );
         result.put("readPhysicalContactOccupiedToUnoccupiedDelayAttribute", readOccupancySensingPhysicalContactOccupiedToUnoccupiedDelayAttributeInteractionInfo);
      Map<String, CommandParameterInfo> readOccupancySensingPhysicalContactUnoccupiedToOccupiedDelayCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readOccupancySensingPhysicalContactUnoccupiedToOccupiedDelayAttributeInteractionInfo = new InteractionInfo(
           (cluster, callback, commandArguments) -> {
             ((ChipClusters.OccupancySensingCluster) cluster).readPhysicalContactUnoccupiedToOccupiedDelayAttribute(
-              (ChipClusters.IntegerAttributeCallback) callback
+              (ChipClusters.OccupancySensingCluster.PhysicalContactUnoccupiedToOccupiedDelayAttributeCallback) callback
             );
           },
-          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          () -> new ClusterInfoMapping.DelegatedOccupancySensingClusterPhysicalContactUnoccupiedToOccupiedDelayAttributeCallback(),
           readOccupancySensingPhysicalContactUnoccupiedToOccupiedDelayCommandParams
         );
         result.put("readPhysicalContactUnoccupiedToOccupiedDelayAttribute", readOccupancySensingPhysicalContactUnoccupiedToOccupiedDelayAttributeInteractionInfo);