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.

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

[matteridl] use looping struct for getting device types #28529

Merged
merged 1 commit into from
Aug 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6063,7 +6063,8 @@ server cluster FaultInjection = 4294048774 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Identify {
Expand Down Expand Up @@ -6440,7 +6441,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type onofflight = 256, version 1;
device type ma_onofflight = 256, version 1;

binding cluster OnOff;

server cluster Identify {
Expand Down Expand Up @@ -7449,7 +7451,8 @@ endpoint 1 {
}
}
endpoint 2 {
device type onofflight = 256, version 1;
device type ma_onofflight = 256, version 1;


server cluster Groups {
ram attribute nameSupport;
Expand Down Expand Up @@ -7497,7 +7500,8 @@ endpoint 2 {
}
}
endpoint 65534 {
device type anonymousEndpointType = 61442, version 1;
device type ma_secondary_network_commissioning = 61442, version 1;


server cluster Descriptor {
callback attribute deviceTypeList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3960,7 +3960,8 @@ server cluster UnitTesting = 4294048773 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Identify {
Expand Down Expand Up @@ -4200,7 +4201,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type onofflight = 256, version 1;
device type ma_onofflight = 256, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0000;
Expand Down Expand Up @@ -4616,7 +4618,8 @@ endpoint 1 {
}
}
endpoint 2 {
device type onofflight = 256, version 1;
device type ma_onofflight = 256, version 1;


server cluster Groups {
ram attribute nameSupport;
Expand Down Expand Up @@ -4657,7 +4660,8 @@ endpoint 2 {
}
}
endpoint 65534 {
device type anonymousEndpointType = 61442, version 1;
device type ma_secondary_network_commissioning = 61442, version 1;


server cluster Descriptor {
callback attribute deviceTypeList;
Expand Down
9 changes: 6 additions & 3 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,8 @@ server cluster TemperatureMeasurement = 1026 {
}

endpoint 0 {
device type bridge = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster AccessControl;

server cluster Descriptor {
Expand Down Expand Up @@ -1939,7 +1940,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 14, version 1;
device type ma_aggregator = 14, version 1;

binding cluster Binding;

server cluster Identify {
Expand Down Expand Up @@ -1977,7 +1979,8 @@ endpoint 1 {
}
}
endpoint 2 {
device type dimmablelight = 257, version 1;
device type ma_dimmablelight = 257, version 1;


server cluster OnOff {
ram attribute onOff default = 0x00;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,8 @@ client cluster OccupancySensing = 1030 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1757,7 +1758,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 257, version 1;
device type ma_dimmablelight = 257, version 1;

binding cluster Binding;
binding cluster OccupancySensing;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,8 @@ server cluster RadonConcentrationMeasurement = 1071 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;


server cluster Descriptor {
callback attribute deviceTypeList;
Expand Down Expand Up @@ -1876,7 +1877,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 45, version 1;
device type ma_air_purifier = 45, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down Expand Up @@ -1960,7 +1962,8 @@ endpoint 1 {
}
}
endpoint 2 {
device type anonymousEndpointType = 44, version 1;
device type ma_air_quality_sensor = 44, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down Expand Up @@ -2187,7 +2190,8 @@ endpoint 2 {
}
}
endpoint 3 {
device type anonymousEndpointType = 770, version 1;
device type ma_tempsensor = 770, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down Expand Up @@ -2226,7 +2230,8 @@ endpoint 3 {
}
}
endpoint 4 {
device type anonymousEndpointType = 775, version 1;
device type ma_humiditysensor = 775, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down Expand Up @@ -2265,7 +2270,8 @@ endpoint 4 {
}
}
endpoint 5 {
device type anonymousEndpointType = 769, version 1;
device type ma_thermostat = 769, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1463,7 +1463,8 @@ server cluster AudioOutput = 1291 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1629,7 +1630,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 40, version 1;
device type ma_basic_videoplayer = 40, version 1;


server cluster OnOff {
ram attribute onOff default = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,8 @@ server cluster ColorControl = 768 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1679,7 +1680,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 268, version 1;
device type ma_colortemperaturelight = 268, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,8 @@ server cluster BooleanState = 69 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1357,7 +1358,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 21, version 1;
device type ma_contactsensor = 21, version 1;

binding cluster Binding;

server cluster Identify {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,8 @@ client cluster OccupancySensing = 1030 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1533,7 +1534,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 257, version 1;
device type ma_dimmablelight = 257, version 1;

binding cluster Binding;
binding cluster OccupancySensing;

Expand Down
6 changes: 4 additions & 2 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1663,7 +1663,8 @@ server cluster DoorLock = 257 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1829,7 +1830,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 10, version 1;
device type ma_doorlock = 10, version 1;

binding cluster Binding;

server cluster Identify {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,8 @@ server cluster ColorControl = 768 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1760,7 +1761,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 269, version 1;
device type ma_extendedcolorlight = 269, version 1;

binding cluster Binding;

server cluster Identify {
Expand Down
6 changes: 4 additions & 2 deletions examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,8 @@ server cluster FanControl = 514 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1400,7 +1401,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 43, version 1;
device type ma_fan = 43, version 1;


server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down
6 changes: 4 additions & 2 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,8 @@ server cluster FlowMeasurement = 1028 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1362,7 +1363,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 774, version 1;
device type ma_flowsensor = 774, version 1;

binding cluster Groups;
binding cluster Binding;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1543,7 +1543,8 @@ server cluster FanControl = 514 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1709,7 +1710,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 768, version 1;
device type ma_heatcool = 768, version 1;

binding cluster Binding;
binding cluster Thermostat;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,8 @@ server cluster RelativeHumidityMeasurement = 1029 {
}

endpoint 0 {
device type rootdevice = 22, version 1;
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Descriptor {
Expand Down Expand Up @@ -1362,7 +1363,8 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 775, version 1;
device type ma_humiditysensor = 775, version 1;

binding cluster Groups;
binding cluster Binding;

Expand Down
Loading