Remove types-silabs.xml (#24976)

* Remove types-silabs.xml * Update generated code
project-chip · Feb 10, 2023 · f24ce30 · f24ce30
1 parent 2ddb52a
commit f24ce30
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 59 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -186,7 +186,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/silabs/ha-devices.xml \
                       src/app/zap-templates/zcl/data-model/silabs/lo-devices.xml \
-                      src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml \
                       src/app/zap-templates/zcl/data-model/silabs/zll-devices.xml \
                     "
             - name: Build Apps

diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
@@ -77,6 +77,5 @@
    <xi:include href="draft/onoff-switch-configuration-cluster.xml" />
    <xi:include href="silabs/ha-devices.xml" />
    <xi:include href="silabs/lo-devices.xml" />
-   <xi:include href="silabs/types-silabs.xml" />
    <xi:include href="silabs/zll-devices.xml" />
 </all>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -13,7 +13,6 @@
     "xmlFile": [
         "access-control-definitions.xml",
         "chip-types.xml",
-        "types-silabs.xml",
         "access-control-cluster.xml",
         "account-login-cluster.xml",
         "administrator-commissioning-cluster.xml",

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -12,7 +12,6 @@
     "xmlFile": [
         "access-control-definitions.xml",
         "chip-types.xml",
-        "types-silabs.xml",
         "access-control-cluster.xml",
         "account-login-cluster.xml",
         "administrator-commissioning-cluster.xml",

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -6001,7 +6001,7 @@
               - DlOperationSource
               - DlUserStatus
               - DlUserType
-              # The enums after this come from the silabs types-silabs.xml, not the
+              # The enums after this come from the draft/types/door-lock.xml, not the
               # door lock cluster XML
               #
               # DoorLockUserStatus is not marked deprecated here because the

diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h