Merge branch 'master' into camera-chime

Author: gmarcosb

data_model/in_progress/clusters/ACL-Cluster.xml data_model/1.4/clusters/ACL-Cluster.xml

@@ -60,7 +60,7 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0028" name="Basic Information"/>
@@ -303,11 +303,6 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="1"/>
     </attribute>
-    <attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform/>
-    </attribute>
   </attributes>
   <events>
     <event id="0x00" name="StartUp" priority="critical">

data_model/in_progress/clusters/AccountLogin.xml data_model/1.4/clusters/AccountLogin.xml

@@ -116,7 +116,7 @@ Davis, CA 95616, USA
       </field>
       <field id="2" name="Discriminator" type="uint16">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="4095"/>
+        <constraint type="max" value="4095"/>
       </field>
       <field id="3" name="Iterations" type="uint32">
         <mandatoryConform/>

data_model/in_progress/clusters/AdminCommissioningCluster.xml data_model/1.4/clusters/AdminCommissioningCluster.xml

@@ -263,6 +263,7 @@ Davis, CA 95616, USA
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0009" name="DoNotUse">
+      <access read="true" readPrivilege="view"/>
       <disallowConform/>
     </attribute>
   </attributes>

data_model/in_progress/clusters/AirQuality.xml data_model/1.4/clusters/AirQuality.xml

@@ -64,6 +64,11 @@ Davis, CA 95616, USA
     <clusterId id="0x0030" name="General Commissioning"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="CGEN" scope="Node"/>
+  <features>
+    <feature bit="0" code="TC" name="TermsAndConditions" summary="Supports Terms &amp; Conditions acknowledgement">
+      <provisionalConform/>
+    </feature>
+  </features>
   <dataTypes>
     <enum name="CommissioningErrorEnum">
       <item value="0" name="OK" summary="No error">
@@ -81,6 +86,21 @@ Davis, CA 95616, USA
       <item value="4" name="BusyWithOtherAdmin" summary="[[ref_BusyWithOtherAdmin]] Attempting to arm fail-safe or execute CommissioningComplete from a fabric different than the one associated with the current fail-safe context.">
         <mandatoryConform/>
       </item>
+      <item value="5" name="RequiredTCNotAccepted" summary="[[ref_RequiredTCNotAccepted]] One or more required TC features from the Enhanced Setup Flow were not accepted.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+      <item value="6" name="TCAcknowledgementsNotReceived" summary="[[ref_TCAcknowledgementsNotReceived, TCAcknowledgementsNotReceived]] No acknowledgements from the user for the TC features were received.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
+      <item value="7" name="TCMinVersionNotMet" summary="[[ref_TCMinVersionNotMet, TCMinVersionNotMet]] The version of the TC features acknowledged by the user did not meet the minimum required version.">
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </item>
     </enum>
     <enum name="RegulatoryLocationTypeEnum">
       <item value="0" name="Indoor" summary="Indoor only">
@@ -131,37 +151,52 @@ Davis, CA 95616, USA
     <attribute id="0x0005" name="TCAcceptedVersion" type="uint16">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0006" name="TCMinRequiredVersion" type="uint16">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0007" name="TCAcknowledgements" type="map16">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0008" name="TCAcknowledgementsRequired" type="bool" default="true">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
     <attribute id="0x0009" name="TCUpdateDeadline" type="uint32">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
     </attribute>
   </attributes>
   <commands>
@@ -223,9 +258,12 @@ Davis, CA 95616, USA
     </command>
     <command id="0x06" name="SetTCAcknowledgements" direction="commandToServer" response="SetTCAcknowledgementsResponse">
       <access invokePrivilege="admin"/>
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
       <field id="0" name="TCVersion" type="uint16">
         <mandatoryConform/>
       </field>
@@ -234,9 +272,15 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x07" name="SetTCAcknowledgementsResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <feature name="TC"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="TC"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <field id="0" name="ErrorCode" type="CommissioningErrorEnum" default="OK">
+        <mandatoryConform/>
+      </field>
     </command>
   </commands>
 </cluster>

