From 383209bfb4dcfa4fff0fd2d4d29a30cd0cc71980 Mon Sep 17 00:00:00 2001
From: Mark Trayer <m.trayer@samsung.com>
Date: Wed, 18 Dec 2024 15:12:04 -0600
Subject: [PATCH] New alchemy version of the XML following spec updates to
 normalize use of case in attribute and field names for acronyms.

---
 ...settings-user-level-management-cluster.xml | 116 +++++++++++++++---
 1 file changed, 97 insertions(+), 19 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml
index 7edf910b2940dc..a541695c50a0f0 100644
--- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml
@@ -16,9 +16,9 @@ limitations under the License.
 -->
 <!--
 XML generated by Alchemy; DO NOT EDIT.
-Source: src/app_clusters/CameraAVSettingsUserLevelManagement.adoc
-Parameters: in-progress
-Git: 1.4-267-gc3d95b5c9
+Source: src\app_clusters\CameraAVSettingsUserLevelManagement.adoc
+Parameters: 
+Git: 1.4-444-g6d595e737
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="Cameras"/>
@@ -68,57 +68,135 @@ Git: 1.4-267-gc3d95b5c9
     </features>
     <server init="false" tick="false">true</server>
     <globalAttribute code="0xFFFD" side="either" value="1"/>
-    <attribute code="0x0000" side="server" define="MPTZ" type="MPTZStruct" optional="true">MptzPosition</attribute>
-    <attribute code="0x0001" side="server" define="MAX_PRESETS" type="int8u" optional="true" default="5">MaxPresets</attribute>
-    <attribute code="0x0002" side="server" define="PRESET_MPTZ_TABLE" type="array" entryType="MPTZPresetStruct" optional="true">MptzPresets</attribute>
-    <attribute code="0x0003" side="server" define="MPTZ_RELATIVE_MOVE" type="array" optional="true" entryType="int16u">DptzRelativeMove</attribute>
-    <attribute code="0x0004" side="server" define="DPTZ_RELATIVE_MOVE" type="int8u" optional="true" min="2" max="100" default="100">ZoomMax</attribute>
-    <attribute code="0x0005" side="server" define="TILT_MIN" type="int16s" min="-180" max="179" default="-90" optional="true">TiltMin</attribute>
-    <attribute code="0x0006" side="server" define="TILT_MAX" type="int16s" min="-179" max="180" default="90" optional="true">TiltMax</attribute>
-    <attribute code="0x0007" side="server" define="PAN_MIN" type="int16s" min="-180" max="179" default="-180" optional="true">PanMin</attribute>
-    <attribute code="0x0008" side="server" define="PAN_MAX" type="int16s" min="-179" max="180" default="180" optional="true">PanMax</attribute>
-    <command code="0x00" source="client" name="MptzSetPosition" optional="true">
+    <attribute code="0x0000" side="server" define="MPTZ" type="MPTZStruct" optional="true">
+      <description>MPTZPosition</description>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0001" side="server" define="MAX_PRESETS" type="int8u" optional="true" default="5">
+      <description>MaxPresets</description>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0002" side="server" define="PRESET_MPTZ_TABLE" type="array" entryType="MPTZPresetStruct" optional="true">
+      <description>MPTZPresets</description>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0003" side="server" define="MPTZ_RELATIVE_MOVE" type="array" optional="true" entryType="int16u">
+      <description>DPTZRelativeMove</description>
+      <mandatoryConform>
+        <feature name="DPTZ"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0004" side="server" define="DPTZ_RELATIVE_MOVE" type="int8u" optional="true" min="2" max="100" default="100">
+      <description>ZoomMax</description>
+      <mandatoryConform>
+        <feature name="MZOOM"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0005" side="server" define="TILT_MIN" type="int16s" min="-180" max="179" default="-90" optional="true">
+      <description>TiltMin</description>
+      <mandatoryConform>
+        <feature name="MTILT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0006" side="server" define="TILT_MAX" type="int16s" min="-179" max="180" default="90" optional="true">
+      <description>TiltMax</description>
+      <mandatoryConform>
+        <feature name="MTILT"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0007" side="server" define="PAN_MIN" type="int16s" min="-180" max="179" default="-180" optional="true">
+      <description>PanMin</description>
+      <mandatoryConform>
+        <feature name="MPAN"/>
+      </mandatoryConform>
+    </attribute>
+    <attribute code="0x0008" side="server" define="PAN_MAX" type="int16s" min="-179" max="180" default="180" optional="true">
+      <description>PanMax</description>
+      <mandatoryConform>
+        <feature name="MPAN"/>
+      </mandatoryConform>
+    </attribute>
+    <command code="0x00" source="client" name="MPTZSetPosition" optional="true">
       <description>This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ.</description>
       <arg id="0" name="Pan" type="int16s" optional="true"/>
       <arg id="1" name="Tilt" type="int16s" optional="true"/>
       <arg id="2" name="Zoom" type="int8u" optional="true" min="1" max="1"/>
