Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Be explicit between server clusters and client (binding) clusters on endpoints #13649

Merged
merged 3 commits into from
Jan 18, 2022
Merged

Be explicit between server clusters and client (binding) clusters on endpoints #13649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c72d08
Be explicit between server clusters and client (binding) clusters on …
andy31415 Jan 18, 2022
62230e3
ZAP regen
andy31415 Jan 18, 2022
f3e7015
Fix up the spacing a bit without comment hacks
andy31415 Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 75 additions & 75 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

40 changes: 20 additions & 20 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

40 changes: 20 additions & 20 deletions examples/door-lock-app/door-lock-common/door-lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

52 changes: 26 additions & 26 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,37 +1381,37 @@ 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 OtaSoftwareUpdateProvider;
instantiate cluster OtaSoftwareUpdateRequestor;
instantiate cluster OperationalCredentials;
instantiate cluster SoftwareDiagnostics;
instantiate cluster Switch;
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;
binding cluster OtaSoftwareUpdateProvider;
server cluster OtaSoftwareUpdateRequestor;
server cluster OperationalCredentials;
server cluster SoftwareDiagnostics;
server cluster Switch;
server cluster ThreadNetworkDiagnostics;
server cluster UserLabel;
server cluster WiFiNetworkDiagnostics;
}

endpoint 1 {
instantiate cluster ColorControl;
instantiate cluster Descriptor;
instantiate cluster Identify;
instantiate cluster LevelControl;
instantiate cluster OccupancySensing;
instantiate cluster OnOff;
server cluster ColorControl;
server cluster Descriptor;
server cluster Identify;
server cluster LevelControl;
server cluster OccupancySensing;
server cluster OnOff;
}

endpoint 2 {
instantiate cluster OnOff;
instantiate cluster OnOffSwitchConfiguration;
binding cluster OnOff;
server cluster OnOffSwitchConfiguration;
}

40 changes: 20 additions & 20 deletions examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

10 changes: 5 additions & 5 deletions examples/log-source-app/log-source-common/log-source-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Loading