From 1c44dae090da9dbcccc0733e2a3337ab59c8fff6 Mon Sep 17 00:00:00 2001
From: cecille <cecille@google.com>
Date: Wed, 18 Oct 2023 14:00:36 -0400
Subject: [PATCH] Use the 1.2 tag for initial upload

---
 data_model/clusters/ModeBase.xml |  3 +--
 data_model/clusters/OnOff.xml    | 37 +++++---------------------------
 data_model/spec_sha              |  2 +-
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/data_model/clusters/ModeBase.xml b/data_model/clusters/ModeBase.xml
index fc04fb991752c9..7c0e4ae07648b7 100644
--- a/data_model/clusters/ModeBase.xml
+++ b/data_model/clusters/ModeBase.xml
@@ -55,10 +55,9 @@ 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="" name="Mode Base" revision="2">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Mode Base" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial version"/>
-    <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
   </revisionHistory>
   <classification hierarchy="base" role="application" picsCode="MODB" scope="Endpoint"/>
   <features>
diff --git a/data_model/clusters/OnOff.xml b/data_model/clusters/OnOff.xml
index 3c79220ecd67fc..6faa08547a8eb8 100644
--- a/data_model/clusters/OnOff.xml
+++ b/data_model/clusters/OnOff.xml
@@ -55,40 +55,21 @@ 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="0x0006" name="On/Off" revision="6">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0006" name="On/Off" revision="5">
   <revisionHistory>
     <revision revision="1" summary="Global mandatory ClusterRevision attribute added; CCB 1555"/>
     <revision revision="2" summary="ZLO 1.0: StartUpOnOff"/>
     <revision revision="3" summary="FeatureMap global attribute support with Level Control and Lighting feature"/>
     <revision revision="4" summary="New data model format and notation"/>
     <revision revision="5" summary="Addition of Dead Front behavior and associated FeatureMap entry"/>
-    <revision revision="6" summary="Addition of OffOnly feature and associated FeatureMap entry"/>
   </revisionHistory>
   <classification hierarchy="base" role="application" picsCode="OO" scope="Endpoint"/>
   <features>
     <feature bit="0" code="LT" name="Lighting" summary="Behavior that supports lighting applications.">
-      <optionalConform>
-        <notTerm>
-          <feature name="OFFONLY"/>
-        </notTerm>
-      </optionalConform>
+      <optionalConform/>
     </feature>
     <feature bit="1" code="DF" name="DeadFrontBehaviour" summary="Device has DeadFrontBehaviour Feature">
-      <optionalConform>
-        <notTerm>
-          <feature name="OFFONLY"/>
-        </notTerm>
-      </optionalConform>
-    </feature>
-    <feature bit="2" code="OFFONLY" name="OffOnly" summary="Device supports the OffOnly Feature feature">
-      <optionalConform>
-        <notTerm>
-          <orTerm>
-            <feature name="LT"/>
-            <feature name="DF"/>
-          </orTerm>
-        </notTerm>
-      </optionalConform>
+      <optionalConform/>
     </feature>
   </features>
   <dataTypes>
@@ -177,19 +158,11 @@ Davis, CA 95616, USA
     </command>
     <command id="0x01" name="On" response="Y">
       <access invokePrivilege="operate"/>
-      <mandatoryConform>
-        <notTerm>
-          <feature name="OFFONLY"/>
-        </notTerm>
-      </mandatoryConform>
+      <mandatoryConform/>
     </command>
     <command id="0x02" name="Toggle" response="Y">
       <access invokePrivilege="operate"/>
-      <mandatoryConform>
-        <notTerm>
-          <feature name="OFFONLY"/>
-        </notTerm>
-      </mandatoryConform>
+      <mandatoryConform/>
     </command>
     <command id="0x40" name="OffWithEffect" response="Y">
       <access invokePrivilege="operate"/>
diff --git a/data_model/spec_sha b/data_model/spec_sha
index ce76099dc92d4e..7229ef3c31127b 100644
--- a/data_model/spec_sha
+++ b/data_model/spec_sha
@@ -1 +1 @@
-e9fd0c9102e94d747e7987a055b8ae6bf04cd8a2
+472add052fa00d436207faecd5ea9a5759c4b2ce