Cleanup to sync bitmap feature and features

JIRA: ZAPP-1346

Author: brdandu

src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml

@@ -41,15 +41,6 @@ limitations under the License.
       <feature bit="4" code="SCR" name="ScheduledContentRating" summary="Supports managing content controls based upon rating threshold for scheduled content.">
         <optionalConform/>
       </feature>
-      <feature bit="5" code="BC" name="BlockChannels" summary="Supports managing a set of channels that are prohibited.">
-        <optionalConform/>
-      </feature>
-      <feature bit="6" code="BA" name="BlockApplications" summary="Supports managing a set of applications that are prohibited.">
-        <optionalConform/>
-      </feature>
-      <feature bit="7" code="BTW" name="BlockContentTimeWindow" summary="Supports managing content controls based upon setting time window in which all contents and applications SHALL be blocked.">
-        <optionalConform/>
-      </feature>
     </features>
 
     <attribute side="server" code="0x0000" define="ENABLED" type="boolean" writable="false" optional="false">Enabled</attribute>

src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml

@@ -26,24 +26,6 @@ limitations under the License.
     <description>This cluster provides an interface for launching content on a media player device such as a TV or Speaker.</description>
     <globalAttribute side="either" code="0xFFFD" value="1"/>
 
-    <features>
-      <feature bit="0" code="CS" name="ContentSearch" summary="Device supports content search (non-app specific)">
-        <optionalConform/>
-      </feature>
-      <feature bit="1" code="UP" name="URLPlayback" summary="Device supports basic URL-based file playback">
-        <optionalConform/>
-      </feature>
-      <feature bit="2" code="AS" name="AdvancedSeek" summary="Enables clients to implement more advanced media seeking behavior in their user interface, such as for example a &quot;seek bar&quot;.">
-        <optionalConform/>
-      </feature>
-      <feature bit="3" code="TT" name="TextTracks" summary="Device or app supports Text Tracks.">
-        <optionalConform/>
-      </feature>
-      <feature bit="4" code="AT" name="AudioTracks" summary="Device or app supports Audio Tracks.">
-        <optionalConform/>
-      </feature>
-    </features>
-
     <attribute side="server" code="0x0000" define="CONTENT_LAUNCHER_ACCEPT_HEADER"                 type="array" entryType="char_string" length="254" writable="false" optional="true">AcceptHeader</attribute>
     <attribute side="server" code="0x0001" define="CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS" type="SupportedProtocolsBitmap" default="0"                       writable="false"  optional="true">SupportedStreamingProtocols</attribute>
 
@@ -194,4 +176,13 @@ limitations under the License.
     <field name="HLS" mask="0x2"/>
   </bitmap>
 
+  <bitmap name="Feature" type="bitmap32">
+     <cluster code="0x050a"/>
+     <field name="ContentSearch" mask="0x1"/>
+     <field name="URLPlayback" mask="0x2"/>
+     <field name="AdvancedSeek" mask="0x3"/>
+     <field name="TextTracks" mask="0x4"/>
+     <field name="AudioTracks" mask="0x5"/>
+   </bitmap>
+
 </configurator>

src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml

@@ -65,10 +65,10 @@ limitations under the License.
         </globalAttribute>
 
         <features>
-            <feature bit="0" code="PIN" name="PINCredential" summary="Lock supports PIN credentials (via keypad, or over-the-air)">
+            <feature bit="0" code="PIN" name="PinCredential" summary="Lock supports PIN credentials (via keypad, or over-the-air)">
             <optionalConform/>
             </feature>
-            <feature bit="1" code="RID" name="RFIDCredential" summary="Lock supports RFID credentials">
+            <feature bit="1" code="RID" name="RfidCredential" summary="Lock supports RFID credentials">
             <optionalConform/>
             </feature>
             <feature bit="2" code="FGP" name="FingerCredentials" summary="Lock supports finger related credentials (fingerprint, finger vein)">
@@ -92,7 +92,7 @@ limitations under the License.
                 <optionalConform/>
             </otherwiseConform>
             </feature>
-            <feature bit="7" code="COTA" name="CredentialOverTheAirAccess" summary="PIN codes over-the-air supported for lock/unlock operations">
+            <feature bit="7" code="COTA" name="CredentialsOverTheAirAccess" summary="PIN codes over-the-air supported for lock/unlock operations">
             <optionalConform/>
             </feature>
             <feature bit="8" code="USR" name="User" summary="Lock supports the user commands and database">
@@ -114,7 +114,13 @@ limitations under the License.
             <feature bit="11" code="HDSCH" name="HolidaySchedules" summary="Lock supports holiday schedules">
             <optionalConform/>
             </feature>
-            <feature bit="12" code="UBOLT" name="Unbolting" summary="Lock supports unbolting">
+            <feature bit="12" code="UBOLT" name="Unbolt" summary="Lock supports unbolting">
+            <optionalConform/>
+            </feature>
+            <feature bit="13" code="ALIRO" name="AliroProvisioning" summary="AliroProvisioning">
+            <optionalConform/>
+            </feature>
+            <feature bit="14" code="ALBU" name="AliroBLEUWB" summary="AliroBLEUWB">
             <optionalConform/>
             </feature>
         </features>

src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml

@@ -29,12 +29,6 @@ limitations under the License.
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
 
-    <features>
-      <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
-        <disallowConform/>
-      </feature>
-    </features>
-
     <attribute side="server" code="0x0000" define="MASK" type="AlarmBitmap" default="0" writable="false" optional="false">Mask</attribute>
     <attribute side="server" code="0x0002" define="STATE" type="AlarmBitmap" default="0" writable="false" optional="false">State</attribute>
     <attribute side="server" code="0x0003" define="SUPPORTED" type="AlarmBitmap" default="0" writable="false" optional="false">Supported</attribute>

src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml

@@ -40,7 +40,7 @@ limitations under the License.
       <feature bit="0" code="SMOKE" name="SmokeAlarm" summary="Supports Smoke alarm">
         <optionalConform choice="a" more="true"/>
       </feature>
-      <feature bit="1" code="CO" name="COAlarm" summary="Supports CO alarm">
+      <feature bit="1" code="CO" name="CoAlarm" summary="Supports CO alarm">
         <optionalConform choice="a" more="true"/>
       </feature>
     </features>

src/app/zap-templates/zcl/data-model/chip/timer-cluster.xml

@@ -38,6 +38,13 @@ limitations under the License.
 
         <globalAttribute side="either" code="0xFFFD" value="1" />
 
+        <features>
+            <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset timer">
+                <optionalConform/>
+            </feature>
+        </features>
+
+
         <attribute side="server" code="0x0000" define="SET_TIME" type="elapsed_s"  writable="false" isNullable="false" optional="false">SetTime</attribute>
         <attribute side="server" code="0x0001" define="TIME_REMAINING" type="elapsed_s"  writable="false"  isNullable="false"   optional="false">TimeRemaining</attribute>
         <attribute side="server" code="0x0002" define="TIMER_STATE" type="TimerStatusEnum"  writable="false"  isNullable="false"   optional="false">TimerState</attribute>