Rename time-format & unit cluster to align with spec (#13516)

* Rename time-format & unit cluster to algin with spec * Run codegen
project-chip · Jun 9, 2022 · 1564802 · 1564802
1 parent 5edb034
commit 1564802
Show file tree

Hide file tree

Showing 33 changed files with 151 additions and 762 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -19988,6 +19988,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -4544,6 +4544,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 257
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.zap b/examples/door-lock-app/door-lock-common/door-lock-app.zap
@@ -6166,6 +6166,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 10
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -6737,6 +6737,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 259
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -5754,6 +5754,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 10
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -3864,6 +3864,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -3963,6 +3963,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
@@ -6253,6 +6253,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 771
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -5998,6 +5998,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 772
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -3408,6 +3408,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -13839,6 +13839,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 769
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
@@ -10637,6 +10637,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 36
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -16368,6 +16368,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
@@ -7608,6 +7608,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 514
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
@@ -30,8 +30,6 @@
    <xi:include href="chip/illuminance-measurement-cluster.xml" />
    <xi:include href="chip/keypad-input-cluster.xml" />
    <xi:include href="chip/localization-configuration-cluster.xml" />
-   <xi:include href="chip/localization-time-format-cluster.xml" />
-   <xi:include href="chip/localization-unit-cluster.xml" />
    <xi:include href="chip/low-power-cluster.xml" />
    <xi:include href="chip/media-input-cluster.xml" />
    <xi:include href="chip/media-playback-cluster.xml" />
@@ -54,9 +52,11 @@
    <xi:include href="chip/test-cluster.xml" />
    <xi:include href="chip/thermostat-cluster.xml" />
    <xi:include href="chip/thread-network-diagnostics-cluster.xml" />
+   <xi:include href="chip/time-format-localization-cluster.xml" />
    <xi:include href="chip/time-synchronization-cluster.xml" />
    <xi:include href="chip/channel-cluster.xml" />
    <xi:include href="chip/user-label-cluster.xml" />
+   <xi:include href="chip/unit-localization-cluster.xml" />
    <xi:include href="chip/wake-on-lan-cluster.xml" />
    <xi:include href="chip/wifi-network-diagnostics-cluster.xml" />
    <xi:include href="chip/window-covering.xml" />

diff --git a/...chip/localization-time-format-cluster.xml → ...chip/time-format-localization-cluster.xml b/...chip/localization-time-format-cluster.xml → ...chip/time-format-localization-cluster.xml
@@ -38,9 +38,9 @@ limitations under the License.
   </enum>
   <cluster>
     <domain>General</domain>
-    <name>Localization Time Format</name>
+    <name>Time Format Localization</name>
     <code>0x002c</code>
-    <define>LOCALIZATION_TIME_FORMAT_CLUSTER</define>
+    <define>TIME_FORMAT_LOCALIZATION_CLUSTER</define>
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <description>Nodes should be expected to be deployed to any and all regions of the world. These global regions

diff --git a/...-model/chip/localization-unit-cluster.xml → ...-model/chip/unit-cluster-localization.xml b/...-model/chip/localization-unit-cluster.xml → ...-model/chip/unit-cluster-localization.xml
@@ -24,9 +24,9 @@ limitations under the License.
   </enum>
   <cluster>
     <domain>General</domain>
-    <name>Localization Unit</name>
+    <name>Unit Localization</name>
     <code>0x002d</code>
-    <define>LOCALIZATION_UNIT_CLUSTER</define>
+    <define>UNIT_LOCALIZATION_CLUSTER</define>
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <description>Nodes should be expected to be deployed to any and all regions of the world. These global regions

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -33,8 +33,6 @@
         "illuminance-measurement-cluster.xml",
         "keypad-input-cluster.xml",
         "localization-configuration-cluster.xml",
-        "localization-time-format-cluster.xml",
-        "localization-unit-cluster.xml",
         "low-power-cluster.xml",
         "media-input-cluster.xml",
         "media-playback-cluster.xml",
@@ -57,8 +55,10 @@
         "test-cluster.xml",
         "thermostat-cluster.xml",
         "thread-network-diagnostics-cluster.xml",
+        "time-format-localization-cluster.xml",
         "time-synchronization-cluster.xml",
         "user-label-cluster.xml",
+        "unit-localization-cluster.xml",
         "wake-on-lan-cluster.xml",
         "wifi-network-diagnostics-cluster.xml",
         "window-covering.xml",

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -14234,6 +14234,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 22
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py