Remove Alarms/Poll Control non-Matter clusters from Matter devices XML (#21818)
* Remove Alarms/Poll Control non-Matter clusters from Matter devices XML
This is a follow up to commit e9960d4a577a ("Remove various non-Matter
clusters from Matter XML.").
* More Clusters removal
* Remove IAS Zone cluster reference as well
* Readd Power Source Configuration
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index a29ade6..2231d82 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -1602,10 +1602,7 @@
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Door Lock" client="false" server="true" clientLocked="true" serverLocked="true"></include>
- <include cluster="Alarms" client="false" server="false" clientLocked="true" serverLocked="false"></include>
- <include cluster="Poll Control" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Electrical Measurement" client="false" server="false" clientLocked="true" serverLocked="false"></include>
- <include cluster="Time" client="false" server="false" clientLocked="false" serverLocked="true"></include>
<include cluster="Time Synchronization" client="false" server="false" clientLocked="false" serverLocked="false"></include>
</clusters>
</deviceType>
@@ -1791,7 +1788,6 @@
<include cluster="Fan Control" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Level Control" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="On/Off" client="false" server="true" clientLocked="true" serverLocked="true"></include>
- <include cluster="Time" client="false" server="false" clientLocked="false" serverLocked="true"></include>
</clusters>
</deviceType>
<deviceType>
@@ -1850,14 +1846,12 @@
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
- <include cluster="Alarms" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Thermostat" client="false" server="true" clientLocked="true" serverLocked="true"></include>
<include cluster="Thermostat User Interface Configuration" client="false" server="false" clientLocked="true" serverLocked="false"></include>
<include cluster="Fan Control" client="false" server="false" clientLocked="false" serverLocked="false"></include>
<include cluster="Temperature Measurement" client="false" server="false" clientLocked="false" serverLocked="false"></include>
<include cluster="Occupancy Sensing" client="false" server="false" clientLocked="false" serverLocked="false"></include>
<include cluster="Relative Humidity Measurement" client="false" server="false" clientLocked="false" serverLocked="false"></include>
- <include cluster="Time" client="false" server="false" clientLocked="false" serverLocked="true"></include>
</clusters>
</deviceType>
<deviceType>
@@ -2181,9 +2175,6 @@
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
- <include cluster="IAS Zone" client="false" server="true" clientLocked="true" serverLocked="true">
- <requireCommand>ZoneEnrollResponse</requireCommand>
- </include>
<include cluster="Level Control" client="true" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>CURRENT_LEVEL</requireAttribute>
<requireCommand>MoveToLevel</requireCommand>