More cluster access privileges updated (#17134)

In general.xml: - Groups - Scenes - LevelControl In ha.xml: - ThermostatUserInterfaceConfiguration - ColorControl - OccupancySensing
project-chip · Apr 6, 2022 · 48a1345 · 48a1345
1 parent f7b39db
commit 48a1345
Show file tree

Hide file tree

Showing 13 changed files with 470 additions and 24 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml
@@ -191,6 +191,7 @@ limitations under the License.
  </description>
  <arg name="groupId" type="group_id"/>
  <arg name="groupName" type="CHAR_STRING"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x01" name="ViewGroup" response="ViewGroupResponse" optional="false" cli="zcl groups view">
  <description>
@@ -209,18 +210,21 @@ limitations under the License.
  Command description for RemoveGroup
  </description>
  <arg name="groupId" type="group_id"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x04" name="RemoveAllGroups" optional="false" cli="zcl groups rmall">
  <description>
  Command description for RemoveAllGroups
  </description>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x05" name="AddGroupIfIdentifying" optional="false" cli="zcl groups add-if-id">
  <description>
  Command description for AddGroupIfIdentifying
  </description>
  <arg name="groupId" type="group_id"/>
  <arg name="groupName" type="CHAR_STRING"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="server" code="0x00" name="AddGroupResponse" optional="false" disableDefaultResponse="true">
  <description>
@@ -277,6 +281,7 @@ limitations under the License.
  <arg name="transitionTime" type="INT16U"/>
  <arg name="sceneName" type="CHAR_STRING"/>
  <arg name="extensionFieldSets" type="SceneExtensionFieldSet" array="true"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x01" name="ViewScene" response="ViewSceneResponse" optional="false" cli="zcl scenes view">
  <description>
@@ -291,19 +296,22 @@ limitations under the License.
  </description>
  <arg name="groupId" type="INT16U"/>
  <arg name="sceneId" type="INT8U"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x03" name="RemoveAllScenes" response="RemoveAllScenesResponse" optional="false" cli="zcl scenes rmall">
  <description>
  Command description for RemoveAllScenes
  </description>
  <arg name="groupId" type="INT16U"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x04" name="StoreScene" response="StoreSceneResponse" optional="false" cli="zcl scenes store">
  <description>
  Command description for StoreScene
  </description>
  <arg name="groupId" type="INT16U"/>
  <arg name="sceneId" type="INT8U"/>
+ <access op="invoke" role="manage"/>
  </command>
  <command source="client" code="0x05" name="RecallScene" optional="false" cli="zcl scenes recall">
  <description>
@@ -406,7 +414,11 @@ limitations under the License.
  <attribute side="server" code="0x0013" define="OFF_TRANSITION_TIME" type="INT16U" isNullable="true" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">off transition time</attribute>
  <attribute side="server" code="0x0014" define="DEFAULT_MOVE_RATE" type="INT8U" isNullable="true" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">default move rate</attribute>
  <attribute side="server" code="0x000F" define="OPTIONS" type="BITMAP8" min="0x00" max="0x03" writable="true" default="0x00" optional="true" introducedIn="l&amp;o-1.0-15-0014-04">options</attribute>
- <attribute side="server" code="0x4000" define="START_UP_CURRENT_LEVEL" type="INT8U" isNullable="true" writable="true" optional="true" introducedIn="l&amp;o-1.0-15-0014-04">start up current level</attribute>
+ <attribute side="server" code="0x4000" define="START_UP_CURRENT_LEVEL" type="INT8U" isNullable="true" writable="true" optional="true" introducedIn="l&amp;o-1.0-15-0014-04">
+ <description>start up current level</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <command source="client" code="0x00" name="MoveToLevel" optional="false" cli="zcl level-control mv-to-level">
  <description>
  Command description for MoveToLevel

diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -84,8 +84,16 @@ limitations under the License.
  <client tick="false" init="false">true</client>
  <server tick="false" tickFrequency="half" init="false">true</server>
  <attribute side="server" code="0x0000" define="TEMPERATURE_DISPLAY_MODE" type="ENUM8" min="0x00" max="0x01" writable="true" default="0x00" optional="false">temperature display mode</attribute>
- <attribute side="server" code="0x0001" define="KEYPAD_LOCKOUT" type="ENUM8" min="0x00" max="0x05" writable="true" default="0x00" optional="false">keypad lockout</attribute>
- <attribute side="server" code="0x0002" define="SCHEDULE_PROGRAMMING_VISIBILITY" type="ENUM8" min="0x00" max="0x01" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">schedule programming visibility</attribute>
+ <attribute side="server" code="0x0001" define="KEYPAD_LOCKOUT" type="ENUM8" min="0x00" max="0x05" writable="true" default="0x00" optional="false">
+ <description>keypad lockout</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0002" define="SCHEDULE_PROGRAMMING_VISIBILITY" type="ENUM8" min="0x00" max="0x01" writable="true" optional="true" introducedIn="ha-1.2-05-3520-29">
+ <description>schedule programming visibility</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  </cluster>
  <cluster>
  <name>Color Control</name>
@@ -154,30 +162,78 @@ limitations under the License.
  <!-- PRIMARY_6_Y -->
  <attribute side="server" code="0x002A" define="COLOR_CONTROL_PRIMARY_6_INTENSITY" type="INT8U" min="0x00" max="0xFF" writable="false" optional="true">primary 6 intensity</attribute>
  <!-- PRIMARY_6_INTENSITY -->
- <attribute side="server" code="0x0030" define="COLOR_CONTROL_WHITE_POINT_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">white point x</attribute>
+ <attribute side="server" code="0x0030" define="COLOR_CONTROL_WHITE_POINT_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>white point x</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- WHITE_POINT_X -->
- <attribute side="server" code="0x0031" define="COLOR_CONTROL_WHITE_POINT_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">white point y</attribute>
+ <attribute side="server" code="0x0031" define="COLOR_CONTROL_WHITE_POINT_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>white point y</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- WHITE_POINT_Y -->
- <attribute side="server" code="0x0032" define="COLOR_CONTROL_COLOR_POINT_R_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">color point r x</attribute>
+ <attribute side="server" code="0x0032" define="COLOR_CONTROL_COLOR_POINT_R_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>color point r x</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_R_X -->
- <attribute side="server" code="0x0033" define="COLOR_CONTROL_COLOR_POINT_R_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">color point r y</attribute>
+ <attribute side="server" code="0x0033" define="COLOR_CONTROL_COLOR_POINT_R_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>color point r y</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_R_Y -->
- <attribute side="server" code="0x0034" define="COLOR_CONTROL_COLOR_POINT_R_INTENSITY" type="INT8U" writable="true" optional="true">color point r intensity</attribute>
+ <attribute side="server" code="0x0034" define="COLOR_CONTROL_COLOR_POINT_R_INTENSITY" type="INT8U" writable="true" optional="true">
+ <description>color point r intensity</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_R_INTENSITY -->
- <attribute side="server" code="0x0036" define="COLOR_CONTROL_COLOR_POINT_G_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">color point g x</attribute>
+ <attribute side="server" code="0x0036" define="COLOR_CONTROL_COLOR_POINT_G_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>color point g x</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_G_X -->
- <attribute side="server" code="0x0037" define="COLOR_CONTROL_COLOR_POINT_G_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">color point g y</attribute>
+ <attribute side="server" code="0x0037" define="COLOR_CONTROL_COLOR_POINT_G_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>color point g y</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_G_Y -->
- <attribute side="server" code="0x0038" define="COLOR_CONTROL_COLOR_POINT_G_INTENSITY" type="INT8U" writable="true" optional="true">color point g intensity</attribute>
+ <attribute side="server" code="0x0038" define="COLOR_CONTROL_COLOR_POINT_G_INTENSITY" type="INT8U" writable="true" optional="true">
+ <description>color point g intensity</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_G_INTENSITY -->
- <attribute side="server" code="0x003A" define="COLOR_CONTROL_COLOR_POINT_B_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">color point b x</attribute>
+ <attribute side="server" code="0x003A" define="COLOR_CONTROL_COLOR_POINT_B_X" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>color point b x</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_B_X -->
- <attribute side="server" code="0x003B" define="COLOR_CONTROL_COLOR_POINT_B_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">color point b y</attribute>
+ <attribute side="server" code="0x003B" define="COLOR_CONTROL_COLOR_POINT_B_Y" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="true">
+ <description>color point b y</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_B_Y -->
- <attribute side="server" code="0x003C" define="COLOR_CONTROL_COLOR_POINT_B_INTENSITY" type="INT8U" writable="true" optional="true">color point b intensity</attribute>
+ <attribute side="server" code="0x003C" define="COLOR_CONTROL_COLOR_POINT_B_INTENSITY" type="INT8U" writable="true" optional="true">
+ <description>color point b intensity</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <!-- COLOR_POINT_B_INTENSITY -->
  <attribute side="server" code="0x400D" define="COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS" type="INT16U" min="0x0000" max="0xFFFF" writable="false" optional="false" introducedIn="l&amp;o-1.0-15-0014-04">couple color temp to level min-mireds</attribute>
- <attribute side="server" code="0x4010" define="START_UP_COLOR_TEMPERATURE_MIREDS" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="false" introducedIn="l&amp;o-1.0-15-0014-04">start up color temperature mireds</attribute>
+ <attribute side="server" code="0x4010" define="START_UP_COLOR_TEMPERATURE_MIREDS" type="INT16U" min="0x0000" max="0xFEFF" writable="true" optional="false" introducedIn="l&amp;o-1.0-15-0014-04">
+ <description>start up color temperature mireds</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  <command source="client" code="0x00" name="MoveToHue" optional="true" cli="zcl color-control movetohue">
  <description>
  Move to specified hue.
@@ -330,15 +386,51 @@ limitations under the License.
  <attribute side="server" code="0x0000" define="OCCUPANCY" type="BITMAP8" min="0x00" max="0x01" writable="false" reportable="true" optional="false">occupancy</attribute>
  <attribute side="server" code="0x0001" define="OCCUPANCY_SENSOR_TYPE" type="ENUM8" min="0x00" max="0xFE" writable="false" optional="false">occupancy sensor type</attribute>
  <attribute side="server" code="0x0002" define="OCCUPANCY_SENSOR_TYPE_BITMAP" type="BITMAP8" min="0x00" max="0x07" writable="false" optional="false">occupancy sensor type bitmap</attribute>
- <attribute side="server" code="0x0010" define="PIR_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">PIR occupied to unoccupied delay</attribute>
- <attribute side="server" code="0x0011" define="PIR_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">PIR unoccupied to occupied delay</attribute>
- <attribute side="server" code="0x0012" define="PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">PIR unoccupied to occupied threshold</attribute>
- <attribute side="server" code="0x0020" define="ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">ultrasonic occupied to unoccupied delay</attribute>
- <attribute side="server" code="0x0021" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">ultrasonic unoccupied to occupied delay</attribute>
- <attribute side="server" code="0x0022" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">ultrasonic unoccupied to occupied threshold</attribute>
- <attribute side="server" code="0x0030" define="PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">physical contact occupied to unoccupied delay</attribute>
- <attribute side="server" code="0x0031" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">physical contact unoccupied to occupied delay</attribute>
- <attribute side="server" code="0x0032" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">physical contact unoccupied to occupied threshold</attribute>
+ <attribute side="server" code="0x0010" define="PIR_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+ <description>PIR occupied to unoccupied delay</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0011" define="PIR_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+ <description>PIR unoccupied to occupied delay</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0012" define="PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
+ <description>PIR unoccupied to occupied threshold</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0020" define="ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+ <description>ultrasonic occupied to unoccupied delay</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0021" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+ <description>ultrasonic unoccupied to occupied delay</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0022" define="ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
+ <description>ultrasonic unoccupied to occupied threshold</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0030" define="PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+ <description>physical contact occupied to unoccupied delay</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0031" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY" type="INT16U" min="0x0000" max="0xFFFE" writable="true" default="0x0000" optional="true">
+ <description>physical contact unoccupied to occupied delay</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
+ <attribute side="server" code="0x0032" define="PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="true">
+ <description>physical contact unoccupied to occupied threshold</description>
+ <access op="read" role="view"/>
+ <access op="write" role="manage"/>
+ </attribute>
  </cluster>
  <cluster>
  <name>Carbon Monoxide Concentration Measurement</name>