data_model/in_progress/clusters/AlarmBase.xml data_model/1.4/clusters/AlarmBase.xml

@@ -220,7 +220,7 @@ Davis, CA 95616, USA
     <command id="0x04" name="KeySetReadAllIndices Command" direction="commandToServer" response="KeySetReadAllIndicesResponse Command">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="reserved">
+      <field id="0" name="DoNotUse">
         <disallowConform/>
       </field>
     </command>

data_model/in_progress/clusters/ApplicationBasic.xml data_model/1.4/clusters/ApplicationBasic.xml

@@ -103,7 +103,6 @@ Davis, CA 95616, USA
   </features>
   <dataTypes>
     <number name="ClientType Field" type=""/>
-    <number name="UserActiveModeTriggerBitmap" type=""/>
     <enum name="OperatingModeEnum">
       <item value="0" name="SIT" summary="ICD is operating as a Short Idle Time ICD.">
         <mandatoryConform/>
@@ -112,6 +111,59 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </item>
     </enum>
+    <bitmap name="UserActiveModeTriggerBitmap">
+      <bitfield name="PowerCycle" bit="0" summary="Power Cycle to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SettingsMenu" bit="1" summary="Settings menu on the device informs how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="CustomInstruction" bit="2" summary="Custom Instruction on how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="DeviceManual" bit="3" summary="Device Manual informs how to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensor" bit="4" summary="Actuate Sensor to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorSeconds" bit="5" summary="Actuate Sensor for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorTimes" bit="6" summary="Actuate Sensor N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ActuateSensorLightsBlink" bit="7" summary="Actuate Sensor until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButton" bit="8" summary="Press Reset Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonLightsBlink" bit="9" summary="Press Reset Button until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonSeconds" bit="10" summary="Press Reset Button for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="ResetButtonTimes" bit="11" summary="Press Reset Button N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButton" bit="12" summary="Press Setup Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonSeconds" bit="13" summary="Press Setup Button for N seconds to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonLightsBlink" bit="14" summary="Press Setup Button until light blinks to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="SetupButtonTimes" bit="15" summary="Press Setup Button N times to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+      <bitfield name="AppDefinedButton" bit="16" summary="Press the N Button to transition the device to ActiveMode">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
     <struct name="MonitoringRegistrationStruct">
       <field id="1" name="CheckInNodeID" type="node-id">
         <access fabricSensitive="true"/>

data_model/in_progress/clusters/ApplicationLauncher.xml data_model/1.4/clusters/ApplicationLauncher.xml

@@ -60,7 +60,9 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
-    <clusterId id="0x0752" name="Joint Fabric Datastore Cluster"/>
+    <clusterId id="0x0752" name="Joint Fabric Datastore Cluster">
+      <provisionalConform/>
+    </clusterId>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="JFDS" scope="Node"/>
   <dataTypes>

data_model/in_progress/clusters/AudioOutput.xml data_model/1.4/clusters/AudioOutput.xml

@@ -60,7 +60,9 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
-    <clusterId id="0x0753" name="Joint Fabric PKI"/>
+    <clusterId id="0x0753" name="Joint Fabric PKI">
+      <provisionalConform/>
+    </clusterId>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="JFPKI" scope="Node"/>
   <dataTypes>
@@ -121,18 +123,17 @@ Davis, CA 95616, USA
         <constraint type="maxLength" value="400"/>
       </field>
     </command>
-    <command id="0x02" name="Transfer Anchor Request Command" direction="commandToClient" response="Transfer Anchor Response Command">
+    <command id="0x02" name="Transfer Anchor Request Command" direction="commandToServer" response="Transfer Anchor Response Command">
       <access invokePrivilege="admin"/>
       <mandatoryConform/>
     </command>
-    <command id="0x03" name="Transfer Anchor Response Command" direction="responseFromClient">
-      <access invokePrivilege="admin"/>
+    <command id="0x03" name="Transfer Anchor Response Command" direction="responseFromServer">
       <mandatoryConform/>
       <field id="0" name="ref_TransferAnchorResponseStatusCode" type="Transfer Anchor Response Status Enum">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x04" name="Transfer Anchor Complete Command" direction="commandToClient" response="Y">
