From 62230e3c149be6136a021226844438d25ba1e91d Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 18 Jan 2022 09:20:55 -0500 Subject: [PATCH] ZAP regen --- .../all-clusters-app.matter | 150 +++++++++--------- .../bridge-common/bridge-app.matter | 40 ++--- .../door-lock-common/door-lock-app.matter | 40 ++--- examples/lock-app/lock-common/lock-app.matter | 40 ++--- .../log-source-common/log-source-app.matter | 10 +- .../ota-provider-app.matter | 14 +- .../ota-requestor-app.matter | 18 +-- .../placeholder/linux/apps/app1/config.matter | 28 ++-- .../placeholder/linux/apps/app2/config.matter | 28 ++-- examples/pump-app/pump-common/pump-app.matter | 46 +++--- .../pump-controller-app.matter | 44 ++--- .../esp32/main/temperature-measurement.matter | 32 ++-- .../thermostat-common/thermostat.matter | 50 +++--- examples/tv-app/tv-common/tv-app.matter | 94 +++++------ .../tv-casting-common/tv-casting-app.matter | 110 ++++++------- examples/window-app/common/window-app.matter | 40 ++--- .../data_model/controller-clusters.matter | 122 +++++++------- 17 files changed, 453 insertions(+), 453 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 17ebc2df2aa9c0..26f91a0120bb63 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2999,86 +2999,86 @@ server cluster WindowCovering = 258 { endpoint 0 { - instantiate cluster AccessControl; - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Binding; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster GroupKeyManagement; - instantiate cluster Groups; - instantiate cluster Identify; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OtaSoftwareUpdateRequestor; - instantiate cluster OperationalCredentials; - instantiate cluster PowerSourceConfiguration; - instantiate cluster RelativeHumidityMeasurement; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AccessControl; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Binding; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster GroupKeyManagement; + server cluster Groups; + server cluster Identify; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + binding cluster OtaSoftwareUpdateProvider; + server cluster OtaSoftwareUpdateRequestor; + server cluster OperationalCredentials; + server cluster PowerSourceConfiguration; + server cluster RelativeHumidityMeasurement; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster AccountLogin; - instantiate cluster ApplicationBasic; - instantiate cluster ApplicationLauncher; - instantiate cluster AudioOutput; - instantiate cluster BarrierControl; - instantiate cluster BinaryInputBasic; - instantiate cluster Binding; - instantiate cluster BooleanState; - instantiate cluster BridgedActions; - instantiate cluster BridgedDeviceBasic; - instantiate cluster Channel; - instantiate cluster ColorControl; - instantiate cluster ContentLauncher; - instantiate cluster Descriptor; - instantiate cluster DoorLock; - instantiate cluster ElectricalMeasurement; - instantiate cluster FixedLabel; - instantiate cluster FlowMeasurement; - instantiate cluster Groups; - instantiate cluster IasZone; - instantiate cluster Identify; - instantiate cluster IlluminanceMeasurement; - instantiate cluster KeypadInput; - instantiate cluster LevelControl; - instantiate cluster LocalizationConfiguration; - instantiate cluster LowPower; - instantiate cluster MediaInput; - instantiate cluster MediaPlayback; - instantiate cluster ModeSelect; - instantiate cluster NetworkCommissioning; - instantiate cluster OccupancySensing; - instantiate cluster OnOff; - instantiate cluster OnOffSwitchConfiguration; - instantiate cluster PowerSource; - instantiate cluster PressureMeasurement; - instantiate cluster PumpConfigurationAndControl; - instantiate cluster RelativeHumidityMeasurement; - instantiate cluster Scenes; - instantiate cluster Switch; - instantiate cluster TargetNavigator; - instantiate cluster TemperatureMeasurement; - instantiate cluster TestCluster; - instantiate cluster Thermostat; - instantiate cluster ThermostatUserInterfaceConfiguration; - instantiate cluster UserLabel; - instantiate cluster WakeOnLan; - instantiate cluster WindowCovering; + server cluster AccountLogin; + server cluster ApplicationBasic; + server cluster ApplicationLauncher; + server cluster AudioOutput; + server cluster BarrierControl; + server cluster BinaryInputBasic; + server cluster Binding; + server cluster BooleanState; + server cluster BridgedActions; + server cluster BridgedDeviceBasic; + server cluster Channel; + server cluster ColorControl; + server cluster ContentLauncher; + server cluster Descriptor; + server cluster DoorLock; + server cluster ElectricalMeasurement; + server cluster FixedLabel; + server cluster FlowMeasurement; + server cluster Groups; + server cluster IasZone; + server cluster Identify; + server cluster IlluminanceMeasurement; + server cluster KeypadInput; + server cluster LevelControl; + server cluster LocalizationConfiguration; + server cluster LowPower; + server cluster MediaInput; + server cluster MediaPlayback; + server cluster ModeSelect; + server cluster NetworkCommissioning; + server cluster OccupancySensing; + server cluster OnOff; + server cluster OnOffSwitchConfiguration; + server cluster PowerSource; + server cluster PressureMeasurement; + server cluster PumpConfigurationAndControl; + server cluster RelativeHumidityMeasurement; + server cluster Scenes; + server cluster Switch; + server cluster TargetNavigator; + server cluster TemperatureMeasurement; + server cluster TestCluster; + server cluster Thermostat; + server cluster ThermostatUserInterfaceConfiguration; + server cluster UserLabel; + server cluster WakeOnLan; + server cluster WindowCovering; } endpoint 2 { - instantiate cluster Descriptor; - instantiate cluster Groups; - instantiate cluster OccupancySensing; - instantiate cluster OnOff; + server cluster Descriptor; + server cluster Groups; + server cluster OccupancySensing; + server cluster OnOff; } diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 53348e5d62f835..3481e10e3f98e4 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -895,28 +895,28 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster FixedLabel; - instantiate cluster LevelControl; - instantiate cluster OnOff; - instantiate cluster Switch; + server cluster Descriptor; + server cluster FixedLabel; + server cluster LevelControl; + server cluster OnOff; + server cluster Switch; } diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter index d137693236d139..8ac1a862d6d136 100644 --- a/examples/door-lock-app/door-lock-common/door-lock-app.matter +++ b/examples/door-lock-app/door-lock-common/door-lock-app.matter @@ -1103,28 +1103,28 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster PowerSource; - instantiate cluster PowerSourceConfiguration; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster PowerSource; + server cluster PowerSourceConfiguration; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster DoorLock; - instantiate cluster PowerSource; + server cluster Descriptor; + server cluster DoorLock; + server cluster PowerSource; } diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index beb8de0a6679a1..c748be9fd0e6b6 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -799,28 +799,28 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster PowerSource; - instantiate cluster PowerSourceConfiguration; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster PowerSource; + server cluster PowerSourceConfiguration; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster OnOff; - instantiate cluster PowerSource; + server cluster Descriptor; + server cluster OnOff; + server cluster PowerSource; } diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index e3ee6a58863a98..4a782f9ebd6d1c 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -312,10 +312,10 @@ server cluster OperationalCredentials = 62 { endpoint 0 { - instantiate cluster DiagnosticLogs; - instantiate cluster DiagnosticLogs; - instantiate cluster GeneralCommissioning; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; + binding cluster DiagnosticLogs; + server cluster DiagnosticLogs; + server cluster GeneralCommissioning; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; } diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index e09ed393b072f5..3d395b5e17bdef 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -356,12 +356,12 @@ server cluster UserLabel = 65 { endpoint 0 { - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OperationalCredentials; - instantiate cluster UserLabel; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OtaSoftwareUpdateProvider; + server cluster OperationalCredentials; + server cluster UserLabel; } diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 0766042f5b83fb..059c1204421420 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -467,14 +467,14 @@ server cluster UserLabel = 65 { endpoint 0 { - instantiate cluster Basic; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OtaSoftwareUpdateRequestor; - instantiate cluster OperationalCredentials; - instantiate cluster UserLabel; + server cluster Basic; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + binding cluster OtaSoftwareUpdateProvider; + server cluster OtaSoftwareUpdateRequestor; + server cluster OperationalCredentials; + server cluster UserLabel; } diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 2d47e74b46e946..33b4b93101c62c 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -710,22 +710,22 @@ server cluster TemperatureMeasurement = 1026 { endpoint 0 { - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster GeneralCommissioning; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster TemperatureMeasurement; - instantiate cluster TemperatureMeasurement; + server cluster Basic; + server cluster Descriptor; + server cluster GeneralCommissioning; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + binding cluster TemperatureMeasurement; + server cluster TemperatureMeasurement; } endpoint 1 { - instantiate cluster Basic; - instantiate cluster ColorControl; - instantiate cluster Groups; - instantiate cluster Identify; - instantiate cluster LevelControl; - instantiate cluster OnOff; - instantiate cluster Scenes; + server cluster Basic; + server cluster ColorControl; + server cluster Groups; + server cluster Identify; + server cluster LevelControl; + server cluster OnOff; + server cluster Scenes; } diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 2d47e74b46e946..33b4b93101c62c 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -710,22 +710,22 @@ server cluster TemperatureMeasurement = 1026 { endpoint 0 { - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster GeneralCommissioning; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster TemperatureMeasurement; - instantiate cluster TemperatureMeasurement; + server cluster Basic; + server cluster Descriptor; + server cluster GeneralCommissioning; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + binding cluster TemperatureMeasurement; + server cluster TemperatureMeasurement; } endpoint 1 { - instantiate cluster Basic; - instantiate cluster ColorControl; - instantiate cluster Groups; - instantiate cluster Identify; - instantiate cluster LevelControl; - instantiate cluster OnOff; - instantiate cluster Scenes; + server cluster Basic; + server cluster ColorControl; + server cluster Groups; + server cluster Identify; + server cluster LevelControl; + server cluster OnOff; + server cluster Scenes; } diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 36ffee5ef6b96a..28390a72153036 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -895,31 +895,31 @@ server cluster UserLabel = 65 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster FlowMeasurement; - instantiate cluster FlowMeasurement; - instantiate cluster LevelControl; - instantiate cluster OnOff; - instantiate cluster PressureMeasurement; - instantiate cluster PressureMeasurement; - instantiate cluster PumpConfigurationAndControl; - instantiate cluster TemperatureMeasurement; - instantiate cluster TemperatureMeasurement; + server cluster Descriptor; + binding cluster FlowMeasurement; + server cluster FlowMeasurement; + server cluster LevelControl; + server cluster OnOff; + binding cluster PressureMeasurement; + server cluster PressureMeasurement; + server cluster PumpConfigurationAndControl; + binding cluster TemperatureMeasurement; + server cluster TemperatureMeasurement; } diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 4cb2a32f5458f2..cd0b2510e67053 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -944,30 +944,30 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LevelControl; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + binding cluster LevelControl; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster FlowMeasurement; - instantiate cluster OnOff; - instantiate cluster PressureMeasurement; - instantiate cluster PumpConfigurationAndControl; - instantiate cluster TemperatureMeasurement; + server cluster Descriptor; + binding cluster FlowMeasurement; + binding cluster OnOff; + binding cluster PressureMeasurement; + binding cluster PumpConfigurationAndControl; + binding cluster TemperatureMeasurement; } diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 089ceac43d49eb..4df62f2c8e8354 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -598,24 +598,24 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster SoftwareDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster SoftwareDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster TemperatureMeasurement; + server cluster Descriptor; + server cluster TemperatureMeasurement; } diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 3698f8ea617aa3..1735669489ce14 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1172,33 +1172,33 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Binding; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster GroupKeyManagement; - instantiate cluster Identify; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OperationalCredentials; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Binding; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster GroupKeyManagement; + server cluster Identify; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OtaSoftwareUpdateProvider; + server cluster OperationalCredentials; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Basic; - instantiate cluster Groups; - instantiate cluster Identify; - instantiate cluster Identify; - instantiate cluster Scenes; - instantiate cluster Thermostat; + server cluster Basic; + server cluster Groups; + binding cluster Identify; + server cluster Identify; + server cluster Scenes; + server cluster Thermostat; } diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index dcd7680a42a88e..35112e9bdb4f70 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1783,67 +1783,67 @@ server cluster WiFiNetworkDiagnostics = 54 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Binding; - instantiate cluster Binding; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster GroupKeyManagement; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OperationalCredentials; - instantiate cluster OperationalCredentials; - instantiate cluster RelativeHumidityMeasurement; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + binding cluster Binding; + server cluster Binding; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + binding cluster GeneralCommissioning; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster GroupKeyManagement; + server cluster LocalizationConfiguration; + binding cluster NetworkCommissioning; + server cluster NetworkCommissioning; + server cluster OtaSoftwareUpdateProvider; + binding cluster OperationalCredentials; + server cluster OperationalCredentials; + server cluster RelativeHumidityMeasurement; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster ApplicationLauncher; - instantiate cluster Channel; - instantiate cluster ContentLauncher; - instantiate cluster Descriptor; - instantiate cluster KeypadInput; - instantiate cluster LowPower; - instantiate cluster MediaInput; - instantiate cluster OnOff; - instantiate cluster TargetNavigator; - instantiate cluster WakeOnLan; + server cluster ApplicationLauncher; + server cluster Channel; + server cluster ContentLauncher; + server cluster Descriptor; + server cluster KeypadInput; + server cluster LowPower; + server cluster MediaInput; + server cluster OnOff; + server cluster TargetNavigator; + server cluster WakeOnLan; } endpoint 2 { - instantiate cluster AudioOutput; - instantiate cluster Descriptor; - instantiate cluster LevelControl; - instantiate cluster OnOff; + server cluster AudioOutput; + server cluster Descriptor; + server cluster LevelControl; + server cluster OnOff; } endpoint 3 { - instantiate cluster AccountLogin; - instantiate cluster ApplicationBasic; - instantiate cluster ContentLauncher; - instantiate cluster Descriptor; - instantiate cluster MediaPlayback; + server cluster AccountLogin; + server cluster ApplicationBasic; + server cluster ContentLauncher; + server cluster Descriptor; + server cluster MediaPlayback; } endpoint 4 { - instantiate cluster ApplicationBasic; - instantiate cluster ContentLauncher; - instantiate cluster Descriptor; + server cluster ApplicationBasic; + server cluster ContentLauncher; + server cluster Descriptor; } endpoint 5 { - instantiate cluster ApplicationBasic; - instantiate cluster Descriptor; + server cluster ApplicationBasic; + server cluster Descriptor; } diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 0a05c4a5cb976d..58ee53857ce201 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -2459,66 +2459,66 @@ server cluster WindowCovering = 258 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Binding; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster GroupKeyManagement; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OperationalCredentials; - instantiate cluster RelativeHumidityMeasurement; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Binding; + server cluster Descriptor; + server cluster DiagnosticLogs; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster GroupKeyManagement; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OtaSoftwareUpdateProvider; + server cluster OperationalCredentials; + server cluster RelativeHumidityMeasurement; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster AccountLogin; - instantiate cluster ApplicationBasic; - instantiate cluster ApplicationLauncher; - instantiate cluster AudioOutput; - instantiate cluster BarrierControl; - instantiate cluster BinaryInputBasic; - instantiate cluster Binding; - instantiate cluster BridgedDeviceBasic; - instantiate cluster Channel; - instantiate cluster ColorControl; - instantiate cluster ContentLauncher; - instantiate cluster Descriptor; - instantiate cluster DoorLock; - instantiate cluster FixedLabel; - instantiate cluster FlowMeasurement; - instantiate cluster Groups; - instantiate cluster IasZone; - instantiate cluster Identify; - instantiate cluster KeypadInput; - instantiate cluster LevelControl; - instantiate cluster MediaInput; - instantiate cluster MediaPlayback; - instantiate cluster OnOff; - instantiate cluster PressureMeasurement; - instantiate cluster RelativeHumidityMeasurement; - instantiate cluster Scenes; - instantiate cluster Switch; - instantiate cluster TargetNavigator; - instantiate cluster TemperatureMeasurement; - instantiate cluster TestCluster; - instantiate cluster Thermostat; - instantiate cluster WakeOnLan; - instantiate cluster WindowCovering; + binding cluster AccountLogin; + binding cluster ApplicationBasic; + binding cluster ApplicationLauncher; + binding cluster AudioOutput; + server cluster BarrierControl; + server cluster BinaryInputBasic; + server cluster Binding; + server cluster BridgedDeviceBasic; + binding cluster Channel; + server cluster ColorControl; + binding cluster ContentLauncher; + server cluster Descriptor; + server cluster DoorLock; + server cluster FixedLabel; + server cluster FlowMeasurement; + server cluster Groups; + server cluster IasZone; + server cluster Identify; + binding cluster KeypadInput; + server cluster LevelControl; + binding cluster MediaInput; + binding cluster MediaPlayback; + server cluster OnOff; + server cluster PressureMeasurement; + server cluster RelativeHumidityMeasurement; + server cluster Scenes; + server cluster Switch; + binding cluster TargetNavigator; + server cluster TemperatureMeasurement; + server cluster TestCluster; + server cluster Thermostat; + server cluster WakeOnLan; + server cluster WindowCovering; } endpoint 2 { - instantiate cluster Descriptor; - instantiate cluster OccupancySensing; - instantiate cluster OnOff; + server cluster Descriptor; + server cluster OccupancySensing; + server cluster OnOff; } diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index c24cfbc31c2a4d..03dae9e46af17f 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -837,31 +837,31 @@ server cluster WindowCovering = 258 { endpoint 0 { - instantiate cluster AdministratorCommissioning; - instantiate cluster Basic; - instantiate cluster Descriptor; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster LocalizationConfiguration; - instantiate cluster NetworkCommissioning; - instantiate cluster OperationalCredentials; - instantiate cluster PowerSource; - instantiate cluster SoftwareDiagnostics; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WiFiNetworkDiagnostics; + server cluster AdministratorCommissioning; + server cluster Basic; + server cluster Descriptor; + server cluster EthernetNetworkDiagnostics; + server cluster FixedLabel; + server cluster GeneralCommissioning; + server cluster GeneralDiagnostics; + server cluster LocalizationConfiguration; + server cluster NetworkCommissioning; + server cluster OperationalCredentials; + server cluster PowerSource; + server cluster SoftwareDiagnostics; + server cluster ThreadNetworkDiagnostics; + server cluster UserLabel; + server cluster WiFiNetworkDiagnostics; } endpoint 1 { - instantiate cluster Descriptor; - instantiate cluster Identify; - instantiate cluster WindowCovering; + server cluster Descriptor; + server cluster Identify; + server cluster WindowCovering; } endpoint 2 { - instantiate cluster Descriptor; - instantiate cluster WindowCovering; + server cluster Descriptor; + server cluster WindowCovering; } diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 4fed146169f4b1..7e375393e27926 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3316,66 +3316,66 @@ client cluster WindowCovering = 258 { endpoint 1 { - instantiate cluster AccessControl; - instantiate cluster AccountLogin; - instantiate cluster AdministratorCommissioning; - instantiate cluster ApplicationBasic; - instantiate cluster ApplicationLauncher; - instantiate cluster AudioOutput; - instantiate cluster BarrierControl; - instantiate cluster Basic; - instantiate cluster BinaryInputBasic; - instantiate cluster Binding; - instantiate cluster BooleanState; - instantiate cluster BridgedActions; - instantiate cluster BridgedDeviceBasic; - instantiate cluster Channel; - instantiate cluster ColorControl; - instantiate cluster ContentLauncher; - instantiate cluster Descriptor; - instantiate cluster DiagnosticLogs; - instantiate cluster DoorLock; - instantiate cluster ElectricalMeasurement; - instantiate cluster EthernetNetworkDiagnostics; - instantiate cluster FixedLabel; - instantiate cluster FlowMeasurement; - instantiate cluster GeneralCommissioning; - instantiate cluster GeneralDiagnostics; - instantiate cluster GroupKeyManagement; - instantiate cluster Groups; - instantiate cluster Identify; - instantiate cluster IlluminanceMeasurement; - instantiate cluster KeypadInput; - instantiate cluster LevelControl; - instantiate cluster LocalizationConfiguration; - instantiate cluster LowPower; - instantiate cluster MediaInput; - instantiate cluster MediaPlayback; - instantiate cluster ModeSelect; - instantiate cluster NetworkCommissioning; - instantiate cluster OtaSoftwareUpdateProvider; - instantiate cluster OtaSoftwareUpdateRequestor; - instantiate cluster OccupancySensing; - instantiate cluster OnOff; - instantiate cluster OnOffSwitchConfiguration; - instantiate cluster OperationalCredentials; - instantiate cluster PowerSource; - instantiate cluster PowerSourceConfiguration; - instantiate cluster PressureMeasurement; - instantiate cluster PumpConfigurationAndControl; - instantiate cluster RelativeHumidityMeasurement; - instantiate cluster Scenes; - instantiate cluster SoftwareDiagnostics; - instantiate cluster Switch; - instantiate cluster TargetNavigator; - instantiate cluster TemperatureMeasurement; - instantiate cluster TestCluster; - instantiate cluster Thermostat; - instantiate cluster ThermostatUserInterfaceConfiguration; - instantiate cluster ThreadNetworkDiagnostics; - instantiate cluster UserLabel; - instantiate cluster WakeOnLan; - instantiate cluster WiFiNetworkDiagnostics; - instantiate cluster WindowCovering; + binding cluster AccessControl; + binding cluster AccountLogin; + binding cluster AdministratorCommissioning; + binding cluster ApplicationBasic; + binding cluster ApplicationLauncher; + binding cluster AudioOutput; + binding cluster BarrierControl; + binding cluster Basic; + binding cluster BinaryInputBasic; + binding cluster Binding; + binding cluster BooleanState; + binding cluster BridgedActions; + binding cluster BridgedDeviceBasic; + binding cluster Channel; + binding cluster ColorControl; + binding cluster ContentLauncher; + binding cluster Descriptor; + binding cluster DiagnosticLogs; + binding cluster DoorLock; + binding cluster ElectricalMeasurement; + binding cluster EthernetNetworkDiagnostics; + binding cluster FixedLabel; + binding cluster FlowMeasurement; + binding cluster GeneralCommissioning; + binding cluster GeneralDiagnostics; + binding cluster GroupKeyManagement; + binding cluster Groups; + binding cluster Identify; + binding cluster IlluminanceMeasurement; + binding cluster KeypadInput; + binding cluster LevelControl; + binding cluster LocalizationConfiguration; + binding cluster LowPower; + binding cluster MediaInput; + binding cluster MediaPlayback; + binding cluster ModeSelect; + binding cluster NetworkCommissioning; + binding cluster OtaSoftwareUpdateProvider; + binding cluster OtaSoftwareUpdateRequestor; + binding cluster OccupancySensing; + binding cluster OnOff; + binding cluster OnOffSwitchConfiguration; + binding cluster OperationalCredentials; + binding cluster PowerSource; + binding cluster PowerSourceConfiguration; + binding cluster PressureMeasurement; + binding cluster PumpConfigurationAndControl; + binding cluster RelativeHumidityMeasurement; + binding cluster Scenes; + binding cluster SoftwareDiagnostics; + binding cluster Switch; + binding cluster TargetNavigator; + binding cluster TemperatureMeasurement; + binding cluster TestCluster; + binding cluster Thermostat; + binding cluster ThermostatUserInterfaceConfiguration; + binding cluster ThreadNetworkDiagnostics; + binding cluster UserLabel; + binding cluster WakeOnLan; + binding cluster WiFiNetworkDiagnostics; + binding cluster WindowCovering; }