Skip to content

Commit

Permalink
added pump and pump controller devices xml (#6920)
Browse files Browse the repository at this point in the history
* added pump and pump controller devices xml

* style stuff

* corrected pump device inconsistencies with draft spec
  • Loading branch information
janusheide authored and pull[bot] committed Jun 21, 2021
1 parent 3dc3700 commit dd09b7e
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 56 deletions.
56 changes: 0 additions & 56 deletions src/app/zap-templates/zcl/data-model/silabs/ha-devices.xml
Original file line number Diff line number Diff line change
Expand Up @@ -709,62 +709,6 @@ limitations under the License.
<include client="false" server="false" clientLocked="false" serverLocked="false">Partition</include>
</clusters>
</deviceType>
<deviceType>
<name>HA-pump</name>
<domain>HA</domain>
<typeName>HA Pump</typeName>
<zigbeeType>Coordinator</zigbeeType>
<profileId editable="false">0x0104</profileId>
<deviceId editable="false">0x0303</deviceId>
<clusters lockOthers="true">
<include client="false" server="true" clientLocked="true" serverLocked="true">Basic</include>
<include client="true" server="true" clientLocked="true" serverLocked="true">Identify</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Power Configuration</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Device Temperature Configuration</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Alarms</include>
<include client="false" server="true" clientLocked="true" serverLocked="true">Pump Configuration and Control</include>
<include client="false" server="true" clientLocked="true" serverLocked="true">On/off</include>
<include client="false" server="true" clientLocked="true" serverLocked="true">Scenes</include>
<include client="false" server="true" clientLocked="true" serverLocked="true">Groups</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Level control</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Pressure measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Temperature measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Flow measurement</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Poll Control</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Electrical Measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Time</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Over the Air Bootloading</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Partition</include>
</clusters>
</deviceType>
<deviceType>
<name>HA-pumpcontroller</name>
<domain>HA</domain>
<typeName>HA Pump Controller</typeName>
<zigbeeType>Coordinator</zigbeeType>
<profileId editable="false">0x0104</profileId>
<deviceId editable="false">0x0304</deviceId>
<clusters lockOthers="true">
<include client="false" server="true" clientLocked="true" serverLocked="true">Basic</include>
<include client="true" server="true" clientLocked="true" serverLocked="true">Identify</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Power Configuration</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Device Temperature Configuration</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Alarms</include>
<include client="true" server="false" clientLocked="true" serverLocked="true">Pump Configuration and Control</include>
<include client="true" server="false" clientLocked="true" serverLocked="true">On/off</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Scenes</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Groups</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Pressure measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Temperature measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Flow measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Level control</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Poll Control</include>
<include client="false" server="false" clientLocked="true" serverLocked="false">Electrical Measurement</include>
<include client="false" server="false" clientLocked="false" serverLocked="true">Time</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Over the Air Bootloading</include>
<include client="false" server="false" clientLocked="false" serverLocked="false">Partition</include>
</clusters>
</deviceType>
<deviceType>
<name>HA-pressuresensor</name>
<domain>HA</domain>
Expand Down
64 changes: 64 additions & 0 deletions src/app/zap-templates/zcl/pump-controller-device.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<deviceType>
<name>Pump Controller</name>
<domain>CHIP</domain>
<typeName>Pump Controller</typeName>
<profileId editable="false">0x0999</profileId>
<deviceId editable="false">0x0304</deviceId>
<clusters lockOthers="true">
<include cluster="Basic" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>VERSION</requireAttribute>
<requireAttribute>POWER_SOURCE</requireAttribute>
<requireCommand>ResetToFactoryDefaults</requireCommand>
<requireCommand>MfgSpecificPing</requireCommand>
</include>
<include cluster="Identify" client="true" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
<requireCommand>Identify</requireCommand>
<requireCommand>IdentifyQuery</requireCommand>
<requireCommand>IdentifyQueryResponse</requireCommand>
</include>
<include cluster="Groups" client="true" server="false" clientLocked="true" serverLocked="true">
</include>
<include cluster="Scenes" client="true" server="false" clientLocked="true" serverLocked="true">
</include>
<include cluster="On/off" client="true" server="false" clientLocked="true" serverLocked="true">
<requireAttribute>ON_OFF</requireAttribute>
<requireCommand>Off</requireCommand>
<requireCommand>On</requireCommand>
<requireCommand>Toggle</requireCommand>
</include>
<include cluster="Pump Configuration and Control" client="true" server="false" clientLocked="true" serverLocked="true">
<requireAttribute>MAX_PRESSURE</requireAttribute>
<requireAttribute>MAX_SPEED</requireAttribute>
<requireAttribute>MAX_FLOW</requireAttribute>
</include>
<include cluster="Level Control" client="true" server="false" clientLocked="true" serverLocked="true">
</include>
<include cluster="Temperature Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
</include>
<include cluster="Pressure Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
</include>
<include cluster="Flow Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
</include>
<!-- TODO add OTA software update -->
</clusters>
</deviceType>

</configurator>
97 changes: 97 additions & 0 deletions src/app/zap-templates/zcl/pump-device.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<deviceType>
<name>Pump</name>
<domain>CHIP</domain>
<typeName>Pump</typeName>
<profileId editable="false">0x0999</profileId>
<deviceId editable="false">0x0303</deviceId>
<clusters lockOthers="true">
<include cluster="Basic" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>VERSION</requireAttribute>
<requireAttribute>POWER_SOURCE</requireAttribute>
<requireCommand>ResetToFactoryDefaults</requireCommand>
<requireCommand>MfgSpecificPing</requireCommand>
</include>
<include cluster="Identify" client="true" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>IDENTIFY_TIME</requireAttribute>
<requireCommand>Identify</requireCommand>
<requireCommand>IdentifyQuery</requireCommand>
<requireCommand>IdentifyQueryResponse</requireCommand>
</include>
<include cluster="Groups" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>GROUP_NAME_SUPPORT</requireAttribute>
<requireCommand>AddGroup</requireCommand>
<requireCommand>AddGroupResponse</requireCommand>
<requireCommand>ViewGroup</requireCommand>
<requireCommand>ViewGroupResponse</requireCommand>
<requireCommand>GetGroupMembership</requireCommand>
<requireCommand>GetGroupMembershipResponse</requireCommand>
<requireCommand>RemoveGroup</requireCommand>
<requireCommand>RemoveGroupResponse</requireCommand>
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
<requireAttribute>SCENE_VALID</requireAttribute>
<requireAttribute>SCENE_NAME_SUPPORT</requireAttribute>
<requireCommand>AddScene</requireCommand>
<requireCommand>AddSceneResponse</requireCommand>
<requireCommand>ViewScene</requireCommand>
<requireCommand>ViewSceneResponse</requireCommand>
<requireCommand>RemoveScene</requireCommand>
<requireCommand>RemoveSceneResponse</requireCommand>
<requireCommand>RemoveAllScenes</requireCommand>
<requireCommand>RemoveAllScenesResponse</requireCommand>
<requireCommand>StoreScene</requireCommand>
<requireCommand>StoreSceneResponse</requireCommand>
<requireCommand>RecallScene</requireCommand>
<requireCommand>GetSceneMembership</requireCommand>
<requireCommand>GetSceneMembershipResponse</requireCommand>
</include>
<include cluster="On/off" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>ON_OFF</requireAttribute>
<requireCommand>Off</requireCommand>
<requireCommand>On</requireCommand>
<requireCommand>Toggle</requireCommand>
</include>
<include cluster="Pump Configuration and Control" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>MAX_PRESSURE</requireAttribute>
<requireAttribute>MAX_SPEED</requireAttribute>
<requireAttribute>MAX_FLOW</requireAttribute>
<requireAttribute>EffectiveOperationMode</requireAttribute>
<requireAttribute>EffectiveControlMode</requireAttribute>
<requireAttribute>Capasity</requireAttribute>
<requireAttribute>OperationMode</requireAttribute>
</include>
<include cluster="Level Control" client="false" server="true" clientLocked="true" serverLocked="true">
</include>
<include cluster="Temperature Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
</include>
<include cluster="Pressure Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
</include>
<include cluster="Flow Measurement" client="true" server="true" clientLocked="true" serverLocked="true">
</include>
<!-- TODO add OTA software update -->
</clusters>
</deviceType>

</configurator>
2 changes: 2 additions & 0 deletions src/app/zap-templates/zcl/zcl.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"ha.xml",
"ha-devices.xml",
"pump-configuration-and-control-cluster.xml",
"pump-device.xml",
"pump-controller-device.xml",
"cba.xml",
"cba-devices.xml",
"ota.xml",
Expand Down

0 comments on commit dd09b7e

Please sign in to comment.