Skip to content

Commit

Permalink
Add device type version support in matter IDL (#24003)
Browse files Browse the repository at this point in the history
* Start adding version support (including parsing) for matter files

* Regen all to get versions that parse. Version number is hardcoded as 1 until I get it from zap

* Set the correct version for clusters

* Make the test matter files have a version

* One more test fix
  • Loading branch information
andy31415 authored and pull[bot] committed Mar 21, 2023
1 parent 6ae823d commit 5b829ea
Show file tree
Hide file tree
Showing 49 changed files with 132 additions and 118 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3880,7 +3880,7 @@ server cluster FaultInjection = 4294048774 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

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

server cluster Identify {
ram attribute identifyTime;
Expand Down Expand Up @@ -4797,7 +4797,7 @@ endpoint 1 {
}
}
endpoint 2 {
device type onofflight = 256;
device type onofflight = 256, version 1;

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

server cluster NetworkCommissioning {
callback attribute maxNetworks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3270,7 +3270,7 @@ server cluster UnitTesting = 4294048773 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

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

server cluster Identify {
ram attribute identifyTime;
Expand Down Expand Up @@ -3892,7 +3892,7 @@ endpoint 1 {
}
}
endpoint 2 {
device type onofflight = 256;
device type onofflight = 256, version 1;

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

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

endpoint 0 {
device type bridge = 22;
device type bridge = 22, version 1;
binding cluster AccessControl;

server cluster Descriptor {
Expand Down Expand Up @@ -1743,7 +1743,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 14;
device type anonymousEndpointType = 14, version 1;
binding cluster Binding;

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

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1548,7 +1548,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 257;
device type anonymousEndpointType = 257, version 1;
binding cluster Binding;
binding cluster OccupancySensing;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1514,7 +1514,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 268;
device type anonymousEndpointType = 268, version 1;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1199,7 +1199,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 21;
device type anonymousEndpointType = 21, version 1;
binding cluster Binding;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1345,7 +1345,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 257;
device type anonymousEndpointType = 257, version 1;
binding cluster Binding;
binding cluster OccupancySensing;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1584,7 +1584,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 10;
device type anonymousEndpointType = 10, version 1;
binding cluster Binding;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1600,7 +1600,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 269;
device type anonymousEndpointType = 269, version 1;
binding cluster Binding;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1260,7 +1260,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 43;
device type anonymousEndpointType = 43, version 1;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1211,7 +1211,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 774;
device type anonymousEndpointType = 774, version 1;
binding cluster Groups;
binding cluster Binding;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1453,7 +1453,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 768;
device type anonymousEndpointType = 768, version 1;
binding cluster Binding;
binding cluster Thermostat;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1211,7 +1211,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 775;
device type anonymousEndpointType = 775, version 1;
binding cluster Groups;
binding cluster Binding;

Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ server cluster IlluminanceMeasurement = 1024 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1215,7 +1215,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 262;
device type anonymousEndpointType = 262, version 1;
binding cluster Groups;
binding cluster Binding;

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

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1210,7 +1210,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 263;
device type anonymousEndpointType = 263, version 1;
binding cluster Groups;
binding cluster Binding;

Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ server cluster FixedLabel = 64 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1335,7 +1335,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 256;
device type anonymousEndpointType = 256, version 1;
binding cluster Binding;

server cluster Identify {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ server cluster FixedLabel = 64 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1278,7 +1278,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 259;
device type anonymousEndpointType = 259, version 1;
binding cluster OnOff;
binding cluster Binding;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ server cluster FixedLabel = 64 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1236,7 +1236,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 266;
device type anonymousEndpointType = 266, version 1;
binding cluster Binding;

server cluster Identify {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ server cluster PressureMeasurement = 1027 {
}

endpoint 0 {
device type rootdevice = 22;
device type rootdevice = 22, version 1;
binding cluster OtaSoftwareUpdateProvider;

server cluster Groups {
Expand Down Expand Up @@ -1226,7 +1226,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type anonymousEndpointType = 773;
device type anonymousEndpointType = 773, version 1;
binding cluster Groups;
binding cluster Binding;

Expand Down
Loading

0 comments on commit 5b829ea

Please sign in to comment.