Add device type version support in matter IDL (#24003)

* 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
project-chip · Feb 1, 2024 · 3569749 · 3569749
1 parent 8c18d0a
commit 3569749
Show file tree

Hide file tree

Showing 49 changed files with 132 additions and 118 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
@@ -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 {
@@ -4207,7 +4207,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type onofflight = 256;
+  device type onofflight = 256, version 1;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -4797,7 +4797,7 @@ endpoint 1 {
   }
 }
 endpoint 2 {
-  device type onofflight = 256;
+  device type onofflight = 256, version 1;
 
   server cluster Groups {
     ram      attribute nameSupport;
@@ -4844,7 +4844,7 @@ endpoint 2 {
   }
 }
 endpoint 65534 {
-  device type anonymousEndpointType = 61442;
+  device type anonymousEndpointType = 61442, version 1;
 
   server cluster NetworkCommissioning {
     callback attribute maxNetworks;

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -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 {
@@ -3510,7 +3510,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type onofflight = 256;
+  device type onofflight = 256, version 1;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -3892,7 +3892,7 @@ endpoint 1 {
   }
 }
 endpoint 2 {
-  device type onofflight = 256;
+  device type onofflight = 256, version 1;
 
   server cluster Groups {
     ram      attribute nameSupport;
@@ -3932,7 +3932,7 @@ endpoint 2 {
   }
 }
 endpoint 65534 {
-  device type anonymousEndpointType = 61442;
+  device type anonymousEndpointType = 61442, version 1;
 
   server cluster NetworkCommissioning {
     callback attribute maxNetworks;

diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -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 {
@@ -1743,7 +1743,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 14;
+  device type anonymousEndpointType = 14, version 1;
   binding cluster Binding;
 
   server cluster Identify {
@@ -1780,7 +1780,7 @@ endpoint 1 {
   }
 }
 endpoint 2 {
-  device type dimmablelight = 257;
+  device type dimmablelight = 257, version 1;
 
   server cluster OnOff {
     ram      attribute onOff;

diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -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 {
@@ -1548,7 +1548,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 257;
+  device type anonymousEndpointType = 257, version 1;
   binding cluster Binding;
   binding cluster OccupancySensing;
 

diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -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 {
@@ -1514,7 +1514,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 268;
+  device type anonymousEndpointType = 268, version 1;
 
   server cluster Identify {
     ram      attribute identifyTime;

diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -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 {
@@ -1199,7 +1199,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 21;
+  device type anonymousEndpointType = 21, version 1;
   binding cluster Binding;
 
   server cluster Identify {

diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -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 {
@@ -1345,7 +1345,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 257;
+  device type anonymousEndpointType = 257, version 1;
   binding cluster Binding;
   binding cluster OccupancySensing;
 

diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -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 {
@@ -1584,7 +1584,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 10;
+  device type anonymousEndpointType = 10, version 1;
   binding cluster Binding;
 
   server cluster Identify {

diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -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 {
@@ -1600,7 +1600,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 269;
+  device type anonymousEndpointType = 269, version 1;
   binding cluster Binding;
 
   server cluster Identify {

diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -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 {
@@ -1260,7 +1260,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 43;
+  device type anonymousEndpointType = 43, version 1;
 
   server cluster Identify {
     ram      attribute identifyTime;

diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -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 {
@@ -1211,7 +1211,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 774;
+  device type anonymousEndpointType = 774, version 1;
   binding cluster Groups;
   binding cluster Binding;
 

diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -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 {
@@ -1453,7 +1453,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 768;
+  device type anonymousEndpointType = 768, version 1;
   binding cluster Binding;
   binding cluster Thermostat;
 

diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -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 {
@@ -1211,7 +1211,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 775;
+  device type anonymousEndpointType = 775, version 1;
   binding cluster Groups;
   binding cluster Binding;
 

diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -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 {
@@ -1215,7 +1215,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 262;
+  device type anonymousEndpointType = 262, version 1;
   binding cluster Groups;
   binding cluster Binding;
 

diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -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 {
@@ -1210,7 +1210,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 263;
+  device type anonymousEndpointType = 263, version 1;
   binding cluster Groups;
   binding cluster Binding;
 

diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -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 {
@@ -1335,7 +1335,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 256;
+  device type anonymousEndpointType = 256, version 1;
   binding cluster Binding;
 
   server cluster Identify {

diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -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 {
@@ -1278,7 +1278,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 259;
+  device type anonymousEndpointType = 259, version 1;
   binding cluster OnOff;
   binding cluster Binding;
 

diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -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 {
@@ -1236,7 +1236,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 266;
+  device type anonymousEndpointType = 266, version 1;
   binding cluster Binding;
 
   server cluster Identify {

diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -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 {
@@ -1226,7 +1226,7 @@ endpoint 0 {
   }
 }
 endpoint 1 {
-  device type anonymousEndpointType = 773;
+  device type anonymousEndpointType = 773, version 1;
   binding cluster Groups;
   binding cluster Binding;