diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index a2242bc7662473..a7546ca453feca 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -6789,7 +6789,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -6832,7 +6832,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -6858,7 +6858,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -6884,7 +6884,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", @@ -16722,7 +16722,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -16765,7 +16765,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -16791,7 +16791,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -16817,7 +16817,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 9f88525e508d41..3b3e849ddf3280 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -6315,7 +6315,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -6358,7 +6358,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -6384,7 +6384,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -6410,7 +6410,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", @@ -13718,7 +13718,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -13761,7 +13761,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -13787,7 +13787,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -13813,7 +13813,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 42135d5af396fd..00a71cd2683304 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -6300,7 +6300,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -6343,7 +6343,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -6369,7 +6369,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -6395,7 +6395,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 65badb44e5e6aa..ecfbcb1d711441 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -6315,7 +6315,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -6358,7 +6358,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -6384,7 +6384,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -6410,7 +6410,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", @@ -13594,7 +13594,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -13637,7 +13637,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -13663,7 +13663,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -13689,7 +13689,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", diff --git a/src/app/tests/suites/TestDescriptorCluster.yaml b/src/app/tests/suites/TestDescriptorCluster.yaml index af0a6f3a91c612..3e5b43d4724d77 100644 --- a/src/app/tests/suites/TestDescriptorCluster.yaml +++ b/src/app/tests/suites/TestDescriptorCluster.yaml @@ -36,6 +36,7 @@ tests: value: [ 0x0003, # Identify 0x001D, # Descriptor + 0x001E, # Binding 0x001F, # Access Control 0x0028, # Basic Information 0x0029, # OTA Software Update Provider @@ -51,9 +52,8 @@ tests: 0x0037, # Ethernet Network Diagnostics 0x003C, # Administrator Commissioning 0x003E, # Operational Credentials + 0x003F, # Group Key Management 0x0405, # Relative Humidity Measurement (why on EP0?) - 0xF000, # Binding - 0xF004, # Group Key Management ] - label: "Read attribute Client list" diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 06dd3f17f1d3d1..200242ef8ca6fd 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -309,6 +309,21 @@ void MatterOnOffSwitchConfigurationPluginServerInitCallback() {} void MatterPowerSourcePluginServerInitCallback() {} void MatterThermostatUserInterfaceConfigurationPluginServerInitCallback() {} void MatterBridgedDeviceBasicInformationPluginServerInitCallback() {} +void MatterPowerConfigurationPluginServerInitCallback() {} +void MatterPowerProfilePluginServerInitCallback() {} +void MatterPulseWidthModulationPluginServerInitCallback() {} +void MatterAlarmsPluginServerInitCallback() {} +void MatterTimePluginServerInitCallback() {} +void MatterAclPluginServerInitCallback() {} +void MatterPollControlPluginServerInitCallback() {} +void MatterLocalizationConfigurationPluginServerInitCallback() {} +void MatterLocalizationUnitPluginServerInitCallback() {} +void MatterLocalizationTimeFormatPluginServerInitCallback() {} +void MatterUserLabelPluginServerInitCallback() {} +void MatterTimeSynchronizationPluginServerInitCallback() {} +void MatterProxyValidPluginServerInitCallback() {} +void MatterProxyDiscoveryPluginServerInitCallback() {} +void MatterProxyConfigurationPluginServerInitCallback() {} // **************************************** // This function is called by the application when the stack goes down, diff --git a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml index f72201716072b3..b7023d15ceb2b4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml @@ -15,28 +15,28 @@ See the License for the specific language governing permissions and limitations under the License. --> - + General Binding - 0xF000 + 0x001e BINDING_CLUSTER true true The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. Add a binding - - - - + + + + Remove a binding - - - - + + + + - + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 66e8a110d7eafa..72be9b90fd368d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -15,37 +15,37 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - - - + + + + - - - - - - + + + + + + - - - + + + General Group Key Management - 0xF004 + 0x003F GROUP_KEY_MANAGEMENT_CLUSTER The Group Key Management Cluster is the mechanism by which group keys are managed. groups group keys - + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml index 497c27fbb5b9ec..0a215f62f59d00 100644 --- a/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml @@ -39,4 +39,4 @@ limitations under the License. -LST \ No newline at end of file + 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 8ac2736b9c3233..41c95d063582b6 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 @@ -62,7 +62,7 @@ limitations under the License. - + @@ -877,7 +877,7 @@ limitations under the License. GetSceneMembership GetSceneMembershipResponse - + ON_OFF Off On @@ -892,7 +892,7 @@ limitations under the License. Capacity OperationMode - + @@ -1198,7 +1198,7 @@ limitations under the License. GetSceneMembership GetSceneMembershipResponse - + ON_OFF Off On @@ -1272,7 +1272,7 @@ limitations under the License. GetSceneMembershipResponse - + @@ -1635,8 +1635,8 @@ limitations under the License. - - + + @@ -1856,9 +1856,9 @@ limitations under the License. AddGroupIfIdentifying - - - + + + @@ -1920,11 +1920,11 @@ limitations under the License. - - - - - + + + + + @@ -1955,11 +1955,11 @@ limitations under the License. - + - + @@ -1988,7 +1988,7 @@ limitations under the License. BINDING - + @@ -2205,7 +2205,7 @@ limitations under the License. StepWithOnOff StopWithOnOff - + ON_OFF Off On diff --git a/src/app/zap-templates/zcl/data-model/chip/proxy-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/proxy-configuration-cluster.xml new file mode 100644 index 00000000000000..dacba59cdaf468 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/proxy-configuration-cluster.xml @@ -0,0 +1,27 @@ + + + + + + + General + Proxy Configuration + 0x0042 + PROXY_CONFIGURATION_CLUSTER + Cluster to control Proxy Configuration + + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/chip/proxy-discovery-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/proxy-discovery-cluster.xml new file mode 100644 index 00000000000000..6adbdafe633c27 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/proxy-discovery-cluster.xml @@ -0,0 +1,27 @@ + + + + + + + General + Proxy Discovery + 0x0043 + PROXY_DISCOVERY_CLUSTER + Cluster to control Proxy Discovery + + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml new file mode 100644 index 00000000000000..d8a968817a93cf --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml @@ -0,0 +1,27 @@ + + + + + + + General + Proxy Valid + 0x0044 + PROXY_VALID_CLUSTER + Cluster to control Proxy Valid + + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml new file mode 100644 index 00000000000000..b71c0f1090b707 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml @@ -0,0 +1,27 @@ + + + + + + + General + Pulse Width Modulation + 0x001c + PWM_CLUSTER + Cluster to control pulse width modulation + + \ No newline at end of file diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index cf41f657e17142..0513b0ea5fff9d 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -43,7 +43,11 @@ "pressure-measurement-cluster.xml", "power-source-cluster.xml", "power-source-configuration-cluster.xml", + "proxy-configuration-cluster.xml", + "proxy-discovery-cluster.xml", + "proxy-valid-cluster.xml", "pump-configuration-and-control-cluster.xml", + "pwm-cluster.xml", "relative-humidity-measurement-cluster.xml", "software-diagnostics-cluster.xml", "switch-cluster.xml", diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index 7f271bfd004000..9ecbe0924d364a 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -43,6 +43,9 @@ 'ILLUMINANCE_MEASUREMENT_CLUSTER': [], 'KEYPAD_INPUT_CLUSTER': ['keypad-input-server'], 'LEVEL_CONTROL_CLUSTER': ['level-control'], + 'LOCALIZATION_CONFIGURATION_CLUSTER': [], + 'LOCALIZATION_TIME_FORMAT_CLUSTER': [], + 'LOCALIZATION_UNIT_CLUSTER': [], 'LOW_POWER_CLUSTER': ['low-power-server'], 'MEDIA_INPUT_CLUSTER': ['media-input-server'], 'MEDIA_PLAYBACK_CLUSTER': ['media-playback-server'], @@ -57,8 +60,15 @@ 'OTA_REQUESTOR_CLUSTER': [], 'POWER_SOURCE_CLUSTER': [], 'POWER_SOURCE_CONFIGURATION_CLUSTER': ['power-source-configuration-server'], + 'POLL_CONTROL_CLUSTER': [], + 'POWER_CONFIG_CLUSTER': [], + 'POWER_PROFILE_CLUSTER': [], 'PRESSURE_MEASUREMENT_CLUSTER': [], + 'PROXY_CONFIGURATION_CLUSTER': [], + 'PROXY_DISCOVERY_CLUSTER': [], + 'PROXY_VALID_CLUSTER': [], 'PUMP_CONFIG_CONTROL_CLUSTER': ['pump-configuration-and-control-server'], + 'PWM_CLUSTER': [], 'RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER': [], 'SCENES_CLUSTER': ['scenes'], 'SOFTWARE_DIAGNOSTICS_CLUSTER': ['software_diagnostics_server'], @@ -69,7 +79,10 @@ 'THERMOSTAT_CLUSTER': ['thermostat-server'], 'THERMOSTAT_UI_CONFIG_CLUSTER': ['thermostat-user-interface-configuration-server'], 'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': ['thread_network_diagnostics_server'], + 'TIME_CLUSTER': [], + 'TIME_SYNCHRONIZATION_CLUSTER': [], 'TV_CHANNEL_CLUSTER': ['tv-channel-server'], + 'USER_LABEL_CLUSTER': [], 'WAKE_ON_LAN_CLUSTER': [], 'WIFI_NETWORK_DIAGNOSTICS_CLUSTER': ['wifi_network_diagnostics_server'], 'WINDOW_COVERING_CLUSTER': ['window-covering-server'], @@ -112,6 +125,9 @@ 'ILLUMINANCE_MEASUREMENT_CLUSTER': [], 'KEYPAD_INPUT_CLUSTER': [], 'LEVEL_CONTROL_CLUSTER': [], + 'LOCALIZATION_CONFIGURATION_CLUSTER': [], + 'LOCALIZATION_TIME_FORMAT_CLUSTER': [], + 'LOCALIZATION_UNIT_CLUSTER': [], 'LOW_POWER_CLUSTER': [], 'MEDIA_INPUT_CLUSTER': [], 'MEDIA_PLAYBACK_CLUSTER': [], @@ -124,10 +140,17 @@ 'OTA_BOOTLOAD_CLUSTER': [], 'OTA_PROVIDER_CLUSTER': [], 'OTA_REQUESTOR_CLUSTER': [], + 'POLL_CONTROL_CLUSTER': [], + 'POWER_CONFIG_CLUSTER': [], + 'POWER_PROFILE_CLUSTER': [], 'POWER_SOURCE_CLUSTER': [], 'POWER_SOURCE_CONFIGURATION_CLUSTER': [], 'PRESSURE_MEASUREMENT_CLUSTER': [], + 'PROXY_CONFIGURATION_CLUSTER': [], + 'PROXY_DISCOVERY_CLUSTER': [], + 'PROXY_VALID_CLUSTER': [], 'PUMP_CONFIG_CONTROL_CLUSTER': ['pump-configuration-and-control-client'], + 'PWM_CLUSTER': [], 'RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER': [], 'SCENES_CLUSTER': [], 'SOFTWARE_DIAGNOSTICS_CLUSTER': [], @@ -138,8 +161,11 @@ 'THERMOSTAT_CLUSTER': ['thermostat-client'], 'THERMOSTAT_UI_CONFIG_CLUSTER': [], 'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': [], + 'TIME_CLUSTER': [], + 'TIME_SYNCHRONIZATION_CLUSTER': [], 'TRUSTED_ROOT_CERTIFICATES_CLUSTER': [], 'TV_CHANNEL_CLUSTER': [], + 'USER_LABEL_CLUSTER': [], 'WAKE_ON_LAN_CLUSTER': [], 'WIFI_NETWORK_DIAGNOSTICS_CLUSTER': [], 'WINDOW_COVERING_CLUSTER': [], diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index e16ece5694f143..dea0e7039768bb 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -12893,7 +12893,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "client", @@ -12936,7 +12936,7 @@ }, { "name": "Binding", - "code": 61440, + "code": 30, "mfgCode": null, "define": "BINDING_CLUSTER", "side": "server", @@ -12962,7 +12962,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "client", @@ -12988,7 +12988,7 @@ }, { "name": "Group Key Management", - "code": 61444, + "code": 63, "mfgCode": null, "define": "GROUP_KEY_MANAGEMENT_CLUSTER", "side": "server", diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index fa8175ce3f9176..49513d97f0cada 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -1480,7 +1480,7 @@ public BindingCluster(long devicePtr, int endpointId) { } public static long clusterId() { - return Long.parseUnsignedLong("61440"); + return Long.parseUnsignedLong("30"); } @Override @@ -5371,7 +5371,7 @@ public GroupKeyManagementCluster(long devicePtr, int endpointId) { } public static long clusterId() { - return Long.parseUnsignedLong("61444"); + return Long.parseUnsignedLong("63"); } @Override diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 5778f8f7524139..985e8a90d594a3 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -493,7 +493,7 @@ class ChipClusters: } _BINDING_CLUSTER_INFO = { "clusterName": "Binding", - "clusterId": 0x0000F000, + "clusterId": 0x0000001E, "commands": { 0x00000000: { "commandId": 0x00000000, @@ -1891,7 +1891,7 @@ class ChipClusters: } _GROUP_KEY_MANAGEMENT_CLUSTER_INFO = { "clusterName": "GroupKeyManagement", - "clusterId": 0x0000F004, + "clusterId": 0x0000003F, "commands": { }, "attributes": { @@ -5223,7 +5223,7 @@ class ChipClusters: 0x00000103: _BARRIER_CONTROL_CLUSTER_INFO, 0x00000028: _BASIC_CLUSTER_INFO, 0x0000000F: _BINARY_INPUT_BASIC_CLUSTER_INFO, - 0x0000F000: _BINDING_CLUSTER_INFO, + 0x0000001E: _BINDING_CLUSTER_INFO, 0x00000045: _BOOLEAN_STATE_CLUSTER_INFO, 0x00000025: _BRIDGED_ACTIONS_CLUSTER_INFO, 0x00000039: _BRIDGED_DEVICE_BASIC_CLUSTER_INFO, @@ -5238,7 +5238,7 @@ class ChipClusters: 0x00000404: _FLOW_MEASUREMENT_CLUSTER_INFO, 0x00000030: _GENERAL_COMMISSIONING_CLUSTER_INFO, 0x00000033: _GENERAL_DIAGNOSTICS_CLUSTER_INFO, - 0x0000F004: _GROUP_KEY_MANAGEMENT_CLUSTER_INFO, + 0x0000003F: _GROUP_KEY_MANAGEMENT_CLUSTER_INFO, 0x00000004: _GROUPS_CLUSTER_INFO, 0x00000003: _IDENTIFY_CLUSTER_INFO, 0x00000400: _ILLUMINANCE_MEASUREMENT_CLUSTER_INFO, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 4ace723bee4481..524b09ef2e1a9d 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -4264,6 +4264,44 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = None +@dataclass +class PulseWidthModulation(Cluster): + id: typing.ClassVar[int] = 0x001C + + class Attributes: + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x001C + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + + @dataclass + class ClusterRevision(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x001C + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFD + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = None + + @dataclass class Descriptor(Cluster): id: typing.ClassVar[int] = 0x001D @@ -4382,6 +4420,95 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = None +@dataclass +class Binding(Cluster): + id: typing.ClassVar[int] = 0x001E + + class Commands: + @dataclass + class Bind(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x001E + command_id: typing.ClassVar[int] = 0x0000 + is_client: typing.ClassVar[bool] = True + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="nodeId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="groupId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="endpointId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="clusterId", Tag=3, Type=uint), + ]) + + nodeId: 'uint' = None + groupId: 'uint' = None + endpointId: 'uint' = None + clusterId: 'uint' = None + + @dataclass + class Unbind(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x001E + command_id: typing.ClassVar[int] = 0x0001 + is_client: typing.ClassVar[bool] = True + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="nodeId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor( + Label="groupId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="endpointId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="clusterId", Tag=3, Type=uint), + ]) + + nodeId: 'uint' = None + groupId: 'uint' = None + endpointId: 'uint' = None + clusterId: 'uint' = None + + class Attributes: + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x001E + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + + @dataclass + class ClusterRevision(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x001E + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFD + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = None + + @dataclass class AccessControl(Cluster): id: typing.ClassVar[int] = 0x001F @@ -10808,6 +10935,124 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'uint' = None +@dataclass +class GroupKeyManagement(Cluster): + id: typing.ClassVar[int] = 0x003F + + class Enums: + class GroupKeySecurityPolicy(IntEnum): + kStandard = 0x00 + kLowLatency = 0x01 + + class Structs: + @dataclass + class GroupKey(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="vendorId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="groupKeyIndex", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="groupKeyRoot", Tag=3, Type=bytes), + ClusterObjectFieldDescriptor( + Label="groupKeyEpochStartTime", Tag=4, Type=uint), + ClusterObjectFieldDescriptor( + Label="groupKeySecurityPolicy", Tag=5, Type=GroupKeyManagement.Enums.GroupKeySecurityPolicy), + ]) + + vendorId: 'uint' = None + groupKeyIndex: 'uint' = None + groupKeyRoot: 'bytes' = None + groupKeyEpochStartTime: 'uint' = None + groupKeySecurityPolicy: 'GroupKeyManagement.Enums.GroupKeySecurityPolicy' = None + + @dataclass + class GroupState(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="vendorId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor( + Label="vendorGroupId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor( + Label="groupKeySetIndex", Tag=3, Type=uint), + ]) + + vendorId: 'uint' = None + vendorGroupId: 'uint' = None + groupKeySetIndex: 'uint' = None + + class Attributes: + @dataclass + class Groups(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x003F + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000000 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[GroupKeyManagement.Structs.GroupState]) + + value: 'typing.List[GroupKeyManagement.Structs.GroupState]' = None + + @dataclass + class GroupKeys(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x003F + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000001 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[GroupKeyManagement.Structs.GroupKey]) + + value: 'typing.List[GroupKeyManagement.Structs.GroupKey]' = None + + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x003F + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + + @dataclass + class ClusterRevision(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x003F + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFD + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = None + + @dataclass class FixedLabel(Cluster): id: typing.ClassVar[int] = 0x0040 @@ -10828,28 +11073,136 @@ def descriptor(cls) -> ClusterObjectDescriptor: label: 'str' = None value: 'str' = None - class Attributes: + class Attributes: + @dataclass + class LabelList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0040 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000000 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[FixedLabel.Structs.LabelStruct]) + + value: 'typing.List[FixedLabel.Structs.LabelStruct]' = None + + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0040 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + + @dataclass + class ClusterRevision(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0040 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFD + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = None + + +@dataclass +class UserLabel(Cluster): + id: typing.ClassVar[int] = 0x0041 + + class Structs: + @dataclass + class LabelStruct(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor( + Label="label", Tag=1, Type=str), + ClusterObjectFieldDescriptor( + Label="value", Tag=2, Type=str), + ]) + + label: 'str' = None + value: 'str' = None + + class Attributes: + @dataclass + class LabelList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0041 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000000 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[UserLabel.Structs.LabelStruct]) + + value: 'typing.List[UserLabel.Structs.LabelStruct]' = None + + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0041 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None + @dataclass - class LabelList(ClusterAttributeDescriptor): + class ClusterRevision(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: - return 0x0040 + return 0x0041 @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000000 + return 0x0000FFFD @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[FixedLabel.Structs.LabelStruct]) + return ClusterObjectFieldDescriptor(Type=uint) + + value: 'uint' = None - value: 'typing.List[FixedLabel.Structs.LabelStruct]' = None +@dataclass +class ProxyConfiguration(Cluster): + id: typing.ClassVar[int] = 0x0042 + + class Attributes: @dataclass class FeatureMap(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: - return 0x0040 + return 0x0042 @ChipUtility.classproperty def attribute_id(cls) -> int: @@ -10865,7 +11218,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: class ClusterRevision(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: - return 0x0040 + return 0x0042 @ChipUtility.classproperty def attribute_id(cls) -> int: @@ -10879,47 +11232,53 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class UserLabel(Cluster): - id: typing.ClassVar[int] = 0x0041 +class ProxyDiscovery(Cluster): + id: typing.ClassVar[int] = 0x0043 - class Structs: + class Attributes: @dataclass - class LabelStruct(ClusterObject): + class FeatureMap(ClusterAttributeDescriptor): @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="label", Tag=1, Type=str), - ClusterObjectFieldDescriptor( - Label="value", Tag=2, Type=str), - ]) + def cluster_id(cls) -> int: + return 0x0043 - label: 'str' = None - value: 'str' = None + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: 'typing.Optional[uint]' = None - class Attributes: @dataclass - class LabelList(ClusterAttributeDescriptor): + class ClusterRevision(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: - return 0x0041 + return 0x0043 @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000000 + return 0x0000FFFD @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[UserLabel.Structs.LabelStruct]) + return ClusterObjectFieldDescriptor(Type=uint) - value: 'typing.List[UserLabel.Structs.LabelStruct]' = None + value: 'uint' = None + + +@dataclass +class ProxyValid(Cluster): + id: typing.ClassVar[int] = 0x0044 + class Attributes: @dataclass class FeatureMap(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: - return 0x0041 + return 0x0044 @ChipUtility.classproperty def attribute_id(cls) -> int: @@ -10935,7 +11294,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: class ClusterRevision(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: - return 0x0041 + return 0x0044 @ChipUtility.classproperty def attribute_id(cls) -> int: @@ -29934,210 +30293,3 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: return ClusterObjectFieldDescriptor(Type=uint) value: 'uint' = None - - -@dataclass -class Binding(Cluster): - id: typing.ClassVar[int] = 0xF000 - - class Commands: - @dataclass - class Bind(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0xF000 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="nodeId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="endpointId", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="clusterId", Tag=3, Type=uint), - ]) - - nodeId: 'uint' = None - groupId: 'uint' = None - endpointId: 'uint' = None - clusterId: 'uint' = None - - @dataclass - class Unbind(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0xF000 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="nodeId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor( - Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="endpointId", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="clusterId", Tag=3, Type=uint), - ]) - - nodeId: 'uint' = None - groupId: 'uint' = None - endpointId: 'uint' = None - clusterId: 'uint' = None - - class Attributes: - @dataclass - class FeatureMap(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xF000 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFC - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class ClusterRevision(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xF000 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFD - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = None - - -@dataclass -class GroupKeyManagement(Cluster): - id: typing.ClassVar[int] = 0xF004 - - class Enums: - class GroupKeySecurityPolicy(IntEnum): - kStandard = 0x00 - kLowLatency = 0x01 - - class Structs: - @dataclass - class GroupKey(ClusterObject): - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="vendorId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="groupKeyIndex", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="groupKeyRoot", Tag=3, Type=bytes), - ClusterObjectFieldDescriptor( - Label="groupKeyEpochStartTime", Tag=4, Type=uint), - ClusterObjectFieldDescriptor( - Label="groupKeySecurityPolicy", Tag=5, Type=GroupKeyManagement.Enums.GroupKeySecurityPolicy), - ]) - - vendorId: 'uint' = None - groupKeyIndex: 'uint' = None - groupKeyRoot: 'bytes' = None - groupKeyEpochStartTime: 'uint' = None - groupKeySecurityPolicy: 'GroupKeyManagement.Enums.GroupKeySecurityPolicy' = None - - @dataclass - class GroupState(ClusterObject): - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor( - Label="vendorId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor( - Label="vendorGroupId", Tag=2, Type=uint), - ClusterObjectFieldDescriptor( - Label="groupKeySetIndex", Tag=3, Type=uint), - ]) - - vendorId: 'uint' = None - vendorGroupId: 'uint' = None - groupKeySetIndex: 'uint' = None - - class Attributes: - @dataclass - class Groups(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xF004 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[GroupKeyManagement.Structs.GroupState]) - - value: 'typing.List[GroupKeyManagement.Structs.GroupState]' = None - - @dataclass - class GroupKeys(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xF004 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000001 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[GroupKeyManagement.Structs.GroupKey]) - - value: 'typing.List[GroupKeyManagement.Structs.GroupKey]' = None - - @dataclass - class FeatureMap(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xF004 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFC - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) - - value: 'typing.Optional[uint]' = None - - @dataclass - class ClusterRevision(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0xF004 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000FFFD - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) - - value: 'uint' = None diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index 43b9c3fafb9154..6b12d34d2276e8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -470,6 +470,22 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end +@interface CHIPBindingClusterBindParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull nodeId; +@property (strong, nonatomic) NSNumber * _Nonnull groupId; +@property (strong, nonatomic) NSNumber * _Nonnull endpointId; +@property (strong, nonatomic) NSNumber * _Nonnull clusterId; +- (instancetype)init; +@end + +@interface CHIPBindingClusterUnbindParams : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull nodeId; +@property (strong, nonatomic) NSNumber * _Nonnull groupId; +@property (strong, nonatomic) NSNumber * _Nonnull endpointId; +@property (strong, nonatomic) NSNumber * _Nonnull clusterId; +- (instancetype)init; +@end + @interface CHIPPollControlClusterCheckInResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull startFastPolling; @property (strong, nonatomic) NSNumber * _Nonnull fastPollTimeout; @@ -2029,22 +2045,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPBindingClusterBindParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull nodeId; -@property (strong, nonatomic) NSNumber * _Nonnull groupId; -@property (strong, nonatomic) NSNumber * _Nonnull endpointId; -@property (strong, nonatomic) NSNumber * _Nonnull clusterId; -- (instancetype)init; -@end - -@interface CHIPBindingClusterUnbindParams : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull nodeId; -@property (strong, nonatomic) NSNumber * _Nonnull groupId; -@property (strong, nonatomic) NSNumber * _Nonnull endpointId; -@property (strong, nonatomic) NSNumber * _Nonnull clusterId; -- (instancetype)init; -@end - NS_ASSUME_NONNULL_END #endif /* CHIP_COMMAND_PAYLOADS_H */ diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index 21fb7e38e07c2f..a3d8818c065e56 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -978,6 +978,40 @@ - (instancetype)init } @end +@implementation CHIPBindingClusterBindParams +- (instancetype)init +{ + if (self = [super init]) { + + _nodeId = @(0); + + _groupId = @(0); + + _endpointId = @(0); + + _clusterId = @(0); + } + return self; +} +@end + +@implementation CHIPBindingClusterUnbindParams +- (instancetype)init +{ + if (self = [super init]) { + + _nodeId = @(0); + + _groupId = @(0); + + _endpointId = @(0); + + _clusterId = @(0); + } + return self; +} +@end + @implementation CHIPPollControlClusterCheckInResponseParams - (instancetype)init { @@ -4324,38 +4358,4 @@ - (instancetype)init } @end -@implementation CHIPBindingClusterBindParams -- (instancetype)init -{ - if (self = [super init]) { - - _nodeId = @(0); - - _groupId = @(0); - - _endpointId = @(0); - - _clusterId = @(0); - } - return self; -} -@end - -@implementation CHIPBindingClusterUnbindParams -- (instancetype)init -{ - if (self = [super init]) { - - _nodeId = @(0); - - _groupId = @(0); - - _endpointId = @(0); - - _clusterId = @(0); - } - return self; -} -@end - NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h index a026f458afa222..c63bdb6f45bbbd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h @@ -216,6 +216,22 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end +@interface CHIPGroupKeyManagementClusterGroupKey : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull vendorId; +@property (strong, nonatomic) NSNumber * _Nonnull groupKeyIndex; +@property (strong, nonatomic) NSData * _Nonnull groupKeyRoot; +@property (strong, nonatomic) NSNumber * _Nonnull groupKeyEpochStartTime; +@property (strong, nonatomic) NSNumber * _Nonnull groupKeySecurityPolicy; +- (instancetype)init; +@end + +@interface CHIPGroupKeyManagementClusterGroupState : NSObject +@property (strong, nonatomic) NSNumber * _Nonnull vendorId; +@property (strong, nonatomic) NSNumber * _Nonnull vendorGroupId; +@property (strong, nonatomic) NSNumber * _Nonnull groupKeySetIndex; +- (instancetype)init; +@end + @interface CHIPFixedLabelClusterLabelStruct : NSObject @property (strong, nonatomic) NSString * _Nonnull label; @property (strong, nonatomic) NSString * _Nonnull value; @@ -397,22 +413,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPGroupKeyManagementClusterGroupKey : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull vendorId; -@property (strong, nonatomic) NSNumber * _Nonnull groupKeyIndex; -@property (strong, nonatomic) NSData * _Nonnull groupKeyRoot; -@property (strong, nonatomic) NSNumber * _Nonnull groupKeyEpochStartTime; -@property (strong, nonatomic) NSNumber * _Nonnull groupKeySecurityPolicy; -- (instancetype)init; -@end - -@interface CHIPGroupKeyManagementClusterGroupState : NSObject -@property (strong, nonatomic) NSNumber * _Nonnull vendorId; -@property (strong, nonatomic) NSNumber * _Nonnull vendorGroupId; -@property (strong, nonatomic) NSNumber * _Nonnull groupKeySetIndex; -- (instancetype)init; -@end - NS_ASSUME_NONNULL_END #endif /* CHIP_STRUCTS_H */ diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm index f1bddc34343ffa..6f59d246c6bdcd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm @@ -427,6 +427,40 @@ - (instancetype)init } @end +@implementation CHIPGroupKeyManagementClusterGroupKey +- (instancetype)init +{ + if (self = [super init]) { + + _vendorId = @(0); + + _groupKeyIndex = @(0); + + _groupKeyRoot = [NSData data]; + + _groupKeyEpochStartTime = @(0); + + _groupKeySecurityPolicy = @(0); + } + return self; +} +@end + +@implementation CHIPGroupKeyManagementClusterGroupState +- (instancetype)init +{ + if (self = [super init]) { + + _vendorId = @(0); + + _vendorGroupId = @(0); + + _groupKeySetIndex = @(0); + } + return self; +} +@end + @implementation CHIPFixedLabelClusterLabelStruct - (instancetype)init { @@ -813,38 +847,4 @@ - (instancetype)init } @end -@implementation CHIPGroupKeyManagementClusterGroupKey -- (instancetype)init -{ - if (self = [super init]) { - - _vendorId = @(0); - - _groupKeyIndex = @(0); - - _groupKeyRoot = [NSData data]; - - _groupKeyEpochStartTime = @(0); - - _groupKeySecurityPolicy = @(0); - } - return self; -} -@end - -@implementation CHIPGroupKeyManagementClusterGroupState -- (instancetype)init -{ - if (self = [super init]) { - - _vendorId = @(0); - - _vendorGroupId = @(0); - - _groupKeySetIndex = @(0); - } - return self; -} -@end - NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index 58f9c7d310ad90..175e690c8d60b6 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -29784,24 +29784,24 @@ - (void)testSendClusterTestDescriptorCluster_000002_ReadAttribute XCTAssertEqual([actualValue count], 20); XCTAssertEqual([actualValue[0] unsignedIntValue], 3UL); XCTAssertEqual([actualValue[1] unsignedIntValue], 29UL); - XCTAssertEqual([actualValue[2] unsignedIntValue], 31UL); - XCTAssertEqual([actualValue[3] unsignedIntValue], 40UL); - XCTAssertEqual([actualValue[4] unsignedIntValue], 41UL); - XCTAssertEqual([actualValue[5] unsignedIntValue], 42UL); - XCTAssertEqual([actualValue[6] unsignedIntValue], 46UL); - XCTAssertEqual([actualValue[7] unsignedIntValue], 48UL); - XCTAssertEqual([actualValue[8] unsignedIntValue], 49UL); - XCTAssertEqual([actualValue[9] unsignedIntValue], 50UL); - XCTAssertEqual([actualValue[10] unsignedIntValue], 51UL); - XCTAssertEqual([actualValue[11] unsignedIntValue], 52UL); - XCTAssertEqual([actualValue[12] unsignedIntValue], 53UL); - XCTAssertEqual([actualValue[13] unsignedIntValue], 54UL); - XCTAssertEqual([actualValue[14] unsignedIntValue], 55UL); - XCTAssertEqual([actualValue[15] unsignedIntValue], 60UL); - XCTAssertEqual([actualValue[16] unsignedIntValue], 62UL); - XCTAssertEqual([actualValue[17] unsignedIntValue], 1029UL); - XCTAssertEqual([actualValue[18] unsignedIntValue], 61440UL); - XCTAssertEqual([actualValue[19] unsignedIntValue], 61444UL); + XCTAssertEqual([actualValue[2] unsignedIntValue], 30UL); + XCTAssertEqual([actualValue[3] unsignedIntValue], 31UL); + XCTAssertEqual([actualValue[4] unsignedIntValue], 40UL); + XCTAssertEqual([actualValue[5] unsignedIntValue], 41UL); + XCTAssertEqual([actualValue[6] unsignedIntValue], 42UL); + XCTAssertEqual([actualValue[7] unsignedIntValue], 46UL); + XCTAssertEqual([actualValue[8] unsignedIntValue], 48UL); + XCTAssertEqual([actualValue[9] unsignedIntValue], 49UL); + XCTAssertEqual([actualValue[10] unsignedIntValue], 50UL); + XCTAssertEqual([actualValue[11] unsignedIntValue], 51UL); + XCTAssertEqual([actualValue[12] unsignedIntValue], 52UL); + XCTAssertEqual([actualValue[13] unsignedIntValue], 53UL); + XCTAssertEqual([actualValue[14] unsignedIntValue], 54UL); + XCTAssertEqual([actualValue[15] unsignedIntValue], 55UL); + XCTAssertEqual([actualValue[16] unsignedIntValue], 60UL); + XCTAssertEqual([actualValue[17] unsignedIntValue], 62UL); + XCTAssertEqual([actualValue[18] unsignedIntValue], 63UL); + XCTAssertEqual([actualValue[19] unsignedIntValue], 1029UL); } [expectation fulfill]; diff --git a/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp b/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp index 7adb8e9dad7948..cf4eddacf3a280 100644 --- a/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/attribute-size.cpp @@ -512,7 +512,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } break; } - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster { uint16_t entryOffset = kSizeLengthInBytes; switch (am->attributeId) @@ -1317,7 +1317,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; } break; - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster switch (attributeId) { case 0x0000: // groups diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 4b11068a754ed7..86f689b4f6aa4f 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -1385,6 +1385,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Binding (server) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Access Control (server) */ \ { 0x0000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* ACL */ \ @@ -1573,20 +1576,17 @@ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(616) }, /* groups */ \ + { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(870) }, /* group keys */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* measured value */ \ { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ - /* Endpoint: 0, Cluster: Binding (server) */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(616) }, /* groups */ \ - { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(870) }, /* group keys */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ /* Endpoint: 1, Cluster: Identify (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(1) }, /* identify time */ \ @@ -1658,6 +1658,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 1, Cluster: Binding (server) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 1, Cluster: Bridged Actions (server) */ \ { 0x0000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* action list */ \ { 0x0001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* endpoint list */ \ @@ -2136,9 +2139,6 @@ { 0x050D, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0xffff) }, /* active power max */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ \ - /* Endpoint: 1, Cluster: Binding (server) */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ /* Endpoint: 2, Cluster: On/Off (server) */ \ { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */ \ { 0x4000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* GlobalSceneControl */ \ @@ -2221,63 +2221,61 @@ { \ 0x001D, ZAP_ATTRIBUTE_INDEX(3), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ + { 0x001E, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Binding (server) */ \ { \ - 0x001F, ZAP_ATTRIBUTE_INDEX(8), 3, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001F, ZAP_ATTRIBUTE_INDEX(9), 3, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Access Control (server) */ \ { 0x0028, \ - ZAP_ATTRIBUTE_INDEX(11), \ + ZAP_ATTRIBUTE_INDEX(12), \ 20, \ 687, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ { \ - 0x0029, ZAP_ATTRIBUTE_INDEX(31), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0029, ZAP_ATTRIBUTE_INDEX(32), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ { \ - 0x002A, ZAP_ATTRIBUTE_INDEX(32), 3, 20, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x002A, ZAP_ATTRIBUTE_INDEX(33), 3, 20, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */ \ { \ - 0x002E, ZAP_ATTRIBUTE_INDEX(35), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x002E, ZAP_ATTRIBUTE_INDEX(36), 2, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Power Source Configuration (server) */ \ { \ - 0x0030, ZAP_ATTRIBUTE_INDEX(37), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0030, ZAP_ATTRIBUTE_INDEX(38), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ { \ - 0x0031, ZAP_ATTRIBUTE_INDEX(43), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0031, ZAP_ATTRIBUTE_INDEX(44), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ { \ - 0x0032, ZAP_ATTRIBUTE_INDEX(45), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0032, ZAP_ATTRIBUTE_INDEX(46), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ { \ - 0x0033, ZAP_ATTRIBUTE_INDEX(45), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0033, ZAP_ATTRIBUTE_INDEX(46), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ { \ - 0x0034, ZAP_ATTRIBUTE_INDEX(54), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0034, ZAP_ATTRIBUTE_INDEX(55), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ { \ - 0x0035, ZAP_ATTRIBUTE_INDEX(60), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0035, ZAP_ATTRIBUTE_INDEX(61), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ { \ - 0x0036, ZAP_ATTRIBUTE_INDEX(125), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0036, ZAP_ATTRIBUTE_INDEX(126), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ { \ - 0x0037, ZAP_ATTRIBUTE_INDEX(140), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0037, ZAP_ATTRIBUTE_INDEX(141), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ - 0x003C, ZAP_ATTRIBUTE_INDEX(151), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003C, ZAP_ATTRIBUTE_INDEX(152), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ { \ - 0x003E, ZAP_ATTRIBUTE_INDEX(152), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003E, ZAP_ATTRIBUTE_INDEX(153), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(158), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(162), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { \ - 0xF004, ZAP_ATTRIBUTE_INDEX(163), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003F, ZAP_ATTRIBUTE_INDEX(159), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { \ + 0x0405, ZAP_ATTRIBUTE_INDEX(162), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { 0x0003, \ ZAP_ATTRIBUTE_INDEX(166), \ 3, \ @@ -2318,136 +2316,136 @@ 0x001D, ZAP_ATTRIBUTE_INDEX(206), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ { \ - 0x0025, ZAP_ATTRIBUTE_INDEX(211), 4, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001E, ZAP_ATTRIBUTE_INDEX(211), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 1, Cluster: Binding (server) */ \ + { \ + 0x0025, ZAP_ATTRIBUTE_INDEX(212), 4, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Bridged Actions (server) */ \ { \ - 0x002F, ZAP_ATTRIBUTE_INDEX(215), 11, 88, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x002F, ZAP_ATTRIBUTE_INDEX(216), 11, 88, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Power Source (server) */ \ { \ - 0x0039, ZAP_ATTRIBUTE_INDEX(226), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0039, ZAP_ATTRIBUTE_INDEX(227), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Bridged Device Basic (server) */ \ { \ - 0x003B, ZAP_ATTRIBUTE_INDEX(227), 5, 9, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003B, ZAP_ATTRIBUTE_INDEX(228), 5, 9, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Switch (server) */ \ { \ - 0x0040, ZAP_ATTRIBUTE_INDEX(232), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0040, ZAP_ATTRIBUTE_INDEX(233), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Fixed Label (server) */ \ { \ - 0x0045, ZAP_ATTRIBUTE_INDEX(234), 2, 3, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0045, ZAP_ATTRIBUTE_INDEX(235), 2, 3, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Boolean State (server) */ \ { \ - 0x0050, ZAP_ATTRIBUTE_INDEX(236), 6, 38, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0050, ZAP_ATTRIBUTE_INDEX(237), 6, 38, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Mode Select (server) */ \ { 0x0101, \ - ZAP_ATTRIBUTE_INDEX(242), \ + ZAP_ATTRIBUTE_INDEX(243), \ 8, \ 14, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \ { \ - 0x0102, ZAP_ATTRIBUTE_INDEX(250), 20, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0102, ZAP_ATTRIBUTE_INDEX(251), 20, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Window Covering (server) */ \ { \ - 0x0103, ZAP_ATTRIBUTE_INDEX(270), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0103, ZAP_ATTRIBUTE_INDEX(271), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \ { \ 0x0200, \ - ZAP_ATTRIBUTE_INDEX(275), \ + ZAP_ATTRIBUTE_INDEX(276), \ 26, \ 54, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayPumpConfigurationAndControlServer \ }, /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ { \ - 0x0201, ZAP_ATTRIBUTE_INDEX(301), 19, 34, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0201, ZAP_ATTRIBUTE_INDEX(302), 19, 34, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ { \ 0x0204, \ - ZAP_ATTRIBUTE_INDEX(320), \ + ZAP_ATTRIBUTE_INDEX(321), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayThermostatUserInterfaceConfigurationServer \ }, /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ { 0x0300, \ - ZAP_ATTRIBUTE_INDEX(324), \ + ZAP_ATTRIBUTE_INDEX(325), \ 53, \ 341, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ { \ - 0x0400, ZAP_ATTRIBUTE_INDEX(377), 6, 11, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0400, ZAP_ATTRIBUTE_INDEX(378), 6, 11, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ { \ - 0x0402, ZAP_ATTRIBUTE_INDEX(383), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0402, ZAP_ATTRIBUTE_INDEX(384), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ { \ - 0x0403, ZAP_ATTRIBUTE_INDEX(388), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0403, ZAP_ATTRIBUTE_INDEX(389), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ { \ - 0x0404, ZAP_ATTRIBUTE_INDEX(392), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0404, ZAP_ATTRIBUTE_INDEX(393), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(397), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0405, ZAP_ATTRIBUTE_INDEX(398), 5, 10, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ { 0x0406, \ - ZAP_ATTRIBUTE_INDEX(402), \ + ZAP_ATTRIBUTE_INDEX(403), \ 4, \ 5, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayOccupancySensingServer }, /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ { 0x0500, \ - ZAP_ATTRIBUTE_INDEX(406), \ + ZAP_ATTRIBUTE_INDEX(407), \ 6, \ 16, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | \ ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \ { \ - 0x0503, ZAP_ATTRIBUTE_INDEX(412), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0503, ZAP_ATTRIBUTE_INDEX(413), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ { \ - 0x0504, ZAP_ATTRIBUTE_INDEX(414), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0504, ZAP_ATTRIBUTE_INDEX(415), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: TV Channel (server) */ \ { \ - 0x0505, ZAP_ATTRIBUTE_INDEX(418), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0505, ZAP_ATTRIBUTE_INDEX(419), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Target Navigator (server) */ \ { \ - 0x0506, ZAP_ATTRIBUTE_INDEX(420), 9, 59, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0506, ZAP_ATTRIBUTE_INDEX(421), 9, 59, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Playback (server) */ \ { \ - 0x0507, ZAP_ATTRIBUTE_INDEX(429), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0507, ZAP_ATTRIBUTE_INDEX(430), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Input (server) */ \ { \ - 0x0508, ZAP_ATTRIBUTE_INDEX(432), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0508, ZAP_ATTRIBUTE_INDEX(433), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Low Power (server) */ \ { \ - 0x0509, ZAP_ATTRIBUTE_INDEX(433), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0509, ZAP_ATTRIBUTE_INDEX(434), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Keypad Input (server) */ \ { \ - 0x050A, ZAP_ATTRIBUTE_INDEX(434), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050A, ZAP_ATTRIBUTE_INDEX(435), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Content Launcher (server) */ \ { \ - 0x050B, ZAP_ATTRIBUTE_INDEX(437), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050B, ZAP_ATTRIBUTE_INDEX(438), 3, 257, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Audio Output (server) */ \ { \ - 0x050C, ZAP_ATTRIBUTE_INDEX(440), 4, 258, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050C, ZAP_ATTRIBUTE_INDEX(441), 4, 258, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(444), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(445), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Basic (server) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(452), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(453), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Account Login (server) */ \ { \ - 0x050F, ZAP_ATTRIBUTE_INDEX(453), 77, 2285, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050F, ZAP_ATTRIBUTE_INDEX(454), 77, 2285, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ { \ - 0x0B04, ZAP_ATTRIBUTE_INDEX(530), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0B04, ZAP_ATTRIBUTE_INDEX(531), 12, 28, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ - { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(542), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binding (server) */ \ { 0x0006, \ ZAP_ATTRIBUTE_INDEX(543), \ 7, \ diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index f82fa242c008f5..af424d67f1e7e1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -228,6 +228,12 @@ #define ZCL_FINISH_TIME_ATTRIBUTE_ID (0x0001) #define ZCL_REMAINING_TIME_ATTRIBUTE_ID (0x0002) +// Attribute ids for cluster: Pulse Width Modulation + +// Client attributes + +// Server attributes + // Attribute ids for cluster: Descriptor // Client attributes @@ -238,6 +244,12 @@ #define ZCL_CLIENT_LIST_ATTRIBUTE_ID (0x0002) #define ZCL_PARTS_LIST_ATTRIBUTE_ID (0x0003) +// Attribute ids for cluster: Binding + +// Client attributes + +// Server attributes + // Attribute ids for cluster: Access Control // Client attributes @@ -571,6 +583,14 @@ #define ZCL_TRUSTED_ROOTS_ATTRIBUTE_ID (0x0004) #define ZCL_CURRENT_FABRIC_INDEX_ATTRIBUTE_ID (0x0005) +// Attribute ids for cluster: Group Key Management + +// Client attributes + +// Server attributes +#define ZCL_GROUPS_ATTRIBUTE_ID (0x0000) +#define ZCL_GROUPKEYS_ATTRIBUTE_ID (0x0001) + // Attribute ids for cluster: Fixed Label // Client attributes @@ -585,6 +605,24 @@ // Server attributes #define ZCL_LABEL_LIST_ATTRIBUTE_ID (0x0000) +// Attribute ids for cluster: Proxy Configuration + +// Client attributes + +// Server attributes + +// Attribute ids for cluster: Proxy Discovery + +// Client attributes + +// Server attributes + +// Attribute ids for cluster: Proxy Valid + +// Client attributes + +// Server attributes + // Attribute ids for cluster: Boolean State // Client attributes @@ -1678,17 +1716,3 @@ #define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A15) #define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A16) #define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A17) - -// Attribute ids for cluster: Binding - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Group Key Management - -// Client attributes - -// Server attributes -#define ZCL_GROUPS_ATTRIBUTE_ID (0x0000) -#define ZCL_GROUPKEYS_ATTRIBUTE_ID (0x0001) diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 9a83154eff3fd5..d1ba1e9ff41cae 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -8848,6 +8848,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::FabricIndex value) } // namespace Attributes } // namespace OperationalCredentials +namespace GroupKeyManagement { +namespace Attributes { + +} // namespace Attributes +} // namespace GroupKeyManagement + namespace FixedLabel { namespace Attributes { @@ -29408,12 +29414,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace ElectricalMeasurement -namespace GroupKeyManagement { -namespace Attributes { - -} // namespace Attributes -} // namespace GroupKeyManagement - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 065042aeb8f04b..2238c6870a644e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1680,6 +1680,12 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::FabricIndex value); } // namespace Attributes } // namespace OperationalCredentials +namespace GroupKeyManagement { +namespace Attributes { + +} // namespace Attributes +} // namespace GroupKeyManagement + namespace FixedLabel { namespace Attributes { @@ -5432,12 +5438,6 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace ElectricalMeasurement -namespace GroupKeyManagement { -namespace Attributes { - -} // namespace Attributes -} // namespace GroupKeyManagement - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 7fee030179593f..b31e893698cac2 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -150,6 +150,14 @@ void emberAfPowerProfileClusterInitCallback(chip::EndpointId endpoint); */ void emberAfApplianceControlClusterInitCallback(chip::EndpointId endpoint); +/** @brief Pulse Width Modulation Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfPulseWidthModulationClusterInitCallback(chip::EndpointId endpoint); + /** @brief Descriptor Cluster Init * * Cluster Init @@ -158,6 +166,14 @@ void emberAfApplianceControlClusterInitCallback(chip::EndpointId endpoint); */ void emberAfDescriptorClusterInitCallback(chip::EndpointId endpoint); +/** @brief Binding Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfBindingClusterInitCallback(chip::EndpointId endpoint); + /** @brief Access Control Cluster Init * * Cluster Init @@ -350,6 +366,14 @@ void emberAfAdministratorCommissioningClusterInitCallback(chip::EndpointId endpo */ void emberAfOperationalCredentialsClusterInitCallback(chip::EndpointId endpoint); +/** @brief Group Key Management Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfGroupKeyManagementClusterInitCallback(chip::EndpointId endpoint); + /** @brief Fixed Label Cluster Init * * Cluster Init @@ -366,6 +390,30 @@ void emberAfFixedLabelClusterInitCallback(chip::EndpointId endpoint); */ void emberAfUserLabelClusterInitCallback(chip::EndpointId endpoint); +/** @brief Proxy Configuration Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyConfigurationClusterInitCallback(chip::EndpointId endpoint); + +/** @brief Proxy Discovery Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyDiscoveryClusterInitCallback(chip::EndpointId endpoint); + +/** @brief Proxy Valid Cluster Init + * + * Cluster Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyValidClusterInitCallback(chip::EndpointId endpoint); + /** @brief Boolean State Cluster Init * * Cluster Init @@ -934,22 +982,6 @@ void emberAfApplianceStatisticsClusterInitCallback(chip::EndpointId endpoint); */ void emberAfElectricalMeasurementClusterInitCallback(chip::EndpointId endpoint); -/** @brief Binding Cluster Init - * - * Cluster Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfBindingClusterInitCallback(chip::EndpointId endpoint); - -/** @brief Group Key Management Cluster Init - * - * Cluster Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfGroupKeyManagementClusterInitCallback(chip::EndpointId endpoint); - // Cluster Server/Client Init Functions // @@ -2310,6 +2342,110 @@ void emberAfApplianceControlClusterServerTickCallback(chip::EndpointId endpoint) */ void emberAfApplianceControlClusterClientTickCallback(chip::EndpointId endpoint); +// +// Pulse Width Modulation Cluster +// + +/** @brief Pulse Width Modulation Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfPulseWidthModulationClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief Pulse Width Modulation Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfPulseWidthModulationClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief Pulse Width Modulation Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterPulseWidthModulationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Pulse Width Modulation Cluster Client Attribute Changed + * + * Client Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterPulseWidthModulationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Pulse Width Modulation Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfPulseWidthModulationClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Pulse Width Modulation Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfPulseWidthModulationClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Pulse Width Modulation Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterPulseWidthModulationClusterServerPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Pulse Width Modulation Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterPulseWidthModulationClusterClientPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Pulse Width Modulation Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfPulseWidthModulationClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief Pulse Width Modulation Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfPulseWidthModulationClusterClientTickCallback(chip::EndpointId endpoint); + // // Descriptor Cluster // @@ -2414,6 +2550,110 @@ void emberAfDescriptorClusterServerTickCallback(chip::EndpointId endpoint); */ void emberAfDescriptorClusterClientTickCallback(chip::EndpointId endpoint); +// +// Binding Cluster +// + +/** @brief Binding Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfBindingClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief Binding Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfBindingClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief Binding Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterBindingClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Binding Cluster Client Attribute Changed + * + * Client Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterBindingClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Binding Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfBindingClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); + +/** @brief Binding Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfBindingClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); + +/** @brief Binding Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterBindingClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Binding Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterBindingClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Binding Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfBindingClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief Binding Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfBindingClusterClientTickCallback(chip::EndpointId endpoint); + // // Access Control Cluster // @@ -4919,32 +5159,136 @@ void emberAfOperationalCredentialsClusterServerTickCallback(chip::EndpointId end void emberAfOperationalCredentialsClusterClientTickCallback(chip::EndpointId endpoint); // -// Fixed Label Cluster +// Group Key Management Cluster // -/** @brief Fixed Label Cluster Server Init +/** @brief Group Key Management Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfFixedLabelClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfGroupKeyManagementClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Fixed Label Cluster Client Init +/** @brief Group Key Management Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfFixedLabelClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfGroupKeyManagementClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Fixed Label Cluster Server Attribute Changed +/** @brief Group Key Management Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterFixedLabelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterGroupKeyManagementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Group Key Management Cluster Client Attribute Changed + * + * Client Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterGroupKeyManagementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Group Key Management Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfGroupKeyManagementClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Group Key Management Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfGroupKeyManagementClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Group Key Management Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterGroupKeyManagementClusterServerPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Group Key Management Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterGroupKeyManagementClusterClientPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Group Key Management Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfGroupKeyManagementClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief Group Key Management Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfGroupKeyManagementClusterClientTickCallback(chip::EndpointId endpoint); + +// +// Fixed Label Cluster +// + +/** @brief Fixed Label Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfFixedLabelClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief Fixed Label Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfFixedLabelClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief Fixed Label Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterFixedLabelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); /** @brief Fixed Label Cluster Client Attribute Changed * @@ -5026,39 +5370,353 @@ void emberAfFixedLabelClusterClientTickCallback(chip::EndpointId endpoint); // User Label Cluster // -/** @brief User Label Cluster Server Init +/** @brief User Label Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfUserLabelClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief User Label Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfUserLabelClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief User Label Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterUserLabelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief User Label Cluster Client Attribute Changed + * + * Client Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterUserLabelClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief User Label Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfUserLabelClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); + +/** @brief User Label Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfUserLabelClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); + +/** @brief User Label Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterUserLabelClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief User Label Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterUserLabelClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief User Label Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfUserLabelClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief User Label Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfUserLabelClusterClientTickCallback(chip::EndpointId endpoint); + +// +// Proxy Configuration Cluster +// + +/** @brief Proxy Configuration Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyConfigurationClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief Proxy Configuration Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyConfigurationClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief Proxy Configuration Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterProxyConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Proxy Configuration Cluster Client Attribute Changed + * + * Client Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterProxyConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Proxy Configuration Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfProxyConfigurationClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Proxy Configuration Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfProxyConfigurationClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Proxy Configuration Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterProxyConfigurationClusterServerPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Proxy Configuration Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterProxyConfigurationClusterClientPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Proxy Configuration Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfProxyConfigurationClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief Proxy Configuration Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfProxyConfigurationClusterClientTickCallback(chip::EndpointId endpoint); + +// +// Proxy Discovery Cluster +// + +/** @brief Proxy Discovery Cluster Server Init + * + * Server Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyDiscoveryClusterServerInitCallback(chip::EndpointId endpoint); + +/** @brief Proxy Discovery Cluster Client Init + * + * Client Init + * + * @param endpoint Endpoint that is being initialized + */ +void emberAfProxyDiscoveryClusterClientInitCallback(chip::EndpointId endpoint); + +/** @brief Proxy Discovery Cluster Server Attribute Changed + * + * Server Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterProxyDiscoveryClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Proxy Discovery Cluster Client Attribute Changed + * + * Client Attribute Changed + * + * @param attributePath Concrete attribute path that changed + */ +void MatterProxyDiscoveryClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); + +/** @brief Proxy Discovery Cluster Server Message Sent + * + * Server Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfProxyDiscoveryClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Proxy Discovery Cluster Client Message Sent + * + * Client Message Sent + * + * @param destination The destination to which the message was sent + * @param apsFrame The APS frame for the message + * @param msgLen The length of the message + * @param message The message that was sent + * @param status The status of the sent message + */ +void emberAfProxyDiscoveryClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, + EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, + EmberStatus status); + +/** @brief Proxy Discovery Cluster Server Pre Attribute Changed + * + * Server Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterProxyDiscoveryClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Proxy Discovery Cluster Client Pre Attribute Changed + * + * Client Pre Attribute Changed + * + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status +MatterProxyDiscoveryClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** @brief Proxy Discovery Cluster Server Tick + * + * Server Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfProxyDiscoveryClusterServerTickCallback(chip::EndpointId endpoint); + +/** @brief Proxy Discovery Cluster Client Tick + * + * Client Tick + * + * @param endpoint Endpoint that is being served + */ +void emberAfProxyDiscoveryClusterClientTickCallback(chip::EndpointId endpoint); + +// +// Proxy Valid Cluster +// + +/** @brief Proxy Valid Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfUserLabelClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfProxyValidClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief User Label Cluster Client Init +/** @brief Proxy Valid Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfUserLabelClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfProxyValidClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief User Label Cluster Server Attribute Changed +/** @brief Proxy Valid Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterUserLabelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterProxyValidClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief User Label Cluster Client Attribute Changed +/** @brief Proxy Valid Cluster Client Attribute Changed * * Client Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterUserLabelClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterProxyValidClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief User Label Cluster Server Message Sent +/** @brief Proxy Valid Cluster Server Message Sent * * Server Message Sent * @@ -5068,10 +5726,10 @@ void MatterUserLabelClusterClientAttributeChangedCallback(const chip::app::Concr * @param message The message that was sent * @param status The status of the sent message */ -void emberAfUserLabelClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status); +void emberAfProxyValidClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); -/** @brief User Label Cluster Client Message Sent +/** @brief Proxy Valid Cluster Client Message Sent * * Client Message Sent * @@ -5081,10 +5739,10 @@ void emberAfUserLabelClusterServerMessageSentCallback(const chip::MessageSendDes * @param message The message that was sent * @param status The status of the sent message */ -void emberAfUserLabelClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status); +void emberAfProxyValidClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, + uint16_t msgLen, uint8_t * message, EmberStatus status); -/** @brief User Label Cluster Server Pre Attribute Changed +/** @brief Proxy Valid Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -5094,10 +5752,10 @@ void emberAfUserLabelClusterClientMessageSentCallback(const chip::MessageSendDes * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterUserLabelClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +MatterProxyValidClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief User Label Cluster Client Pre Attribute Changed +/** @brief Proxy Valid Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -5107,24 +5765,24 @@ MatterUserLabelClusterServerPreAttributeChangedCallback(const chip::app::Concret * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterUserLabelClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +MatterProxyValidClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief User Label Cluster Server Tick +/** @brief Proxy Valid Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfUserLabelClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfProxyValidClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief User Label Cluster Client Tick +/** @brief Proxy Valid Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfUserLabelClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfProxyValidClusterClientTickCallback(chip::EndpointId endpoint); // // Boolean State Cluster @@ -12598,214 +13256,6 @@ void emberAfElectricalMeasurementClusterServerTickCallback(chip::EndpointId endp */ void emberAfElectricalMeasurementClusterClientTickCallback(chip::EndpointId endpoint); -// -// Binding Cluster -// - -/** @brief Binding Cluster Server Init - * - * Server Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfBindingClusterServerInitCallback(chip::EndpointId endpoint); - -/** @brief Binding Cluster Client Init - * - * Client Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfBindingClusterClientInitCallback(chip::EndpointId endpoint); - -/** @brief Binding Cluster Server Attribute Changed - * - * Server Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBindingClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Binding Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBindingClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Binding Cluster Server Message Sent - * - * Server Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfBindingClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status); - -/** @brief Binding Cluster Client Message Sent - * - * Client Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfBindingClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, EmberApsFrame * apsFrame, - uint16_t msgLen, uint8_t * message, EmberStatus status); - -/** @brief Binding Cluster Server Pre Attribute Changed - * - * Server Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status -MatterBindingClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Binding Cluster Client Pre Attribute Changed - * - * Client Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status -MatterBindingClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Binding Cluster Server Tick - * - * Server Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfBindingClusterServerTickCallback(chip::EndpointId endpoint); - -/** @brief Binding Cluster Client Tick - * - * Client Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfBindingClusterClientTickCallback(chip::EndpointId endpoint); - -// -// Group Key Management Cluster -// - -/** @brief Group Key Management Cluster Server Init - * - * Server Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfGroupKeyManagementClusterServerInitCallback(chip::EndpointId endpoint); - -/** @brief Group Key Management Cluster Client Init - * - * Client Init - * - * @param endpoint Endpoint that is being initialized - */ -void emberAfGroupKeyManagementClusterClientInitCallback(chip::EndpointId endpoint); - -/** @brief Group Key Management Cluster Server Attribute Changed - * - * Server Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterGroupKeyManagementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Group Key Management Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterGroupKeyManagementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - -/** @brief Group Key Management Cluster Server Message Sent - * - * Server Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfGroupKeyManagementClusterServerMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Group Key Management Cluster Client Message Sent - * - * Client Message Sent - * - * @param destination The destination to which the message was sent - * @param apsFrame The APS frame for the message - * @param msgLen The length of the message - * @param message The message that was sent - * @param status The status of the sent message - */ -void emberAfGroupKeyManagementClusterClientMessageSentCallback(const chip::MessageSendDestination & destination, - EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, - EmberStatus status); - -/** @brief Group Key Management Cluster Server Pre Attribute Changed - * - * Server Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status MatterGroupKeyManagementClusterServerPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Group Key Management Cluster Client Pre Attribute Changed - * - * Client Pre Attribute Changed - * - * @param attributePath Concrete attribute path to be changed - * @param attributeType Attribute type - * @param size Attribute size - * @param value Attribute value - */ -chip::Protocols::InteractionModel::Status MatterGroupKeyManagementClusterClientPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); - -/** @brief Group Key Management Cluster Server Tick - * - * Server Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfGroupKeyManagementClusterServerTickCallback(chip::EndpointId endpoint); - -/** @brief Group Key Management Cluster Client Tick - * - * Client Tick - * - * @param endpoint Endpoint that is being served - */ -void emberAfGroupKeyManagementClusterClientTickCallback(chip::EndpointId endpoint); - // Cluster Commands Callback /** @@ -13285,6 +13735,16 @@ bool emberAfApplianceControlClusterOverloadPauseCallback( bool emberAfApplianceControlClusterOverloadWarningCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ApplianceControl::Commands::OverloadWarning::DecodableType & commandData); +/** + * @brief Binding Cluster Bind Command callback (from client) + */ +bool emberAfBindingClusterBindCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::Binding::Commands::Bind::DecodableType & commandData); +/** + * @brief Binding Cluster Unbind Command callback (from client) + */ +bool emberAfBindingClusterUnbindCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::Binding::Commands::Unbind::DecodableType & commandData); /** * @brief Poll Control Cluster CheckIn Command callback (from server) */ @@ -14937,16 +15397,6 @@ bool emberAfElectricalMeasurementClusterGetMeasurementProfileResponseCommandCall bool emberAfElectricalMeasurementClusterGetMeasurementProfileCommandCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileCommand::DecodableType & commandData); -/** - * @brief Binding Cluster Bind Command callback (from client) - */ -bool emberAfBindingClusterBindCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Binding::Commands::Bind::DecodableType & commandData); -/** - * @brief Binding Cluster Unbind Command callback (from client) - */ -bool emberAfBindingClusterUnbindCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Binding::Commands::Unbind::DecodableType & commandData); /** @brief Add To Current App Tasks * diff --git a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h index 649b7d3019e02e..99c87b1f349b7c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h +++ b/zzz_generated/app-common/app-common/zap-generated/callbacks/PluginCallbacks.h @@ -45,8 +45,12 @@ void __attribute__((weak)) MatterPowerProfilePluginClientInitCallback() {} void MatterPowerProfilePluginServerInitCallback(); void __attribute__((weak)) MatterApplianceControlPluginClientInitCallback() {} void MatterApplianceControlPluginServerInitCallback(); +void __attribute__((weak)) MatterPulseWidthModulationPluginClientInitCallback() {} +void MatterPulseWidthModulationPluginServerInitCallback(); void __attribute__((weak)) MatterDescriptorPluginClientInitCallback() {} void MatterDescriptorPluginServerInitCallback(); +void __attribute__((weak)) MatterBindingPluginClientInitCallback() {} +void MatterBindingPluginServerInitCallback(); void __attribute__((weak)) MatterAccessControlPluginClientInitCallback() {} void MatterAccessControlPluginServerInitCallback(); void __attribute__((weak)) MatterPollControlPluginClientInitCallback() {} @@ -95,10 +99,18 @@ void __attribute__((weak)) MatterAdministratorCommissioningPluginClientInitCallb void MatterAdministratorCommissioningPluginServerInitCallback(); void __attribute__((weak)) MatterOperationalCredentialsPluginClientInitCallback() {} void MatterOperationalCredentialsPluginServerInitCallback(); +void __attribute__((weak)) MatterGroupKeyManagementPluginClientInitCallback() {} +void MatterGroupKeyManagementPluginServerInitCallback(); void __attribute__((weak)) MatterFixedLabelPluginClientInitCallback() {} void MatterFixedLabelPluginServerInitCallback(); void __attribute__((weak)) MatterUserLabelPluginClientInitCallback() {} void MatterUserLabelPluginServerInitCallback(); +void __attribute__((weak)) MatterProxyConfigurationPluginClientInitCallback() {} +void MatterProxyConfigurationPluginServerInitCallback(); +void __attribute__((weak)) MatterProxyDiscoveryPluginClientInitCallback() {} +void MatterProxyDiscoveryPluginServerInitCallback(); +void __attribute__((weak)) MatterProxyValidPluginClientInitCallback() {} +void MatterProxyValidPluginServerInitCallback(); void __attribute__((weak)) MatterBooleanStatePluginClientInitCallback() {} void MatterBooleanStatePluginServerInitCallback(); void __attribute__((weak)) MatterModeSelectPluginClientInitCallback() {} @@ -241,7 +253,3 @@ void __attribute__((weak)) MatterApplianceStatisticsPluginClientInitCallback() { void MatterApplianceStatisticsPluginServerInitCallback(); void __attribute__((weak)) MatterElectricalMeasurementPluginClientInitCallback() {} void MatterElectricalMeasurementPluginServerInitCallback(); -void __attribute__((weak)) MatterBindingPluginClientInitCallback() {} -void MatterBindingPluginServerInitCallback(); -void __attribute__((weak)) MatterGroupKeyManagementPluginClientInitCallback() {} -void MatterGroupKeyManagementPluginServerInitCallback(); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h index 2c627c51dc6ed6..11539caeb01ba5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h @@ -61,9 +61,15 @@ static constexpr chip::ClusterId ZCL_POWER_PROFILE_CLUSTER_ID = 0x001A; // Definitions for cluster: Appliance Control static constexpr chip::ClusterId ZCL_APPLIANCE_CONTROL_CLUSTER_ID = 0x001B; +// Definitions for cluster: Pulse Width Modulation +static constexpr chip::ClusterId ZCL_PWM_CLUSTER_ID = 0x001C; + // Definitions for cluster: Descriptor static constexpr chip::ClusterId ZCL_DESCRIPTOR_CLUSTER_ID = 0x001D; +// Definitions for cluster: Binding +static constexpr chip::ClusterId ZCL_BINDING_CLUSTER_ID = 0x001E; + // Definitions for cluster: Access Control static constexpr chip::ClusterId ZCL_ACCESS_CONTROL_CLUSTER_ID = 0x001F; @@ -136,12 +142,24 @@ static constexpr chip::ClusterId ZCL_ADMINISTRATOR_COMMISSIONING_CLUSTER_ID = 0x // Definitions for cluster: Operational Credentials static constexpr chip::ClusterId ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID = 0x003E; +// Definitions for cluster: Group Key Management +static constexpr chip::ClusterId ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID = 0x003F; + // Definitions for cluster: Fixed Label static constexpr chip::ClusterId ZCL_FIXED_LABEL_CLUSTER_ID = 0x0040; // Definitions for cluster: User Label static constexpr chip::ClusterId ZCL_USER_LABEL_CLUSTER_ID = 0x0041; +// Definitions for cluster: Proxy Configuration +static constexpr chip::ClusterId ZCL_PROXY_CONFIGURATION_CLUSTER_ID = 0x0042; + +// Definitions for cluster: Proxy Discovery +static constexpr chip::ClusterId ZCL_PROXY_DISCOVERY_CLUSTER_ID = 0x0043; + +// Definitions for cluster: Proxy Valid +static constexpr chip::ClusterId ZCL_PROXY_VALID_CLUSTER_ID = 0x0044; + // Definitions for cluster: Boolean State static constexpr chip::ClusterId ZCL_BOOLEAN_STATE_CLUSTER_ID = 0x0045; @@ -354,9 +372,3 @@ static constexpr chip::ClusterId ZCL_APPLIANCE_STATISTICS_CLUSTER_ID = 0x0B03; // Definitions for cluster: Electrical Measurement static constexpr chip::ClusterId ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID = 0x0B04; - -// Definitions for cluster: Binding -static constexpr chip::ClusterId ZCL_BINDING_CLUSTER_ID = 0xF000; - -// Definitions for cluster: Group Key Management -static constexpr chip::ClusterId ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID = 0xF004; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 32d3866d716a1b..eb75909b970501 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -3519,6 +3519,15 @@ namespace Events { } // namespace Events } // namespace ApplianceControl +namespace PulseWidthModulation { + +namespace Commands { +} // namespace Commands + +namespace Events { +} // namespace Events + +} // namespace PulseWidthModulation namespace Descriptor { namespace Structs { namespace DeviceType { @@ -3570,6 +3579,107 @@ namespace Events { } // namespace Events } // namespace Descriptor +namespace Binding { + +namespace Commands { +namespace Bind { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNodeId)), nodeId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpointId)), endpointId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClusterId)), clusterId)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kNodeId): + ReturnErrorOnFailure(DataModel::Decode(reader, nodeId)); + break; + case to_underlying(Fields::kGroupId): + ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + break; + case to_underlying(Fields::kEndpointId): + ReturnErrorOnFailure(DataModel::Decode(reader, endpointId)); + break; + case to_underlying(Fields::kClusterId): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterId)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +} // namespace Bind. +namespace Unbind { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNodeId)), nodeId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpointId)), endpointId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClusterId)), clusterId)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + ReturnErrorOnFailure(reader.EnterContainer(outer)); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kNodeId): + ReturnErrorOnFailure(DataModel::Decode(reader, nodeId)); + break; + case to_underlying(Fields::kGroupId): + ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + break; + case to_underlying(Fields::kEndpointId): + ReturnErrorOnFailure(DataModel::Decode(reader, endpointId)); + break; + case to_underlying(Fields::kClusterId): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterId)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} +} // namespace Unbind. +} // namespace Commands + +namespace Events { +} // namespace Events + +} // namespace Binding namespace AccessControl { namespace Structs { namespace Target { @@ -8409,6 +8519,115 @@ namespace Events { } // namespace Events } // namespace OperationalCredentials +namespace GroupKeyManagement { +namespace Structs { +namespace GroupKey { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeyIndex)), groupKeyIndex)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeyRoot)), groupKeyRoot)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeyEpochStartTime)), groupKeyEpochStartTime)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeySecurityPolicy)), groupKeySecurityPolicy)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kVendorId): + ReturnErrorOnFailure(DataModel::Decode(reader, vendorId)); + break; + case to_underlying(Fields::kGroupKeyIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyIndex)); + break; + case to_underlying(Fields::kGroupKeyRoot): + ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyRoot)); + break; + case to_underlying(Fields::kGroupKeyEpochStartTime): + ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyEpochStartTime)); + break; + case to_underlying(Fields::kGroupKeySecurityPolicy): + ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySecurityPolicy)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} + +} // namespace GroupKey +namespace GroupState { +CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const +{ + TLV::TLVType outer; + ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorGroupId)), vendorGroupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeySetIndex)), groupKeySetIndex)); + ReturnErrorOnFailure(writer.EndContainer(outer)); + return CHIP_NO_ERROR; +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + CHIP_ERROR err = CHIP_NO_ERROR; + TLV::TLVType outer; + VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); + while ((err = reader.Next()) == CHIP_NO_ERROR) + { + VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); + switch (TLV::TagNumFromTag(reader.GetTag())) + { + case to_underlying(Fields::kVendorId): + ReturnErrorOnFailure(DataModel::Decode(reader, vendorId)); + break; + case to_underlying(Fields::kVendorGroupId): + ReturnErrorOnFailure(DataModel::Decode(reader, vendorGroupId)); + break; + case to_underlying(Fields::kGroupKeySetIndex): + ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySetIndex)); + break; + default: + break; + } + } + + VerifyOrReturnError(err == CHIP_END_OF_TLV, err); + ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; +} + +} // namespace GroupState +} // namespace Structs + +namespace Commands { +} // namespace Commands + +namespace Events { +} // namespace Events + +} // namespace GroupKeyManagement namespace FixedLabel { namespace Structs { namespace LabelStruct { @@ -8511,6 +8730,33 @@ namespace Events { } // namespace Events } // namespace UserLabel +namespace ProxyConfiguration { + +namespace Commands { +} // namespace Commands + +namespace Events { +} // namespace Events + +} // namespace ProxyConfiguration +namespace ProxyDiscovery { + +namespace Commands { +} // namespace Commands + +namespace Events { +} // namespace Events + +} // namespace ProxyDiscovery +namespace ProxyValid { + +namespace Commands { +} // namespace Commands + +namespace Events { +} // namespace Events + +} // namespace ProxyValid namespace BooleanState { namespace Commands { @@ -19283,216 +19529,6 @@ namespace Events { } // namespace Events } // namespace ElectricalMeasurement -namespace Binding { - -namespace Commands { -namespace Bind { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNodeId)), nodeId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpointId)), endpointId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClusterId)), clusterId)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNodeId): - ReturnErrorOnFailure(DataModel::Decode(reader, nodeId)); - break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); - break; - case to_underlying(Fields::kEndpointId): - ReturnErrorOnFailure(DataModel::Decode(reader, endpointId)); - break; - case to_underlying(Fields::kClusterId): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterId)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace Bind. -namespace Unbind { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kNodeId)), nodeId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kEndpointId)), endpointId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClusterId)), clusterId)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNodeId): - ReturnErrorOnFailure(DataModel::Decode(reader, nodeId)); - break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); - break; - case to_underlying(Fields::kEndpointId): - ReturnErrorOnFailure(DataModel::Decode(reader, endpointId)); - break; - case to_underlying(Fields::kClusterId): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterId)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace Unbind. -} // namespace Commands - -namespace Events { -} // namespace Events - -} // namespace Binding -namespace GroupKeyManagement { -namespace Structs { -namespace GroupKey { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeyIndex)), groupKeyIndex)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeyRoot)), groupKeyRoot)); - ReturnErrorOnFailure( - DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeyEpochStartTime)), groupKeyEpochStartTime)); - ReturnErrorOnFailure( - DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeySecurityPolicy)), groupKeySecurityPolicy)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - err = reader.EnterContainer(outer); - ReturnErrorOnFailure(err); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kVendorId): - ReturnErrorOnFailure(DataModel::Decode(reader, vendorId)); - break; - case to_underlying(Fields::kGroupKeyIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyIndex)); - break; - case to_underlying(Fields::kGroupKeyRoot): - ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyRoot)); - break; - case to_underlying(Fields::kGroupKeyEpochStartTime): - ReturnErrorOnFailure(DataModel::Decode(reader, groupKeyEpochStartTime)); - break; - case to_underlying(Fields::kGroupKeySecurityPolicy): - ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySecurityPolicy)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} - -} // namespace GroupKey -namespace GroupState { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorId)), vendorId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kVendorGroupId)), vendorGroupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupKeySetIndex)), groupKeySetIndex)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - err = reader.EnterContainer(outer); - ReturnErrorOnFailure(err); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - VerifyOrReturnError(TLV::IsContextTag(reader.GetTag()), CHIP_ERROR_INVALID_TLV_TAG); - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kVendorId): - ReturnErrorOnFailure(DataModel::Decode(reader, vendorId)); - break; - case to_underlying(Fields::kVendorGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, vendorGroupId)); - break; - case to_underlying(Fields::kGroupKeySetIndex): - ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySetIndex)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} - -} // namespace GroupState -} // namespace Structs - -namespace Commands { -} // namespace Commands - -namespace Events { -} // namespace Events - -} // namespace GroupKeyManagement } // namespace Clusters } // namespace app diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 16c853557b2d14..16e2584761f214 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -5535,6 +5535,35 @@ struct TypeInfo } // namespace ClusterRevision } // namespace Attributes } // namespace ApplianceControl +namespace PulseWidthModulation { + +namespace Attributes { +namespace FeatureMap { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::PulseWidthModulation::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ClusterRevision +} // namespace Attributes +} // namespace PulseWidthModulation namespace Descriptor { namespace Structs { @@ -5635,6 +5664,135 @@ struct TypeInfo } // namespace ClusterRevision } // namespace Attributes } // namespace Descriptor +namespace Binding { + +namespace Commands { +// Forward-declarations so we can reference these later. + +namespace Bind { +struct Type; +struct DecodableType; +} // namespace Bind + +namespace Unbind { +struct Type; +struct DecodableType; +} // namespace Unbind + +} // namespace Commands + +namespace Commands { +namespace Bind { +enum class Fields +{ + kNodeId = 0, + kGroupId = 1, + kEndpointId = 2, + kClusterId = 3, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::Bind::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } + + chip::NodeId nodeId; + chip::GroupId groupId; + chip::EndpointId endpointId; + chip::ClusterId clusterId; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::Bind::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } + + chip::NodeId nodeId; + chip::GroupId groupId; + chip::EndpointId endpointId; + chip::ClusterId clusterId; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace Bind +namespace Unbind { +enum class Fields +{ + kNodeId = 0, + kGroupId = 1, + kEndpointId = 2, + kClusterId = 3, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::Unbind::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } + + chip::NodeId nodeId; + chip::GroupId groupId; + chip::EndpointId endpointId; + chip::ClusterId clusterId; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::Unbind::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } + + chip::NodeId nodeId; + chip::GroupId groupId; + chip::EndpointId endpointId; + chip::ClusterId clusterId; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace Unbind +} // namespace Commands + +namespace Attributes { +namespace FeatureMap { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ClusterRevision +} // namespace Attributes +} // namespace Binding namespace AccessControl { // Enum for AuthMode enum class AuthMode : uint8_t @@ -13435,6 +13593,116 @@ struct TypeInfo } // namespace ClusterRevision } // namespace Attributes } // namespace OperationalCredentials +namespace GroupKeyManagement { +// Enum for GroupKeySecurityPolicy +enum class GroupKeySecurityPolicy : uint8_t +{ + kStandard = 0x00, + kLowLatency = 0x01, +}; + +namespace Structs { +namespace GroupKey { +enum class Fields +{ + kVendorId = 1, + kGroupKeyIndex = 2, + kGroupKeyRoot = 3, + kGroupKeyEpochStartTime = 4, + kGroupKeySecurityPolicy = 5, +}; + +struct Type +{ +public: + uint16_t vendorId; + uint16_t groupKeyIndex; + chip::ByteSpan groupKeyRoot; + uint64_t groupKeyEpochStartTime; + GroupKeySecurityPolicy groupKeySecurityPolicy; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; + +using DecodableType = Type; + +} // namespace GroupKey +namespace GroupState { +enum class Fields +{ + kVendorId = 1, + kVendorGroupId = 2, + kGroupKeySetIndex = 3, +}; + +struct Type +{ +public: + uint16_t vendorId; + uint16_t vendorGroupId; + uint16_t groupKeySetIndex; + + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; + +using DecodableType = Type; + +} // namespace GroupState +} // namespace Structs + +namespace Attributes { +namespace Groups { +struct TypeInfo +{ + using Type = DataModel::List; + using DecodableType = DataModel::DecodableList; + using DecodableArgType = const DataModel::DecodableList &; + + static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::Groups::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace Groups +namespace GroupKeys { +struct TypeInfo +{ + using Type = DataModel::List; + using DecodableType = DataModel::DecodableList; + using DecodableArgType = const DataModel::DecodableList &; + + static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::GroupKeys::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace GroupKeys +namespace FeatureMap { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ClusterRevision +} // namespace Attributes +} // namespace GroupKeyManagement namespace FixedLabel { namespace Structs { @@ -13528,15 +13796,102 @@ namespace Attributes { namespace LabelList { struct TypeInfo { - using Type = DataModel::List; - using DecodableType = DataModel::DecodableList; - using DecodableArgType = const DataModel::DecodableList &; + using Type = DataModel::List; + using DecodableType = DataModel::DecodableList; + using DecodableArgType = const DataModel::DecodableList &; + + static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::LabelList::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace LabelList +namespace FeatureMap { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ClusterRevision +} // namespace Attributes +} // namespace UserLabel +namespace ProxyConfiguration { + +namespace Attributes { +namespace FeatureMap { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::ProxyConfiguration::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ClusterRevision +} // namespace Attributes +} // namespace ProxyConfiguration +namespace ProxyDiscovery { + +namespace Attributes { +namespace FeatureMap { +struct TypeInfo +{ + using Type = uint32_t; + using DecodableType = uint32_t; + using DecodableArgType = uint32_t; + + static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo +{ + using Type = uint16_t; + using DecodableType = uint16_t; + using DecodableArgType = uint16_t; - static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::LabelList::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ProxyDiscovery::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace LabelList +} // namespace ClusterRevision +} // namespace Attributes +} // namespace ProxyDiscovery +namespace ProxyValid { + +namespace Attributes { namespace FeatureMap { struct TypeInfo { @@ -13544,7 +13899,7 @@ struct TypeInfo using DecodableType = uint32_t; using DecodableArgType = uint32_t; - static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -13556,13 +13911,13 @@ struct TypeInfo using DecodableType = uint16_t; using DecodableArgType = uint16_t; - static constexpr ClusterId GetClusterId() { return Clusters::UserLabel::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::ProxyValid::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace ClusterRevision } // namespace Attributes -} // namespace UserLabel +} // namespace ProxyValid namespace BooleanState { namespace Attributes { @@ -34896,245 +35251,6 @@ struct TypeInfo } // namespace ClusterRevision } // namespace Attributes } // namespace ElectricalMeasurement -namespace Binding { - -namespace Commands { -// Forward-declarations so we can reference these later. - -namespace Bind { -struct Type; -struct DecodableType; -} // namespace Bind - -namespace Unbind { -struct Type; -struct DecodableType; -} // namespace Unbind - -} // namespace Commands - -namespace Commands { -namespace Bind { -enum class Fields -{ - kNodeId = 0, - kGroupId = 1, - kEndpointId = 2, - kClusterId = 3, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::Bind::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } - - chip::NodeId nodeId; - chip::GroupId groupId; - chip::EndpointId endpointId; - chip::ClusterId clusterId; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::Bind::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } - - chip::NodeId nodeId; - chip::GroupId groupId; - chip::EndpointId endpointId; - chip::ClusterId clusterId; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace Bind -namespace Unbind { -enum class Fields -{ - kNodeId = 0, - kGroupId = 1, - kEndpointId = 2, - kClusterId = 3, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::Unbind::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } - - chip::NodeId nodeId; - chip::GroupId groupId; - chip::EndpointId endpointId; - chip::ClusterId clusterId; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::Unbind::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } - - chip::NodeId nodeId; - chip::GroupId groupId; - chip::EndpointId endpointId; - chip::ClusterId clusterId; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace Unbind -} // namespace Commands - -namespace Attributes { -namespace FeatureMap { -struct TypeInfo -{ - using Type = uint32_t; - using DecodableType = uint32_t; - using DecodableArgType = uint32_t; - - static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace FeatureMap -namespace ClusterRevision { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::Binding::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace ClusterRevision -} // namespace Attributes -} // namespace Binding -namespace GroupKeyManagement { -// Enum for GroupKeySecurityPolicy -enum class GroupKeySecurityPolicy : uint8_t -{ - kStandard = 0x00, - kLowLatency = 0x01, -}; - -namespace Structs { -namespace GroupKey { -enum class Fields -{ - kVendorId = 1, - kGroupKeyIndex = 2, - kGroupKeyRoot = 3, - kGroupKeyEpochStartTime = 4, - kGroupKeySecurityPolicy = 5, -}; - -struct Type -{ -public: - uint16_t vendorId; - uint16_t groupKeyIndex; - chip::ByteSpan groupKeyRoot; - uint64_t groupKeyEpochStartTime; - GroupKeySecurityPolicy groupKeySecurityPolicy; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; - -using DecodableType = Type; - -} // namespace GroupKey -namespace GroupState { -enum class Fields -{ - kVendorId = 1, - kVendorGroupId = 2, - kGroupKeySetIndex = 3, -}; - -struct Type -{ -public: - uint16_t vendorId; - uint16_t vendorGroupId; - uint16_t groupKeySetIndex; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; - -using DecodableType = Type; - -} // namespace GroupState -} // namespace Structs - -namespace Attributes { -namespace Groups { -struct TypeInfo -{ - using Type = DataModel::List; - using DecodableType = DataModel::DecodableList; - using DecodableArgType = const DataModel::DecodableList &; - - static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::Groups::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace Groups -namespace GroupKeys { -struct TypeInfo -{ - using Type = DataModel::List; - using DecodableType = DataModel::DecodableList; - using DecodableArgType = const DataModel::DecodableList &; - - static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::GroupKeys::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace GroupKeys -namespace FeatureMap { -struct TypeInfo -{ - using Type = uint32_t; - using DecodableType = uint32_t; - using DecodableArgType = uint32_t; - - static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::FeatureMap::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace FeatureMap -namespace ClusterRevision { -struct TypeInfo -{ - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; - - static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ClusterRevision::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace ClusterRevision -} // namespace Attributes -} // namespace GroupKeyManagement } // namespace Clusters } // namespace app diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index 9d71139d46086f..9c27f255f11fa4 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -130,6 +130,10 @@ #define ZCL_OVERLOAD_PAUSE_COMMAND_ID (0x04) #define ZCL_OVERLOAD_WARNING_COMMAND_ID (0x05) +// Commands for cluster: Binding +#define ZCL_BIND_COMMAND_ID (0x00) +#define ZCL_UNBIND_COMMAND_ID (0x01) + // Commands for cluster: Poll Control #define ZCL_CHECK_IN_COMMAND_ID (0x00) #define ZCL_CHECK_IN_RESPONSE_COMMAND_ID (0x00) @@ -490,7 +494,3 @@ #define ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID (0x00) #define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01) #define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01) - -// Commands for cluster: Binding -#define ZCL_BIND_COMMAND_ID (0x00) -#define ZCL_UNBIND_COMMAND_ID (0x01) diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 6d327f13dd49a8..c5dc718a257973 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -717,6 +717,20 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace ApplianceControl +namespace PulseWidthModulation { +namespace Attributes { + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace PulseWidthModulation + namespace Descriptor { namespace Attributes { @@ -747,6 +761,20 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace Descriptor +namespace Binding { +namespace Attributes { + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace Binding + namespace AccessControl { namespace Attributes { @@ -1839,6 +1867,28 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace OperationalCredentials +namespace GroupKeyManagement { +namespace Attributes { + +namespace Groups { +static constexpr AttributeId Id = 0x00000000; +} // namespace Groups + +namespace GroupKeys { +static constexpr AttributeId Id = 0x00000001; +} // namespace GroupKeys + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace GroupKeyManagement + namespace FixedLabel { namespace Attributes { @@ -1875,6 +1925,48 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace UserLabel +namespace ProxyConfiguration { +namespace Attributes { + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace ProxyConfiguration + +namespace ProxyDiscovery { +namespace Attributes { + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace ProxyDiscovery + +namespace ProxyValid { +namespace Attributes { + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace ProxyValid + namespace BooleanState { namespace Attributes { @@ -5541,42 +5633,6 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace ElectricalMeasurement -namespace Binding { -namespace Attributes { - -namespace FeatureMap { -static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; -} // namespace FeatureMap - -namespace ClusterRevision { -static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace Binding - -namespace GroupKeyManagement { -namespace Attributes { - -namespace Groups { -static constexpr AttributeId Id = 0x00000000; -} // namespace Groups - -namespace GroupKeys { -static constexpr AttributeId Id = 0x00000001; -} // namespace GroupKeys - -namespace FeatureMap { -static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; -} // namespace FeatureMap - -namespace ClusterRevision { -static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; -} // namespace ClusterRevision - -} // namespace Attributes -} // namespace GroupKeyManagement - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h index d4e16013f80a0f..311692b53d8be3 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h @@ -64,9 +64,15 @@ static constexpr ClusterId Id = 0x0000001A; namespace ApplianceControl { static constexpr ClusterId Id = 0x0000001B; } // namespace ApplianceControl +namespace PulseWidthModulation { +static constexpr ClusterId Id = 0x0000001C; +} // namespace PulseWidthModulation namespace Descriptor { static constexpr ClusterId Id = 0x0000001D; } // namespace Descriptor +namespace Binding { +static constexpr ClusterId Id = 0x0000001E; +} // namespace Binding namespace AccessControl { static constexpr ClusterId Id = 0x0000001F; } // namespace AccessControl @@ -139,12 +145,24 @@ static constexpr ClusterId Id = 0x0000003C; namespace OperationalCredentials { static constexpr ClusterId Id = 0x0000003E; } // namespace OperationalCredentials +namespace GroupKeyManagement { +static constexpr ClusterId Id = 0x0000003F; +} // namespace GroupKeyManagement namespace FixedLabel { static constexpr ClusterId Id = 0x00000040; } // namespace FixedLabel namespace UserLabel { static constexpr ClusterId Id = 0x00000041; } // namespace UserLabel +namespace ProxyConfiguration { +static constexpr ClusterId Id = 0x00000042; +} // namespace ProxyConfiguration +namespace ProxyDiscovery { +static constexpr ClusterId Id = 0x00000043; +} // namespace ProxyDiscovery +namespace ProxyValid { +static constexpr ClusterId Id = 0x00000044; +} // namespace ProxyValid namespace BooleanState { static constexpr ClusterId Id = 0x00000045; } // namespace BooleanState @@ -358,12 +376,6 @@ static constexpr ClusterId Id = 0x00000B03; namespace ElectricalMeasurement { static constexpr ClusterId Id = 0x00000B04; } // namespace ElectricalMeasurement -namespace Binding { -static constexpr ClusterId Id = 0x0000F000; -} // namespace Binding -namespace GroupKeyManagement { -static constexpr ClusterId Id = 0x0000F004; -} // namespace GroupKeyManagement } // namespace Clusters } // namespace app diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index 004ac46f9322ea..b455c92ad3a917 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -403,6 +403,20 @@ static constexpr CommandId Id = 0x00000005; } // namespace Commands } // namespace ApplianceControl +namespace Binding { +namespace Commands { + +namespace Bind { +static constexpr CommandId Id = 0x00000000; +} // namespace Bind + +namespace Unbind { +static constexpr CommandId Id = 0x00000001; +} // namespace Unbind + +} // namespace Commands +} // namespace Binding + namespace PollControl { namespace Commands { @@ -1767,20 +1781,6 @@ static constexpr CommandId Id = 0x00000001; } // namespace Commands } // namespace ElectricalMeasurement -namespace Binding { -namespace Commands { - -namespace Bind { -static constexpr CommandId Id = 0x00000000; -} // namespace Bind - -namespace Unbind { -static constexpr CommandId Id = 0x00000001; -} // namespace Unbind - -} // namespace Commands -} // namespace Binding - } // namespace Clusters } // namespace app } // namespace chip diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index 55eebfde75329d..7f08003e103c0e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -102,12 +102,24 @@ #define CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER #endif +#if defined(ZCL_USING_PWM_CLUSTER_SERVER) || defined(ZCL_USING_PWM_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_PWM_CLUSTER { ZCL_PWM_CLUSTER_ID, 28, "Pulse Width Modulation" }, +#else +#define CHIP_PRINTCLUSTER_PWM_CLUSTER +#endif + #if defined(ZCL_USING_DESCRIPTOR_CLUSTER_SERVER) || defined(ZCL_USING_DESCRIPTOR_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER { ZCL_DESCRIPTOR_CLUSTER_ID, 29, "Descriptor" }, #else #define CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER #endif +#if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 30, "Binding" }, +#else +#define CHIP_PRINTCLUSTER_BINDING_CLUSTER +#endif + #if defined(ZCL_USING_ACCESS_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_ACCESS_CONTROL_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER { ZCL_ACCESS_CONTROL_CLUSTER_ID, 31, "Access Control" }, #else @@ -259,6 +271,12 @@ #define CHIP_PRINTCLUSTER_OPERATIONAL_CREDENTIALS_CLUSTER #endif +#if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 63, "Group Key Management" }, +#else +#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER +#endif + #if defined(ZCL_USING_FIXED_LABEL_CLUSTER_SERVER) || defined(ZCL_USING_FIXED_LABEL_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_FIXED_LABEL_CLUSTER { ZCL_FIXED_LABEL_CLUSTER_ID, 64, "Fixed Label" }, #else @@ -271,6 +289,24 @@ #define CHIP_PRINTCLUSTER_USER_LABEL_CLUSTER #endif +#if defined(ZCL_USING_PROXY_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_PROXY_CONFIGURATION_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_PROXY_CONFIGURATION_CLUSTER { ZCL_PROXY_CONFIGURATION_CLUSTER_ID, 66, "Proxy Configuration" }, +#else +#define CHIP_PRINTCLUSTER_PROXY_CONFIGURATION_CLUSTER +#endif + +#if defined(ZCL_USING_PROXY_DISCOVERY_CLUSTER_SERVER) || defined(ZCL_USING_PROXY_DISCOVERY_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_PROXY_DISCOVERY_CLUSTER { ZCL_PROXY_DISCOVERY_CLUSTER_ID, 67, "Proxy Discovery" }, +#else +#define CHIP_PRINTCLUSTER_PROXY_DISCOVERY_CLUSTER +#endif + +#if defined(ZCL_USING_PROXY_VALID_CLUSTER_SERVER) || defined(ZCL_USING_PROXY_VALID_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER { ZCL_PROXY_VALID_CLUSTER_ID, 68, "Proxy Valid" }, +#else +#define CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER +#endif + #if defined(ZCL_USING_BOOLEAN_STATE_CLUSTER_SERVER) || defined(ZCL_USING_BOOLEAN_STATE_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER { ZCL_BOOLEAN_STATE_CLUSTER_ID, 69, "Boolean State" }, #else @@ -764,18 +800,6 @@ #define CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER #endif -#if defined(ZCL_USING_BINDING_CLUSTER_SERVER) || defined(ZCL_USING_BINDING_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_BINDING_CLUSTER { ZCL_BINDING_CLUSTER_ID, 61440, "Binding" }, -#else -#define CHIP_PRINTCLUSTER_BINDING_CLUSTER -#endif - -#if defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER) || defined(ZCL_USING_GROUP_KEY_MANAGEMENT_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER { ZCL_GROUP_KEY_MANAGEMENT_CLUSTER_ID, 61444, "Group Key Management" }, -#else -#define CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER -#endif - #define CLUSTER_IDS_TO_NAMES \ CHIP_PRINTCLUSTER_POWER_CONFIG_CLUSTER \ CHIP_PRINTCLUSTER_DEVICE_TEMP_CLUSTER \ @@ -790,7 +814,9 @@ CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \ CHIP_PRINTCLUSTER_POWER_PROFILE_CLUSTER \ CHIP_PRINTCLUSTER_APPLIANCE_CONTROL_CLUSTER \ + CHIP_PRINTCLUSTER_PWM_CLUSTER \ CHIP_PRINTCLUSTER_DESCRIPTOR_CLUSTER \ + CHIP_PRINTCLUSTER_BINDING_CLUSTER \ CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_POLL_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_BRIDGED_ACTIONS_CLUSTER \ @@ -815,8 +841,12 @@ CHIP_PRINTCLUSTER_SWITCH_CLUSTER \ CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER \ CHIP_PRINTCLUSTER_OPERATIONAL_CREDENTIALS_CLUSTER \ + CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER \ CHIP_PRINTCLUSTER_FIXED_LABEL_CLUSTER \ CHIP_PRINTCLUSTER_USER_LABEL_CLUSTER \ + CHIP_PRINTCLUSTER_PROXY_CONFIGURATION_CLUSTER \ + CHIP_PRINTCLUSTER_PROXY_DISCOVERY_CLUSTER \ + CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER \ CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER \ CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER \ CHIP_PRINTCLUSTER_SHADE_CONFIG_CLUSTER \ @@ -887,8 +917,6 @@ CHIP_PRINTCLUSTER_METER_IDENTIFICATION_CLUSTER \ CHIP_PRINTCLUSTER_APPLIANCE_EVENTS_AND_ALERT_CLUSTER \ CHIP_PRINTCLUSTER_APPLIANCE_STATISTICS_CLUSTER \ - CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER \ - CHIP_PRINTCLUSTER_BINDING_CLUSTER \ - CHIP_PRINTCLUSTER_GROUP_KEY_MANAGEMENT_CLUSTER + CHIP_PRINTCLUSTER_ELECTRICAL_MEASUREMENT_CLUSTER #define MAX_CLUSTER_NAME_LENGTH 52 diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 83b8bd2cec5496..e850ed961d8440 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -84,6 +84,10 @@ CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalCredentials::Structs::NOCStruct::DecodableType & value); +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType & value); +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, @@ -132,10 +136,6 @@ CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TestCluster::Structs::DoubleNestedStructList::DecodableType & value); CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType & value); -CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType & value); -CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType & value); #if CHIP_PROGRESS_LOGGING std::string IndentStr(size_t indent) @@ -1267,6 +1267,87 @@ CHIP_ERROR LogValue(const char * label, size_t indent, ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); return CHIP_NO_ERROR; } +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType & value) +{ + ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); + { + CHIP_ERROR err = LogValue("VendorId", indent + 1, value.vendorId); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'VendorId'", IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("GroupKeyIndex", indent + 1, value.groupKeyIndex); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeyIndex'", IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("GroupKeyRoot", indent + 1, value.groupKeyRoot); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeyRoot'", IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("GroupKeyEpochStartTime", indent + 1, value.groupKeyEpochStartTime); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeyEpochStartTime'", + IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("GroupKeySecurityPolicy", indent + 1, value.groupKeySecurityPolicy); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeySecurityPolicy'", + IndentStr(indent + 1).c_str()); + return err; + } + } + ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); + return CHIP_NO_ERROR; +} +CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType & value) +{ + ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); + { + CHIP_ERROR err = LogValue("VendorId", indent + 1, value.vendorId); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'VendorId'", IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("VendorGroupId", indent + 1, value.vendorGroupId); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'VendorGroupId'", IndentStr(indent + 1).c_str()); + return err; + } + } + { + CHIP_ERROR err = LogValue("GroupKeySetIndex", indent + 1, value.groupKeySetIndex); + if (err != CHIP_NO_ERROR) + { + ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeySetIndex'", + IndentStr(indent + 1).c_str()); + return err; + } + } + ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); + return CHIP_NO_ERROR; +} CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType & value) { @@ -2130,87 +2211,6 @@ CHIP_ERROR LogValue(const char * label, size_t indent, ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); return CHIP_NO_ERROR; } -CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType & value) -{ - ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); - { - CHIP_ERROR err = LogValue("VendorId", indent + 1, value.vendorId); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'VendorId'", IndentStr(indent + 1).c_str()); - return err; - } - } - { - CHIP_ERROR err = LogValue("GroupKeyIndex", indent + 1, value.groupKeyIndex); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeyIndex'", IndentStr(indent + 1).c_str()); - return err; - } - } - { - CHIP_ERROR err = LogValue("GroupKeyRoot", indent + 1, value.groupKeyRoot); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeyRoot'", IndentStr(indent + 1).c_str()); - return err; - } - } - { - CHIP_ERROR err = LogValue("GroupKeyEpochStartTime", indent + 1, value.groupKeyEpochStartTime); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeyEpochStartTime'", - IndentStr(indent + 1).c_str()); - return err; - } - } - { - CHIP_ERROR err = LogValue("GroupKeySecurityPolicy", indent + 1, value.groupKeySecurityPolicy); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeySecurityPolicy'", - IndentStr(indent + 1).c_str()); - return err; - } - } - ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); - return CHIP_NO_ERROR; -} -CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType & value) -{ - ChipLogProgress(chipTool, "%s%s: {", IndentStr(indent).c_str(), label); - { - CHIP_ERROR err = LogValue("VendorId", indent + 1, value.vendorId); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'VendorId'", IndentStr(indent + 1).c_str()); - return err; - } - } - { - CHIP_ERROR err = LogValue("VendorGroupId", indent + 1, value.vendorGroupId); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'VendorGroupId'", IndentStr(indent + 1).c_str()); - return err; - } - } - { - CHIP_ERROR err = LogValue("GroupKeySetIndex", indent + 1, value.groupKeySetIndex); - if (err != CHIP_NO_ERROR) - { - ChipLogProgress(chipTool, "%sStruct truncated due to invalid value for 'GroupKeySetIndex'", - IndentStr(indent + 1).c_str()); - return err; - } - } - ChipLogProgress(chipTool, "%s}", IndentStr(indent).c_str()); - return CHIP_NO_ERROR; -} #pragma GCC diagnostic pop } // anonymous namespace @@ -4029,7 +4029,7 @@ static void OnTestClusterTestSpecificResponseSuccess( | BarrierControl | 0x0103 | | Basic | 0x0028 | | BinaryInputBasic | 0x000F | -| Binding | 0xF000 | +| Binding | 0x001E | | BooleanState | 0x0045 | | BridgedActions | 0x0025 | | BridgedDeviceBasic | 0x0039 | @@ -4044,7 +4044,7 @@ static void OnTestClusterTestSpecificResponseSuccess( | FlowMeasurement | 0x0404 | | GeneralCommissioning | 0x0030 | | GeneralDiagnostics | 0x0033 | -| GroupKeyManagement | 0xF004 | +| GroupKeyManagement | 0x003F | | Groups | 0x0004 | | Identify | 0x0003 | | IlluminanceMeasurement | 0x0400 | @@ -8581,7 +8581,7 @@ class ReportBinaryInputBasicClusterRevision : public ModelCommand }; /*----------------------------------------------------------------------------*\ -| Cluster Binding | 0xF000 | +| Cluster Binding | 0x001E | |------------------------------------------------------------------------------| | Commands: | | | * Bind | 0x00 | @@ -8608,7 +8608,7 @@ class BindingBind : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000F000) command (0x00000000) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000001E) command (0x00000000) on endpoint %" PRIu8, endpointId); return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); @@ -8635,7 +8635,7 @@ class BindingUnbind : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000F000) command (0x00000001) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000001E) command (0x00000001) on endpoint %" PRIu8, endpointId); return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs); @@ -8665,7 +8665,7 @@ class ReadBindingClusterRevision : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0xF000) command (0x00) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x001E) command (0x00) on endpoint %" PRIu8, endpointId); chip::Controller::BindingCluster cluster; cluster.Associate(device, endpointId); @@ -8701,7 +8701,7 @@ class ReportBindingClusterRevision : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0xF000) command (0x06) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x001E) command (0x06) on endpoint %" PRIu8, endpointId); chip::Controller::BindingCluster cluster; cluster.Associate(device, endpointId); @@ -20031,7 +20031,7 @@ class ReportGeneralDiagnosticsClusterRevision : public ModelCommand }; /*----------------------------------------------------------------------------*\ -| Cluster GroupKeyManagement | 0xF004 | +| Cluster GroupKeyManagement | 0x003F | |------------------------------------------------------------------------------| | Commands: | | |------------------------------------------------------------------------------| @@ -20061,7 +20061,7 @@ class ReadGroupKeyManagementGroups : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0xF004) command (0x00) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x003F) command (0x00) on endpoint %" PRIu8, endpointId); chip::Controller::GroupKeyManagementCluster cluster; cluster.Associate(device, endpointId); @@ -20096,7 +20096,7 @@ class ReadGroupKeyManagementGroupKeys : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0xF004) command (0x00) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x003F) command (0x00) on endpoint %" PRIu8, endpointId); chip::Controller::GroupKeyManagementCluster cluster; cluster.Associate(device, endpointId); @@ -20131,7 +20131,7 @@ class ReadGroupKeyManagementClusterRevision : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0xF004) command (0x00) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x003F) command (0x00) on endpoint %" PRIu8, endpointId); chip::Controller::GroupKeyManagementCluster cluster; cluster.Associate(device, endpointId); @@ -20167,7 +20167,7 @@ class ReportGroupKeyManagementClusterRevision : public ModelCommand CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0xF004) command (0x06) on endpoint %" PRIu8, endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x003F) command (0x06) on endpoint %" PRIu8, endpointId); chip::Controller::GroupKeyManagementCluster cluster; cluster.Associate(device, endpointId); diff --git a/zzz_generated/chip-tool/zap-generated/reporting/Commands.h b/zzz_generated/chip-tool/zap-generated/reporting/Commands.h index 180ae81d6ce20b..287318c8a1ca9a 100644 --- a/zzz_generated/chip-tool/zap-generated/reporting/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/reporting/Commands.h @@ -603,7 +603,7 @@ class Listen : public ReportingCommand callbacksMgr.AddReportCallback(remoteId, endpointId, 0x000F, 0xFFFD, onReportBinaryInputBasicClusterRevisionCallback->Cancel(), BasicAttributeFilter); - callbacksMgr.AddReportCallback(remoteId, endpointId, 0xF000, 0xFFFD, onReportBindingClusterRevisionCallback->Cancel(), + callbacksMgr.AddReportCallback(remoteId, endpointId, 0x001E, 0xFFFD, onReportBindingClusterRevisionCallback->Cancel(), BasicAttributeFilter); callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0045, 0x0000, onReportBooleanStateStateValueCallback->Cancel(), BasicAttributeFilter); @@ -856,7 +856,7 @@ class Listen : public ReportingCommand callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0033, 0xFFFD, onReportGeneralDiagnosticsClusterRevisionCallback->Cancel(), BasicAttributeFilter); - callbacksMgr.AddReportCallback(remoteId, endpointId, 0xF004, 0xFFFD, + callbacksMgr.AddReportCallback(remoteId, endpointId, 0x003F, 0xFFFD, onReportGroupKeyManagementClusterRevisionCallback->Cancel(), BasicAttributeFilter); callbacksMgr.AddReportCallback(remoteId, endpointId, 0x0004, 0x0000, onReportGroupsNameSupportCallback->Cancel(), diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 85f7f867be93dd..5204ca8b027da2 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -46653,41 +46653,41 @@ class TestDescriptorCluster : public TestCommand VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 1)); VerifyOrReturn(CheckValue("serverList[1]", iter.GetValue(), 29UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 2)); - VerifyOrReturn(CheckValue("serverList[2]", iter.GetValue(), 31UL)); + VerifyOrReturn(CheckValue("serverList[2]", iter.GetValue(), 30UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 3)); - VerifyOrReturn(CheckValue("serverList[3]", iter.GetValue(), 40UL)); + VerifyOrReturn(CheckValue("serverList[3]", iter.GetValue(), 31UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 4)); - VerifyOrReturn(CheckValue("serverList[4]", iter.GetValue(), 41UL)); + VerifyOrReturn(CheckValue("serverList[4]", iter.GetValue(), 40UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 5)); - VerifyOrReturn(CheckValue("serverList[5]", iter.GetValue(), 42UL)); + VerifyOrReturn(CheckValue("serverList[5]", iter.GetValue(), 41UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 6)); - VerifyOrReturn(CheckValue("serverList[6]", iter.GetValue(), 46UL)); + VerifyOrReturn(CheckValue("serverList[6]", iter.GetValue(), 42UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 7)); - VerifyOrReturn(CheckValue("serverList[7]", iter.GetValue(), 48UL)); + VerifyOrReturn(CheckValue("serverList[7]", iter.GetValue(), 46UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 8)); - VerifyOrReturn(CheckValue("serverList[8]", iter.GetValue(), 49UL)); + VerifyOrReturn(CheckValue("serverList[8]", iter.GetValue(), 48UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 9)); - VerifyOrReturn(CheckValue("serverList[9]", iter.GetValue(), 50UL)); + VerifyOrReturn(CheckValue("serverList[9]", iter.GetValue(), 49UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 10)); - VerifyOrReturn(CheckValue("serverList[10]", iter.GetValue(), 51UL)); + VerifyOrReturn(CheckValue("serverList[10]", iter.GetValue(), 50UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 11)); - VerifyOrReturn(CheckValue("serverList[11]", iter.GetValue(), 52UL)); + VerifyOrReturn(CheckValue("serverList[11]", iter.GetValue(), 51UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 12)); - VerifyOrReturn(CheckValue("serverList[12]", iter.GetValue(), 53UL)); + VerifyOrReturn(CheckValue("serverList[12]", iter.GetValue(), 52UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 13)); - VerifyOrReturn(CheckValue("serverList[13]", iter.GetValue(), 54UL)); + VerifyOrReturn(CheckValue("serverList[13]", iter.GetValue(), 53UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 14)); - VerifyOrReturn(CheckValue("serverList[14]", iter.GetValue(), 55UL)); + VerifyOrReturn(CheckValue("serverList[14]", iter.GetValue(), 54UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 15)); - VerifyOrReturn(CheckValue("serverList[15]", iter.GetValue(), 60UL)); + VerifyOrReturn(CheckValue("serverList[15]", iter.GetValue(), 55UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 16)); - VerifyOrReturn(CheckValue("serverList[16]", iter.GetValue(), 62UL)); + VerifyOrReturn(CheckValue("serverList[16]", iter.GetValue(), 60UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 17)); - VerifyOrReturn(CheckValue("serverList[17]", iter.GetValue(), 1029UL)); + VerifyOrReturn(CheckValue("serverList[17]", iter.GetValue(), 62UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 18)); - VerifyOrReturn(CheckValue("serverList[18]", iter.GetValue(), 61440UL)); + VerifyOrReturn(CheckValue("serverList[18]", iter.GetValue(), 63UL)); VerifyOrReturn(CheckNextListItemDecodes("serverList", iter, 19)); - VerifyOrReturn(CheckValue("serverList[19]", iter.GetValue(), 61444UL)); + VerifyOrReturn(CheckValue("serverList[19]", iter.GetValue(), 1029UL)); VerifyOrReturn(CheckNoMoreListItems("serverList", iter, 20)); NextTest(); diff --git a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h index ebdcc4291f551c..768eb9fd4a8267 100644 --- a/zzz_generated/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/controller-clusters/zap-generated/endpoint_config.h @@ -149,6 +149,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Descriptor (client) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ + /* Endpoint: 1, Cluster: Binding (client) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Access Control (client) */ \ @@ -210,6 +213,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Operational Credentials (client) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ + /* Endpoint: 1, Cluster: Group Key Management (client) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Fixed Label (client) */ \ @@ -302,12 +308,6 @@ \ /* Endpoint: 1, Cluster: Electrical Measurement (client) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(3) }, /* ClusterRevision */ \ - \ - /* Endpoint: 1, Cluster: Binding (client) */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 1, Cluster: Group Key Management (client) */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ } // This is an array of EmberAfCluster structures. @@ -336,155 +336,153 @@ { \ 0x001D, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Descriptor (client) */ \ + { 0x001E, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Binding (client) */ \ { \ - 0x001F, ZAP_ATTRIBUTE_INDEX(8), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x001F, ZAP_ATTRIBUTE_INDEX(9), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Access Control (client) */ \ { \ - 0x0025, ZAP_ATTRIBUTE_INDEX(9), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0025, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Bridged Actions (client) */ \ - { 0x0028, ZAP_ATTRIBUTE_INDEX(10), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Basic (client) */ \ + { 0x0028, ZAP_ATTRIBUTE_INDEX(11), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Basic (client) */ \ { \ - 0x0029, ZAP_ATTRIBUTE_INDEX(11), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0029, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: OTA Software Update Provider (client) */ \ { \ - 0x002A, ZAP_ATTRIBUTE_INDEX(12), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x002A, ZAP_ATTRIBUTE_INDEX(13), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: OTA Software Update Requestor (client) */ \ { \ - 0x002E, ZAP_ATTRIBUTE_INDEX(13), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x002E, ZAP_ATTRIBUTE_INDEX(14), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Power Source Configuration (client) */ \ { \ - 0x002F, ZAP_ATTRIBUTE_INDEX(14), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x002F, ZAP_ATTRIBUTE_INDEX(15), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Power Source (client) */ \ { \ - 0x0030, ZAP_ATTRIBUTE_INDEX(15), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0030, ZAP_ATTRIBUTE_INDEX(16), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: General Commissioning (client) */ \ { \ - 0x0031, ZAP_ATTRIBUTE_INDEX(17), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0031, ZAP_ATTRIBUTE_INDEX(18), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Network Commissioning (client) */ \ { \ - 0x0032, ZAP_ATTRIBUTE_INDEX(19), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0032, ZAP_ATTRIBUTE_INDEX(20), 0, 0, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Diagnostic Logs (client) */ \ { \ - 0x0033, ZAP_ATTRIBUTE_INDEX(19), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0033, ZAP_ATTRIBUTE_INDEX(20), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: General Diagnostics (client) */ \ { \ - 0x0034, ZAP_ATTRIBUTE_INDEX(20), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0034, ZAP_ATTRIBUTE_INDEX(21), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Software Diagnostics (client) */ \ { \ - 0x0035, ZAP_ATTRIBUTE_INDEX(22), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0035, ZAP_ATTRIBUTE_INDEX(23), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Thread Network Diagnostics (client) */ \ { \ - 0x0036, ZAP_ATTRIBUTE_INDEX(24), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0036, ZAP_ATTRIBUTE_INDEX(25), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: WiFi Network Diagnostics (client) */ \ { \ - 0x0037, ZAP_ATTRIBUTE_INDEX(25), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0037, ZAP_ATTRIBUTE_INDEX(26), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Ethernet Network Diagnostics (client) */ \ { \ - 0x0039, ZAP_ATTRIBUTE_INDEX(27), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0039, ZAP_ATTRIBUTE_INDEX(28), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Bridged Device Basic (client) */ \ - { 0x003B, ZAP_ATTRIBUTE_INDEX(28), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Switch (client) */ \ + { 0x003B, ZAP_ATTRIBUTE_INDEX(29), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL }, /* Endpoint: 1, Cluster: Switch (client) */ \ { \ - 0x003C, ZAP_ATTRIBUTE_INDEX(29), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x003C, ZAP_ATTRIBUTE_INDEX(30), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: AdministratorCommissioning (client) */ \ { \ - 0x003E, ZAP_ATTRIBUTE_INDEX(30), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x003E, ZAP_ATTRIBUTE_INDEX(31), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Operational Credentials (client) */ \ { \ - 0x0040, ZAP_ATTRIBUTE_INDEX(31), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x003F, ZAP_ATTRIBUTE_INDEX(32), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + }, /* Endpoint: 1, Cluster: Group Key Management (client) */ \ + { \ + 0x0040, ZAP_ATTRIBUTE_INDEX(33), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Fixed Label (client) */ \ { \ - 0x0045, ZAP_ATTRIBUTE_INDEX(32), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0045, ZAP_ATTRIBUTE_INDEX(34), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Boolean State (client) */ \ { \ - 0x0050, ZAP_ATTRIBUTE_INDEX(33), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0050, ZAP_ATTRIBUTE_INDEX(35), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Mode Select (client) */ \ { \ - 0x0101, ZAP_ATTRIBUTE_INDEX(34), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0101, ZAP_ATTRIBUTE_INDEX(36), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Door Lock (client) */ \ { \ - 0x0102, ZAP_ATTRIBUTE_INDEX(35), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0102, ZAP_ATTRIBUTE_INDEX(37), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Window Covering (client) */ \ { \ - 0x0103, ZAP_ATTRIBUTE_INDEX(36), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0103, ZAP_ATTRIBUTE_INDEX(38), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Barrier Control (client) */ \ { \ - 0x0200, ZAP_ATTRIBUTE_INDEX(37), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0200, ZAP_ATTRIBUTE_INDEX(39), 2, 6, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Pump Configuration and Control (client) */ \ { \ - 0x0201, ZAP_ATTRIBUTE_INDEX(39), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0201, ZAP_ATTRIBUTE_INDEX(41), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Thermostat (client) */ \ { \ - 0x0204, ZAP_ATTRIBUTE_INDEX(40), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0204, ZAP_ATTRIBUTE_INDEX(42), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (client) */ \ { \ - 0x0300, ZAP_ATTRIBUTE_INDEX(41), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0300, ZAP_ATTRIBUTE_INDEX(43), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Color Control (client) */ \ { \ - 0x0400, ZAP_ATTRIBUTE_INDEX(42), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0400, ZAP_ATTRIBUTE_INDEX(44), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Illuminance Measurement (client) */ \ { \ - 0x0402, ZAP_ATTRIBUTE_INDEX(43), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0402, ZAP_ATTRIBUTE_INDEX(45), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Temperature Measurement (client) */ \ { \ - 0x0403, ZAP_ATTRIBUTE_INDEX(44), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0403, ZAP_ATTRIBUTE_INDEX(46), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Pressure Measurement (client) */ \ { \ - 0x0404, ZAP_ATTRIBUTE_INDEX(45), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0404, ZAP_ATTRIBUTE_INDEX(47), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Flow Measurement (client) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(46), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0405, ZAP_ATTRIBUTE_INDEX(48), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (client) */ \ { \ - 0x0406, ZAP_ATTRIBUTE_INDEX(47), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0406, ZAP_ATTRIBUTE_INDEX(49), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Occupancy Sensing (client) */ \ { \ - 0x0503, ZAP_ATTRIBUTE_INDEX(48), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0503, ZAP_ATTRIBUTE_INDEX(50), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Wake on LAN (client) */ \ { \ - 0x0504, ZAP_ATTRIBUTE_INDEX(49), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0504, ZAP_ATTRIBUTE_INDEX(51), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: TV Channel (client) */ \ { \ - 0x0505, ZAP_ATTRIBUTE_INDEX(50), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0505, ZAP_ATTRIBUTE_INDEX(52), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Target Navigator (client) */ \ { \ - 0x0506, ZAP_ATTRIBUTE_INDEX(51), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0506, ZAP_ATTRIBUTE_INDEX(53), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Media Playback (client) */ \ { \ - 0x0507, ZAP_ATTRIBUTE_INDEX(52), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0507, ZAP_ATTRIBUTE_INDEX(54), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Media Input (client) */ \ { \ - 0x0508, ZAP_ATTRIBUTE_INDEX(53), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0508, ZAP_ATTRIBUTE_INDEX(55), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Low Power (client) */ \ { \ - 0x0509, ZAP_ATTRIBUTE_INDEX(54), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0509, ZAP_ATTRIBUTE_INDEX(56), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Keypad Input (client) */ \ { \ - 0x050A, ZAP_ATTRIBUTE_INDEX(55), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x050A, ZAP_ATTRIBUTE_INDEX(57), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Content Launcher (client) */ \ { \ - 0x050B, ZAP_ATTRIBUTE_INDEX(56), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x050B, ZAP_ATTRIBUTE_INDEX(58), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Audio Output (client) */ \ { \ - 0x050C, ZAP_ATTRIBUTE_INDEX(57), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x050C, ZAP_ATTRIBUTE_INDEX(59), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Application Launcher (client) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(58), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(60), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Application Basic (client) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(59), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(61), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Account Login (client) */ \ { \ - 0x050F, ZAP_ATTRIBUTE_INDEX(60), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x050F, ZAP_ATTRIBUTE_INDEX(62), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Test Cluster (client) */ \ { \ - 0x0B04, ZAP_ATTRIBUTE_INDEX(61), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0B04, ZAP_ATTRIBUTE_INDEX(63), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 1, Cluster: Electrical Measurement (client) */ \ - { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(62), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Binding (client) */ \ - { \ - 0xF004, ZAP_ATTRIBUTE_INDEX(63), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ - }, /* Endpoint: 1, Cluster: Group Key Management (client) */ \ } #define ZAP_CLUSTER_INDEX(index) ((EmberAfCluster *) (&generatedClusters[index])) diff --git a/zzz_generated/thermostat/zap-generated/attribute-size.cpp b/zzz_generated/thermostat/zap-generated/attribute-size.cpp index 37fa58e8ceb2e6..db03dd8b31f28a 100644 --- a/zzz_generated/thermostat/zap-generated/attribute-size.cpp +++ b/zzz_generated/thermostat/zap-generated/attribute-size.cpp @@ -249,7 +249,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } break; } - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster { uint16_t entryOffset = kSizeLengthInBytes; switch (am->attributeId) @@ -645,7 +645,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; } break; - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster switch (attributeId) { case 0x0000: // groups diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 1d73d9c6eb4e86..49a932f7d2d367 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -669,6 +669,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Binding (server) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Basic (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \ { 0x0001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ @@ -839,9 +842,6 @@ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ { 0x0005, ZAP_TYPE(FABRIC_IDX), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Binding (server) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -949,50 +949,48 @@ { \ 0x001D, ZAP_ATTRIBUTE_INDEX(2), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ + { 0x001E, ZAP_ATTRIBUTE_INDEX(7), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Binding (server) */ \ { 0x0028, \ - ZAP_ATTRIBUTE_INDEX(7), \ + ZAP_ATTRIBUTE_INDEX(8), \ 20, \ 687, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ { \ - 0x0029, ZAP_ATTRIBUTE_INDEX(27), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0029, ZAP_ATTRIBUTE_INDEX(28), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ { \ - 0x0030, ZAP_ATTRIBUTE_INDEX(28), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0030, ZAP_ATTRIBUTE_INDEX(29), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ { \ - 0x0031, ZAP_ATTRIBUTE_INDEX(34), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0031, ZAP_ATTRIBUTE_INDEX(35), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ { \ - 0x0032, ZAP_ATTRIBUTE_INDEX(36), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0032, ZAP_ATTRIBUTE_INDEX(37), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ { \ - 0x0033, ZAP_ATTRIBUTE_INDEX(36), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0033, ZAP_ATTRIBUTE_INDEX(37), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ { \ - 0x0034, ZAP_ATTRIBUTE_INDEX(45), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0034, ZAP_ATTRIBUTE_INDEX(46), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ { \ - 0x0035, ZAP_ATTRIBUTE_INDEX(51), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0035, ZAP_ATTRIBUTE_INDEX(52), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ { \ - 0x0036, ZAP_ATTRIBUTE_INDEX(116), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0036, ZAP_ATTRIBUTE_INDEX(117), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ { \ - 0x0037, ZAP_ATTRIBUTE_INDEX(131), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0037, ZAP_ATTRIBUTE_INDEX(132), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ - 0x003C, ZAP_ATTRIBUTE_INDEX(142), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003C, ZAP_ATTRIBUTE_INDEX(143), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ { \ - 0x003E, ZAP_ATTRIBUTE_INDEX(143), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003E, ZAP_ATTRIBUTE_INDEX(144), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(149), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { \ - 0xF004, ZAP_ATTRIBUTE_INDEX(150), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003F, ZAP_ATTRIBUTE_INDEX(150), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ { \ 0x0003, ZAP_ATTRIBUTE_INDEX(153), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ diff --git a/zzz_generated/tv-app/zap-generated/attribute-size.cpp b/zzz_generated/tv-app/zap-generated/attribute-size.cpp index 389709ae3d2189..8e4ed725f9d200 100644 --- a/zzz_generated/tv-app/zap-generated/attribute-size.cpp +++ b/zzz_generated/tv-app/zap-generated/attribute-size.cpp @@ -350,7 +350,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } break; } - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster { uint16_t entryOffset = kSizeLengthInBytes; switch (am->attributeId) @@ -908,7 +908,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; } break; - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster switch (attributeId) { case 0x0000: // groups diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 95e09fe1279ddf..77ac59a2a33db5 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -1056,6 +1056,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Binding (server) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Basic (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* InteractionModelVersion */ \ { 0x0001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ @@ -1235,20 +1238,17 @@ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(599) }, /* groups */ \ + { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(853) }, /* group keys */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* measured value */ \ { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ - /* Endpoint: 0, Cluster: Binding (server) */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(599) }, /* groups */ \ - { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(853) }, /* group keys */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ /* Endpoint: 1, Cluster: On/Off (server) */ \ { 0x0000, ZAP_TYPE(BOOLEAN), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* OnOff */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ @@ -1431,63 +1431,61 @@ #define GENERATED_CLUSTERS \ { \ { 0x001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ + { 0x001E, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Binding (server) */ \ { 0x0028, \ - ZAP_ATTRIBUTE_INDEX(5), \ + ZAP_ATTRIBUTE_INDEX(6), \ 19, \ 686, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ { \ - 0x0029, ZAP_ATTRIBUTE_INDEX(24), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0029, ZAP_ATTRIBUTE_INDEX(25), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ { \ - 0x0030, ZAP_ATTRIBUTE_INDEX(25), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0030, ZAP_ATTRIBUTE_INDEX(26), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 0, Cluster: General Commissioning (client) */ \ { \ - 0x0030, ZAP_ATTRIBUTE_INDEX(26), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0030, ZAP_ATTRIBUTE_INDEX(27), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ { \ - 0x0031, ZAP_ATTRIBUTE_INDEX(32), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x0031, ZAP_ATTRIBUTE_INDEX(33), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 0, Cluster: Network Commissioning (client) */ \ { \ - 0x0031, ZAP_ATTRIBUTE_INDEX(33), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0031, ZAP_ATTRIBUTE_INDEX(34), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ { \ - 0x0032, ZAP_ATTRIBUTE_INDEX(35), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0032, ZAP_ATTRIBUTE_INDEX(36), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ { \ - 0x0033, ZAP_ATTRIBUTE_INDEX(35), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0033, ZAP_ATTRIBUTE_INDEX(36), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ { \ - 0x0034, ZAP_ATTRIBUTE_INDEX(44), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0034, ZAP_ATTRIBUTE_INDEX(45), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ { \ - 0x0035, ZAP_ATTRIBUTE_INDEX(50), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0035, ZAP_ATTRIBUTE_INDEX(51), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ { \ - 0x0036, ZAP_ATTRIBUTE_INDEX(115), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0036, ZAP_ATTRIBUTE_INDEX(116), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ { \ - 0x0037, ZAP_ATTRIBUTE_INDEX(130), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0037, ZAP_ATTRIBUTE_INDEX(131), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ - 0x003C, ZAP_ATTRIBUTE_INDEX(141), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003C, ZAP_ATTRIBUTE_INDEX(142), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ { \ - 0x003E, ZAP_ATTRIBUTE_INDEX(142), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ + 0x003E, ZAP_ATTRIBUTE_INDEX(143), 1, 2, ZAP_CLUSTER_MASK(CLIENT), NULL \ }, /* Endpoint: 0, Cluster: Operational Credentials (client) */ \ { \ - 0x003E, ZAP_ATTRIBUTE_INDEX(143), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003E, ZAP_ATTRIBUTE_INDEX(144), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(149), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(153), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { \ - 0xF004, ZAP_ATTRIBUTE_INDEX(154), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003F, ZAP_ATTRIBUTE_INDEX(150), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { \ + 0x0405, ZAP_ATTRIBUTE_INDEX(153), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { 0x0006, \ ZAP_ATTRIBUTE_INDEX(157), \ 2, \ diff --git a/zzz_generated/tv-casting-app/zap-generated/attribute-size.cpp b/zzz_generated/tv-casting-app/zap-generated/attribute-size.cpp index 58ef9380f22eb8..42cd3bf183506c 100644 --- a/zzz_generated/tv-casting-app/zap-generated/attribute-size.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/attribute-size.cpp @@ -389,7 +389,7 @@ uint16_t emberAfCopyList(ClusterId clusterId, EmberAfAttributeMetadata * am, boo } break; } - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster { uint16_t entryOffset = kSizeLengthInBytes; switch (am->attributeId) @@ -1027,7 +1027,7 @@ uint16_t emberAfAttributeValueListSize(ClusterId clusterId, AttributeId attribut break; } break; - case 0xF004: // Group Key Management Cluster + case 0x003F: // Group Key Management Cluster switch (attributeId) { case 0x0000: // groups diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 9780e631d50dcc..6af1084b621338 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -1090,6 +1090,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Binding (server) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Basic (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_SIMPLE_DEFAULT(1) }, /* InteractionModelVersion */ \ { 0x0001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ @@ -1262,20 +1265,17 @@ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(616) }, /* groups */ \ + { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(870) }, /* group keys */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* measured value */ \ { 0x0001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ { 0x0002, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ - /* Endpoint: 0, Cluster: Binding (server) */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 0, Cluster: Group Key Management (server) */ \ - { 0x0000, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(616) }, /* groups */ \ - { 0x0001, ZAP_TYPE(ARRAY), 254, 0, ZAP_LONG_DEFAULTS_INDEX(870) }, /* group keys */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ /* Endpoint: 1, Cluster: Identify (server) */ \ { 0x0000, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(0) }, /* identify time */ \ @@ -1340,6 +1340,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ + /* Endpoint: 1, Cluster: Binding (server) */ \ + { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ + \ /* Endpoint: 1, Cluster: Bridged Device Basic (server) */ \ { 0x0001, ZAP_TYPE(CHAR_STRING), 33, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ { 0x0002, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(SINGLETON), ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ @@ -1586,9 +1589,6 @@ ZAP_LONG_DEFAULTS_INDEX(3476) }, /* list_struct_octet_string */ \ { 0x001D, ZAP_TYPE(LONG_OCTET_STRING), 1002, ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* long_octet_string */ \ - { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ - \ - /* Endpoint: 1, Cluster: Binding (server) */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: On/Off (server) */ \ @@ -1653,54 +1653,52 @@ #define GENERATED_CLUSTERS \ { \ { 0x001D, ZAP_ATTRIBUTE_INDEX(0), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Descriptor (server) */ \ + { 0x001E, ZAP_ATTRIBUTE_INDEX(5), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL }, /* Endpoint: 0, Cluster: Binding (server) */ \ { 0x0028, \ - ZAP_ATTRIBUTE_INDEX(5), \ + ZAP_ATTRIBUTE_INDEX(6), \ 20, \ 687, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayBasicServer }, /* Endpoint: 0, Cluster: Basic (server) */ \ { \ - 0x0029, ZAP_ATTRIBUTE_INDEX(25), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0029, ZAP_ATTRIBUTE_INDEX(26), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */ \ { \ - 0x0030, ZAP_ATTRIBUTE_INDEX(26), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0030, ZAP_ATTRIBUTE_INDEX(27), 6, 270, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Commissioning (server) */ \ { \ - 0x0031, ZAP_ATTRIBUTE_INDEX(32), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0031, ZAP_ATTRIBUTE_INDEX(33), 2, 6, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ { \ - 0x0032, ZAP_ATTRIBUTE_INDEX(34), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0032, ZAP_ATTRIBUTE_INDEX(35), 0, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ { \ - 0x0033, ZAP_ATTRIBUTE_INDEX(34), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0033, ZAP_ATTRIBUTE_INDEX(35), 9, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ { \ - 0x0034, ZAP_ATTRIBUTE_INDEX(43), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0034, ZAP_ATTRIBUTE_INDEX(44), 6, 30, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Software Diagnostics (server) */ \ { \ - 0x0035, ZAP_ATTRIBUTE_INDEX(49), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0035, ZAP_ATTRIBUTE_INDEX(50), 65, 247, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */ \ { \ - 0x0036, ZAP_ATTRIBUTE_INDEX(114), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0036, ZAP_ATTRIBUTE_INDEX(115), 15, 58, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */ \ { \ - 0x0037, ZAP_ATTRIBUTE_INDEX(129), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0037, ZAP_ATTRIBUTE_INDEX(130), 11, 57, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */ \ { \ - 0x003C, ZAP_ATTRIBUTE_INDEX(140), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003C, ZAP_ATTRIBUTE_INDEX(141), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ { \ - 0x003E, ZAP_ATTRIBUTE_INDEX(141), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003E, ZAP_ATTRIBUTE_INDEX(142), 6, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Operational Credentials (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(147), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ - { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(151), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 0, Cluster: Binding (server) */ \ - { \ - 0xF004, ZAP_ATTRIBUTE_INDEX(152), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003F, ZAP_ATTRIBUTE_INDEX(148), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 0, Cluster: Group Key Management (server) */ \ + { \ + 0x0405, ZAP_ATTRIBUTE_INDEX(151), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \ { 0x0003, \ ZAP_ATTRIBUTE_INDEX(155), \ 2, \ @@ -1738,93 +1736,93 @@ 0x001D, ZAP_ATTRIBUTE_INDEX(191), 5, 0, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Descriptor (server) */ \ { \ - 0x0039, ZAP_ATTRIBUTE_INDEX(196), 15, 646, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x001E, ZAP_ATTRIBUTE_INDEX(196), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + }, /* Endpoint: 1, Cluster: Binding (server) */ \ + { \ + 0x0039, ZAP_ATTRIBUTE_INDEX(197), 15, 646, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Bridged Device Basic (server) */ \ { \ - 0x003B, ZAP_ATTRIBUTE_INDEX(211), 3, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x003B, ZAP_ATTRIBUTE_INDEX(212), 3, 4, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Switch (server) */ \ { \ - 0x0040, ZAP_ATTRIBUTE_INDEX(214), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0040, ZAP_ATTRIBUTE_INDEX(215), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Fixed Label (server) */ \ { 0x0101, \ - ZAP_ATTRIBUTE_INDEX(216), \ + ZAP_ATTRIBUTE_INDEX(217), \ 5, \ 7, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ chipFuncArrayDoorLockServer }, /* Endpoint: 1, Cluster: Door Lock (server) */ \ { \ - 0x0102, ZAP_ATTRIBUTE_INDEX(221), 19, 31, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0102, ZAP_ATTRIBUTE_INDEX(222), 19, 31, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Window Covering (server) */ \ { \ - 0x0103, ZAP_ATTRIBUTE_INDEX(240), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0103, ZAP_ATTRIBUTE_INDEX(241), 5, 7, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Barrier Control (server) */ \ { \ - 0x0201, ZAP_ATTRIBUTE_INDEX(245), 10, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0201, ZAP_ATTRIBUTE_INDEX(246), 10, 17, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Thermostat (server) */ \ { 0x0300, \ - ZAP_ATTRIBUTE_INDEX(255), \ + ZAP_ATTRIBUTE_INDEX(256), \ 51, \ 337, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ chipFuncArrayColorControlServer }, /* Endpoint: 1, Cluster: Color Control (server) */ \ { \ - 0x0402, ZAP_ATTRIBUTE_INDEX(306), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0402, ZAP_ATTRIBUTE_INDEX(307), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ { \ - 0x0403, ZAP_ATTRIBUTE_INDEX(310), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0403, ZAP_ATTRIBUTE_INDEX(311), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ { \ - 0x0404, ZAP_ATTRIBUTE_INDEX(314), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0404, ZAP_ATTRIBUTE_INDEX(315), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ { \ - 0x0405, ZAP_ATTRIBUTE_INDEX(318), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0405, ZAP_ATTRIBUTE_INDEX(319), 4, 8, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ { 0x0500, \ - ZAP_ATTRIBUTE_INDEX(322), \ + ZAP_ATTRIBUTE_INDEX(323), \ 6, \ 16, \ ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | \ ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ chipFuncArrayIasZoneServer }, /* Endpoint: 1, Cluster: IAS Zone (server) */ \ { \ - 0x0503, ZAP_ATTRIBUTE_INDEX(328), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0503, ZAP_ATTRIBUTE_INDEX(329), 2, 35, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ { \ - 0x0504, ZAP_ATTRIBUTE_INDEX(330), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0504, ZAP_ATTRIBUTE_INDEX(331), 4, 322, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: TV Channel (server) */ \ { \ - 0x0505, ZAP_ATTRIBUTE_INDEX(334), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0505, ZAP_ATTRIBUTE_INDEX(335), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Target Navigator (server) */ \ { \ - 0x0506, ZAP_ATTRIBUTE_INDEX(336), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0506, ZAP_ATTRIBUTE_INDEX(337), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Playback (server) */ \ { \ - 0x0507, ZAP_ATTRIBUTE_INDEX(337), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0507, ZAP_ATTRIBUTE_INDEX(338), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Media Input (server) */ \ { \ - 0x0509, ZAP_ATTRIBUTE_INDEX(339), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x0509, ZAP_ATTRIBUTE_INDEX(340), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Keypad Input (server) */ \ { \ - 0x050A, ZAP_ATTRIBUTE_INDEX(340), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050A, ZAP_ATTRIBUTE_INDEX(341), 3, 510, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Content Launcher (server) */ \ { \ - 0x050B, ZAP_ATTRIBUTE_INDEX(343), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050B, ZAP_ATTRIBUTE_INDEX(344), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Audio Output (server) */ \ { \ - 0x050C, ZAP_ATTRIBUTE_INDEX(345), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050C, ZAP_ATTRIBUTE_INDEX(346), 2, 256, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Launcher (server) */ \ { \ - 0x050D, ZAP_ATTRIBUTE_INDEX(347), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050D, ZAP_ATTRIBUTE_INDEX(348), 8, 108, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Application Basic (server) */ \ { \ - 0x050E, ZAP_ATTRIBUTE_INDEX(355), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050E, ZAP_ATTRIBUTE_INDEX(356), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Account Login (server) */ \ { \ - 0x050F, ZAP_ATTRIBUTE_INDEX(356), 21, 1582, ZAP_CLUSTER_MASK(SERVER), NULL \ + 0x050F, ZAP_ATTRIBUTE_INDEX(357), 21, 1582, ZAP_CLUSTER_MASK(SERVER), NULL \ }, /* Endpoint: 1, Cluster: Test Cluster (server) */ \ - { \ - 0xF000, ZAP_ATTRIBUTE_INDEX(377), 1, 2, ZAP_CLUSTER_MASK(SERVER), NULL \ - }, /* Endpoint: 1, Cluster: Binding (server) */ \ { 0x0006, \ ZAP_ATTRIBUTE_INDEX(378), \ 2, \