+      <mandatoryConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </mandatoryConform>
     </command>
 
-    <command code="0x01" source="client" name="MptzRelativeMove" optional="true">
+    <command code="0x01" source="client" name="MPTZRelativeMove" optional="true">
       <description>This command SHALL move the device by the delta values relative to the currently defined position.</description>
       <arg id="0" name="PanDelta" type="int16s" default="0" optional="true"/>
       <arg id="1" name="TiltDelta" type="int16s" default="0" optional="true"/>
       <arg id="2" name="ZoomDelta" type="int8s" default="0" optional="true"/>
+      <optionalConform>
+        <orTerm>
+          <feature name="MPAN"/>
+          <feature name="MTILT"/>
+          <feature name="MZOOM"/>
+        </orTerm>
+      </optionalConform>
     </command>
 
-    <command code="0x02" source="client" name="MptzMoveToPreset" optional="true">
+    <command code="0x02" source="client" name="MPTZMoveToPreset" optional="true">
       <description>This command SHALL move the camera to the positions specified by the Preset passed.</description>
       <arg id="0" name="PresetID" type="int8u"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
     </command>
 
-    <command code="0x03" source="client" name="MptzSavePreset" optional="true">
+    <command code="0x03" source="client" name="MPTZSavePreset" optional="true">
       <description>This command allows creating a new preset or updating the values of an existing one.</description>
       <arg id="0" name="PresetID" type="int8u" optional="true"/>
       <arg id="1" name="Name" type="char_string" length="32"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
     </command>
 
-    <command code="0x04" source="client" name="MptzRemovePreset" optional="true">
+    <command code="0x04" source="client" name="MPTZRemovePreset" optional="true">
       <description>This command SHALL remove a preset entry from the PresetMptzTable.</description>
       <arg id="0" name="PresetID" type="int8u"/>
+      <mandatoryConform>
+        <feature name="MPRESETS"/>
+      </mandatoryConform>
     </command>
 
-    <command code="0x05" source="client" name="DptzSetViewport" optional="true">
+    <command code="0x05" source="client" name="DPTZSetViewport" optional="true">
       <description>This command allows for setting the digital viewport for a specific Video Stream.</description>
       <arg id="0" name="VideoStreamID" type="int16u"/>
       <arg id="1" name="Viewport" type="ViewportStruct"/>
+      <mandatoryConform>
+        <feature name="DPTZ"/>
+      </mandatoryConform>
     </command>
 
-    <command code="0x06" source="client" name="DptzRelativeMove" optional="true">
+    <command code="0x06" source="client" name="DPTZRelativeMove" optional="true">
       <description>This command SHALL change the viewports location by the amount specified in a relative fashion.</description>
       <arg id="0" name="VideoStreamID" type="int16u"/>
       <arg id="1" name="DeltaX" type="int16s" optional="true" default="0"/>
       <arg id="2" name="DeltaY" type="int16s" optional="true" default="0"/>
       <arg id="3" name="ZoomDelta" type="int8s" optional="true" default="0" min="-100" max="100"/>
+      <optionalConform>
+        <feature name="DPTZ"/>
+      </optionalConform>
     </command>
 
   </cluster>