Fix rebase conflict resolve issue. Regen all to be safe

project-chip · Jan 30, 2025 · 516fdf6 · 516fdf6
1 parent 66af39d
commit 516fdf6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git a/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter b/examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter
@@ -2472,17 +2472,17 @@ endpoint 0 {
   }
 
   server cluster NetworkCommissioning {
-    ram      attribute maxNetworks;
+    callback attribute maxNetworks;
     callback attribute networks;
-    ram      attribute interfaceEnabled;
-    ram      attribute lastNetworkingStatus;
-    ram      attribute lastNetworkID;
-    ram      attribute lastConnectErrorValue;
+    callback attribute interfaceEnabled;
+    callback attribute lastNetworkingStatus;
+    callback attribute lastNetworkID;
+    callback attribute lastConnectErrorValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
   }
 
   server cluster DiagnosticLogs {

diff --git a/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter b/examples/contact-sensor-app/bouffalolab/data_model/contact-sensor-app.matter
@@ -2032,16 +2032,16 @@ endpoint 0 {
   }
 
   server cluster NetworkCommissioning {
-    ram      attribute maxNetworks;
+    callback attribute maxNetworks;
     callback attribute networks;
-    ram      attribute scanMaxTimeSeconds;
-    ram      attribute connectMaxTimeSeconds;
-    ram      attribute interfaceEnabled;
-    ram      attribute lastNetworkingStatus;
-    ram      attribute lastNetworkID;
-    ram      attribute lastConnectErrorValue;
-    ram      attribute featureMap default = 2;
-    ram      attribute clusterRevision default = 1;
+    callback attribute scanMaxTimeSeconds;
+    callback attribute connectMaxTimeSeconds;
+    callback attribute interfaceEnabled;
+    callback attribute lastNetworkingStatus;
+    callback attribute lastNetworkID;
+    callback attribute lastConnectErrorValue;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
 
     handle command ScanNetworks;
     handle command ScanNetworksResponse;

diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
@@ -2077,3 +2077,5 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
+
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
@@ -2064,3 +2064,5 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
+
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -3302,3 +3302,5 @@ endpoint 1 {
     handle command ClearAliroReaderConfig;
   }
 }
+
+
diff --git a/...ples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.matter b/...ples/terms-and-conditions-app/terms-and-conditions-common/terms-and-conditions-app.matter
@@ -1424,17 +1424,17 @@ endpoint 0 {
   }
 
   server cluster NetworkCommissioning {
-    ram      attribute maxNetworks;
+    callback attribute maxNetworks;
     callback attribute networks;
-    ram      attribute interfaceEnabled;
-    ram      attribute lastNetworkingStatus;
-    ram      attribute lastNetworkID;
-    ram      attribute lastConnectErrorValue;
+    callback attribute interfaceEnabled;
+    callback attribute lastNetworkingStatus;
+    callback attribute lastNetworkID;
+    callback attribute lastConnectErrorValue;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 1;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
 
     handle command ScanNetworks;
     handle command ScanNetworksResponse;

diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -51,16 +51,13 @@
           "label": "MA-rootdevice",
           "name": "MA-rootdevice",
           "deviceTypeOrder": 0
-<<<<<<< HEAD
         },
         {
           "code": 18,
           "profileId": 259,
           "label": "MA-otarequestor",
           "name": "MA-otarequestor",
           "deviceTypeOrder": 1
-=======
->>>>>>> 60ddfeacfd (Run convert/regen scripts)
         }
       ],
       "deviceVersions": [
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2077,3 +2077,5 @@ endpoint 1 {
		ram attribute clusterRevision default = 1;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2064,3 +2064,5 @@ endpoint 1 {
		ram attribute clusterRevision default = 1;
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3302,3 +3302,5 @@ endpoint 1 {
		handle command ClearAliroReaderConfig;
		}
		}