+    <command id="0x04" name="Transfer Anchor Complete Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin"/>
       <mandatoryConform/>
     </command>

data_model/in_progress/clusters/BallastConfiguration.xml data_model/1.4/clusters/BallastConfiguration.xml

@@ -136,7 +136,7 @@ Davis, CA 95616, USA
       <optionalConform>
         <feature name="LT"/>
       </optionalConform>
-      <constraint type="min" value="1"/>
+      <constraint type="between" from="1" to="254"/>
     </attribute>
     <attribute id="0x0002" name="MinLevel" type="uint8" default="0">
       <access read="true" readPrivilege="view"/>
@@ -145,6 +145,7 @@ Davis, CA 95616, USA
           <feature name="LT"/>
         </notTerm>
       </optionalConform>
+      <constraint type="max" value="254"/>
     </attribute>
     <attribute id="0x0003" name="MaxLevel" type="uint8" default="254">
       <access read="true" readPrivilege="view"/>

data_model/in_progress/clusters/BasicInformationCluster.xml data_model/1.4/clusters/BasicInformationCluster.xml

@@ -185,7 +185,7 @@ Davis, CA 95616, USA
         <mandatoryConform>
           <feature name="TH"/>
         </mandatoryConform>
-        <constraint type="between" from="0" to="65534"/>
+        <constraint type="max" value="65534"/>
       </field>
       <field id="1" name="ExtendedPanId" type="uint64">
         <mandatoryConform>
@@ -452,7 +452,7 @@ Davis, CA 95616, USA
       </field>
       <field id="2" name="NetworkIndex" type="uint8">
         <optionalConform/>
-        <constraint type="between" from="0" to="MaxNetworks - 1"/>
+        <constraint type="max" value="MaxNetworks - 1"/>
       </field>
     </command>
     <command id="0x06" name="ConnectNetwork" direction="commandToServer" response="ConnectNetworkResponse">

data_model/in_progress/clusters/Binding-Cluster.xml data_model/1.4/clusters/Binding-Cluster.xml

@@ -264,7 +264,7 @@ Davis, CA 95616, USA
         <mandatoryConform/>
         <constraint type="maxLength" value="16"/>
       </field>
-      <field id="3" name="CaseAdminSubject" type="SubjectID">
+      <field id="3" name="CaseAdminSubject" type="ref_SubjectId">
         <mandatoryConform/>
       </field>
       <field id="4" name="AdminVendorId" type="vendor-id">

data_model/in_progress/clusters/BooleanState.xml data_model/1.4/clusters/BooleanState.xml

@@ -67,10 +67,10 @@ Davis, CA 95616, USA
   <classification hierarchy="base" role="utility" picsCode="PS" scope="Node"/>
   <features>
     <feature bit="0" code="WIRED" name="Wired" summary="A wired power source">
-      <optionalConform/>
+      <optionalConform choice="a"/>
     </feature>
     <feature bit="1" code="BAT" name="Battery" summary="A battery power source">
-      <optionalConform/>
+      <optionalConform choice="a"/>
     </feature>
     <feature bit="2" code="RECHG" name="Rechargeable" summary="A rechargeable battery power source">
       <optionalConform>
@@ -636,7 +636,7 @@ Davis, CA 95616, USA
       <optionalConform>
         <feature name="BAT"/>
       </optionalConform>
-      <constraint type="between" from="0" to="200"/>
+      <constraint type="max" value="200"/>
     </attribute>
     <attribute id="0x000D" name="BatTimeRemaining" type="uint32">
       <access read="true" readPrivilege="view"/>

data_model/in_progress/clusters/BooleanStateConfiguration.xml data_model/1.4/clusters/BooleanStateConfiguration.xml

@@ -227,7 +227,6 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <field id="0" name="Status" type="SkipAreaStatus">
         <mandatoryConform/>
-        <constraint type="desc"/>
       </field>
       <field id="1" name="StatusText" type="string">
         <mandatoryConform/>