Pull from latest master spec (#30150)

project-chip · Nov 18, 2023 · 3314497 · 3314497
1 parent 1c9e64b
commit 3314497
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/data_model/clusters/DemandResponseLoadControl.xml b/data_model/clusters/DemandResponseLoadControl.xml
@@ -317,15 +317,15 @@ Davis, CA 95616, USA
         <mandatoryConform>
           <feature name="TEMPS"/>
         </mandatoryConform>
-        <constraint type="between" from="0x954d" to="0x7fff"/>
+        <constraint type="between" from="0x954D" to="0x7FFF"/>
       </field>
       <field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
         <access read="true" write="true"/>
         <quality nullable="true"/>
         <mandatoryConform>
           <feature name="TEMPS"/>
         </mandatoryConform>
-        <constraint type="between" from="0x954d" to="0x7fff"/>
+        <constraint type="between" from="0x954D" to="0x7FFF"/>
       </field>
     </struct>
   </dataTypes>

diff --git a/data_model/clusters/DiagnosticsWiFi.xml b/data_model/clusters/DiagnosticsWiFi.xml
@@ -57,7 +57,7 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="WiFi Network Diagnostics" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="Wi-Fi Network Diagnostics" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>

diff --git a/data_model/clusters/EVSE-Attributes.xml b/data_model/clusters/EVSE-Attributes.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-Classification.xml b/data_model/clusters/EVSE-Classification.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-ClusterID.xml b/data_model/clusters/EVSE-ClusterID.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-Commands.xml b/data_model/clusters/EVSE-Commands.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-DataTypes.xml b/data_model/clusters/EVSE-DataTypes.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-Definitions.xml b/data_model/clusters/EVSE-Definitions.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-Dependencies.xml b/data_model/clusters/EVSE-Dependencies.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-Events.xml b/data_model/clusters/EVSE-Events.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-Features.xml b/data_model/clusters/EVSE-Features.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/EVSE-RevisionHistory.xml b/data_model/clusters/EVSE-RevisionHistory.xml
@@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
 this cluster.
 
 Note that in many deployments the EVSE may be outside the home and may suffer
-from intermittent network connections (e.g. a weak WiFi signal). It also allows
+from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
 for a charging profile to be pre-configured, in case there is a temporary
 communications loss during a charging session.
 -->

diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml
@@ -126,7 +126,7 @@ Davis, CA 95616, USA
       <item value="2" name="5G" summary="5GHz - 5.150GHz to 5.895GHz (802.11a/n/ac/ax)">
         <optionalConform choice="a" more="true"/>
       </item>
-      <item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / WiFi 6E)">
+      <item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / Wi-Fi 6E)">
         <optionalConform choice="a" more="true"/>
       </item>
       <item value="4" name="60G" summary="60GHz - 57.24GHz to 70.20GHz (802.11ad/ay)">

diff --git a/data_model/clusters/OnOff.xml b/data_model/clusters/OnOff.xml
@@ -73,7 +73,7 @@ Davis, CA 95616, USA
         </notTerm>
       </optionalConform>
     </feature>
-    <feature bit="1" code="DF" name="DeadFrontBehaviour" summary="Device has DeadFrontBehaviour Feature">
+    <feature bit="1" code="DF" name="DeadFrontBehavior" summary="Device has DeadFrontBehavior Feature">
       <optionalConform>
         <notTerm>
           <feature name="OFFONLY"/>

diff --git a/data_model/clusters/Timer.xml b/data_model/clusters/Timer.xml
@@ -119,7 +119,7 @@ Davis, CA 95616, USA
         <constraint type="desc"/>
       </field>
     </command>
-    <command id="0x02" name="ReduceTime" response="Y">
+    <command id="0x03" name="ReduceTime" response="Y">
       <access invokePrivilege="operate"/>
       <optionalConform/>
       <field id="0" name="TimeReduction" type="elapsed-s">

diff --git a/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml b/data_model/clusters/bridge-clusters-BridgedDeviceBasicInformation.xml
@@ -127,7 +127,7 @@ Davis, CA 95616, USA
       <optionalConform/>
     </attribute>
     <attribute id="0x0015" name="SpecificationVersion">
-      <optionalConform/>
+      <disallowConform/>
     </attribute>
     <attribute id="0x0016" name="MaxPathsPerInvoke">
       <disallowConform/>

diff --git a/data_model/spec_sha b/data_model/spec_sha
@@ -1 +1 @@
-6be044cb0a9bb333b70ccf9f70074afeb440b3cb
+17cfdc4a04397eec62f1bce7984cace268b28ab3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6be044cb0a9bb333b70ccf9f70074afeb440b3cb
		17cfdc4a04397eec62f1bce7984cace268b28ab3