Fix spacing and zap regen - make endpoints nicer to read

project-chip · May 4, 2022 · f9d466f · f9d466f
1 parent 8f79c5e
commit f9d466f
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 20 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
@@ -3758,7 +3758,6 @@ server cluster WindowCovering = 258 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -4040,6 +4039,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 2;
   }
 }
+
 endpoint 1 {
 
   server cluster Identify {
@@ -4599,6 +4599,7 @@ endpoint 1 {
     ram      attribute clusterRevision default = 3;
   }
 }
+
 endpoint 2 {
 
   server cluster Groups {
@@ -4631,6 +4632,7 @@ endpoint 2 {
     ram      attribute clusterRevision default = 3;
   }
 }
+
 endpoint 65534 {
 
   server cluster NetworkCommissioning {

diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1132,7 +1132,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
   binding cluster AccessControl;
 
@@ -1371,6 +1370,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
 
   server cluster OnOff {

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
@@ -1656,7 +1656,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1912,6 +1911,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster Identify;
   binding cluster Scenes;

diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1643,7 +1643,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1900,6 +1899,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
 
   server cluster Identify {

diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -1801,7 +1801,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2056,6 +2055,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
 
   server cluster Identify {

diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -391,7 +391,6 @@ server cluster OperationalCredentials = 62 {
 }
 
 
-
 endpoint 0 {
   binding cluster DiagnosticLogs;
 

diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -578,7 +578,6 @@ server cluster UserLabel = 65 {
 }
 
 
-
 endpoint 0 {
   binding cluster AccessControl;
 

diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -628,7 +628,6 @@ server cluster UserLabel = 65 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -2525,7 +2525,6 @@ server cluster WindowCovering = 258 {
 }
 
 
-
 endpoint 0 {
   binding cluster OnOff;
   binding cluster GeneralCommissioning;
@@ -2926,6 +2925,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster OnOff;
 

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -2525,7 +2525,6 @@ server cluster WindowCovering = 258 {
 }
 
 
-
 endpoint 0 {
   binding cluster OnOff;
   binding cluster GeneralCommissioning;
@@ -2926,6 +2925,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster OnOff;
 

diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
@@ -1567,7 +1567,6 @@ server cluster UserLabel = 65 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1826,6 +1825,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster TemperatureMeasurement;
   binding cluster PressureMeasurement;

diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -1294,7 +1294,6 @@ server cluster UserLabel = 65 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1549,6 +1548,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster OnOff;
   binding cluster PumpConfigurationAndControl;

diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -743,7 +743,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
 
   server cluster Descriptor {
@@ -910,6 +909,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
 
   server cluster Descriptor {

diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1360,7 +1360,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
 
   server cluster Identify {
@@ -1618,6 +1617,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster Identify;
 

diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
@@ -1994,7 +1994,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
   binding cluster Binding;
   binding cluster GeneralCommissioning;
@@ -2258,6 +2257,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 2;
   }
 }
+
 endpoint 1 {
 
   server cluster OnOff {
@@ -2322,6 +2322,7 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 2 {
 
   server cluster OnOff {
@@ -2363,6 +2364,7 @@ endpoint 2 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 3 {
 
   server cluster Descriptor {
@@ -2407,6 +2409,7 @@ endpoint 3 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 4 {
 
   server cluster Descriptor {
@@ -2435,6 +2438,7 @@ endpoint 4 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 5 {
 
   server cluster Descriptor {

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -2172,7 +2172,6 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 
-
 endpoint 0 {
 
   server cluster Descriptor {
@@ -2425,6 +2424,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
   binding cluster OnOff;
   binding cluster LevelControl;
@@ -2564,6 +2564,7 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 2 {
 
   server cluster OnOff {

diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
@@ -1372,7 +1372,6 @@ server cluster WindowCovering = 258 {
 }
 
 
-
 endpoint 0 {
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -1671,6 +1670,7 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 }
+
 endpoint 1 {
 
   server cluster Identify {
@@ -1710,6 +1710,7 @@ endpoint 1 {
     ram      attribute clusterRevision default = 5;
   }
 }
+
 endpoint 2 {
 
   server cluster Descriptor {

diff --git a/src/app/zap-templates/templates/app/MatterIDL.zapt b/src/app/zap-templates/templates/app/MatterIDL.zapt
@@ -114,9 +114,8 @@
 }
 
 {{/all_user_clusters}}
-
-
 {{#user_endpoints}}
+
 endpoint {{endpointId}} {
   {{#user_clusters}}
     {{#if enabled}}

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -4261,7 +4261,6 @@ client cluster WindowCovering = 258 {
 }
 
 
-
 endpoint 1 {
   binding cluster Identify;
   binding cluster Groups;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -391,7 +391,6 @@ server cluster OperationalCredentials = 62 {
		}



		endpoint 0 {
		binding cluster DiagnosticLogs;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -578,7 +578,6 @@ server cluster UserLabel = 65 {
		}



		endpoint 0 {
		binding cluster AccessControl;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -628,7 +628,6 @@ server cluster UserLabel = 65 {
		}



		endpoint 0 {
		binding cluster OtaSoftwareUpdateProvider;

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -4261,7 +4261,6 @@ client cluster WindowCovering = 258 { @@
     }
     endpoint 1 {
       binding cluster Identify;
       binding cluster Groups;
@@ Expand Down @@