From 89364a8e4dc75c03b02f1e405fc3091b1e713968 Mon Sep 17 00:00:00 2001
From: Jon Smirl <jonsmirl@gmail.com>
Date: Sat, 4 Dec 2021 23:11:50 -0500
Subject: [PATCH] Create an 'Orphan' device so that all clusters in doc are
 referenced. 	Proxy Configuration 	Proxy Discovery 	Proxy Valid 
 Pulse Width Modulation

Add UserLabel to Generic Switch (not in docs)
Fix Bridged Device Basic reference
Add 'all.xml', include file allowing all XML files to be read as a unit.
---
 src/app/zap-templates/zcl/data-model/all.xml  | 71 +++++++++++++++++++
 .../zcl/data-model/chip/matter-devices.xml    | 16 ++++-
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 src/app/zap-templates/zcl/data-model/all.xml

diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
new file mode 100644
index 00000000000000..1bbbde543e01d1
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<all xmlns:xi="http://www.w3.org/2001/XInclude">
+   <xi:include href="chip/access-control-cluster.xml" />
+   <xi:include href="chip/account-login-cluster.xml" />
+   <xi:include href="chip/administrator-commissioning-cluster.xml" />
+   <xi:include href="chip/application-basic-cluster.xml" />
+   <xi:include href="chip/application-launcher-cluster.xml" />
+   <xi:include href="chip/audio-output-cluster.xml" />
+   <xi:include href="chip/basic-information-cluster.xml" />
+   <xi:include href="chip/binding-cluster.xml" />
+   <xi:include href="chip/boolean-state-cluster.xml" />
+   <xi:include href="chip/bridged-actions-cluster.xml" />
+   <xi:include href="chip/bridged-device-basic.xml" />
+   <xi:include href="chip/chip-ota.xml" />
+   <xi:include href="chip/chip-types.xml" />
+   <xi:include href="chip/clusters-extensions.xml" />
+   <xi:include href="chip/commissioning.xml" />
+   <xi:include href="chip/content-launch-cluster.xml" />
+   <xi:include href="chip/descriptor-cluster.xml" />
+   <xi:include href="chip/diagnostic-logs-cluster.xml" />
+   <xi:include href="chip/door-lock-cluster.xml" />
+   <xi:include href="chip/ethernet-network-diagnostics-cluster.xml" />
+   <xi:include href="chip/fixed-label-cluster.xml" />
+   <xi:include href="chip/flow-measurement-cluster.xml" />
+   <xi:include href="chip/general-commissioning-cluster.xml" />
+   <xi:include href="chip/general-diagnostics-cluster.xml" />
+   <xi:include href="chip/global-attributes.xml" />
+   <xi:include href="chip/group-key-mgmt-cluster.xml" />
+   <xi:include href="chip/identify-cluster.xml" />
+   <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" />
+   <xi:include href="chip/mode-select-cluster.xml" />
+   <xi:include href="chip/onoff-cluster.xml" />
+   <xi:include href="chip/operational-credentials-cluster.xml" />
+   <xi:include href="chip/pressure-measurement-cluster.xml" />
+   <xi:include href="chip/power-source-cluster.xml" />
+   <xi:include href="chip/power-source-configuration-cluster.xml" />
+   <xi:include href="chip/proxy-configuration-cluster.xml" />
+   <xi:include href="chip/proxy-discovery-cluster.xml" />
+   <xi:include href="chip/proxy-valid-cluster.xml" />
+   <xi:include href="chip/pump-configuration-and-control-cluster.xml" />
+   <xi:include href="chip/pwm-cluster.xml" />
+   <xi:include href="chip/relative-humidity-measurement-cluster.xml" />
+   <xi:include href="chip/software-diagnostics-cluster.xml" />
+   <xi:include href="chip/switch-cluster.xml" />
+   <xi:include href="chip/target-navigator-cluster.xml" />
+   <xi:include href="chip/temperature-measurement-cluster.xml" />
+   <xi:include href="chip/test-cluster.xml" />
+   <xi:include href="chip/thread-network-diagnostics-cluster.xml" />
+   <xi:include href="chip/time-synchronization-cluster.xml" />
+   <xi:include href="chip/tv-channel-cluster.xml" />
+   <xi:include href="chip/user-label-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" />
+   <xi:include href="chip/matter-devices.xml" />
+   <xi:include href="silabs/ami.xml" />
+   <xi:include href="silabs/general.xml" />
+   <xi:include href="silabs/ha-devices.xml" />
+   <xi:include href="silabs/ha.xml" />
+   <xi:include href="silabs/lo-devices.xml" />
+   <xi:include href="silabs/types.xml" />
+   <xi:include href="silabs/zll-devices.xml" />
+   <xi:include href="silabs/zll.xml" />
+</all>
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index 41c95d063582b6..98cb27cfe0a2b4 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -16,6 +16,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <configurator>
+    <deviceType>
+        <name>MA-orphan</name>
+        <domain>CHIP</domain>
+        <typeName>Matter Orphan Clusters</typeName>
+        <profileId editable="false">0x0103</profileId>
+        <deviceId editable="false">0xF001</deviceId>
+        <clusters lockOthers="true">
+            <include cluster="Proxy Configuration" client="false" server="true" clientLocked="true" serverLocked="true"/>
+            <include cluster="Proxy Discovery" client="false" server="true" clientLocked="true" serverLocked="true"/>
+            <include cluster="Proxy Valid" client="false" server="true" clientLocked="true" serverLocked="true"/>
+            <include cluster="Pulse Width Modulation" client="false" server="true" clientLocked="true" serverLocked="true"/>
+        </clusters>
+    </deviceType>
     <deviceType>
         <name>MA-rootdevice</name>
         <domain>CHIP</domain>
@@ -194,7 +207,7 @@ limitations under the License.
             <include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
                 <requireAttribute>BINDING</requireAttribute>
             </include>
-            <include cluster="Bridged Device Basic Information" client="false" server="true" clientLocked="true" serverLocked="true"></include>
+            <include cluster="Bridged Device Basic" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Power Source Configuration" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Power Source" client="false" server="true" clientLocked="true" serverLocked="true"></include>
         </clusters>
@@ -1273,6 +1286,7 @@ limitations under the License.
             </include>
             <include cluster="Switch" client="false" server="true" clientLocked="true" serverLocked="true"></include>
             <include cluster="Fixed Label" client="false" server="false" clientLocked="true" serverLocked="false"></include>
+            <include cluster="User Label" client="false" server="false" clientLocked="true" serverLocked="false"></include>
         </clusters>
     </deviceType>
     <deviceType>