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 0c3bb7f015e6de..5838e5198b2a37 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 @@ -396,7 +396,7 @@ server cluster BinaryInputBasic = 15 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } 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 index cc3887148412de..b12e69b1702eda 100644 --- 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 @@ -346,7 +346,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 7a6bea24441155..c971037730ec2a 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -193,7 +193,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index d9ef62f931e9a4..9425876b2d2d89 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -253,7 +253,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 1e0ca4414ce712..33d36d01e166cc 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -271,7 +271,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 59d852d71c8e71..e874b0924a9c5f 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -104,7 +104,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 29126fd5bea537..2b28a25fb1d367 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -253,7 +253,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index fa752cf474b0d2..9073db9c11f7c6 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -104,7 +104,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index ac4448c7974be4..aa5fcc886207a2 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -253,7 +253,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 552e9cf866ad77..5640719afd65a1 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -110,7 +110,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index ad925d918a52ee..ec1c0cdc3f388c 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index b7bdb129487b5c..fc78c4154f74d2 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -246,7 +246,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 925927642a3256..d0e6d5aa6d93e9 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 16f4eece366d29..f4001c7d4ab10d 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index dac4ed7db083ca..01d53e7c55536a 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 0e4bf29e998561..30d16fae57e5a3 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -253,7 +253,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 1e12e4dd9afdea..61fb4a16383b7b 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -196,7 +196,7 @@ server cluster OnOff = 6 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 6b42c68a693e11..782679eedfdd4f 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -154,7 +154,7 @@ server cluster OnOff = 6 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 7ea0440d3de075..e914ee6b7d02d6 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -122,7 +122,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index fd85f652eef039..e4d7daa24789ba 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -244,7 +244,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index cfe8c141485bad..11373cff8c96fb 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -117,7 +117,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 93b98a167a910d..1d085c672d74e4 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -104,7 +104,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 8056b6f42a374f..2b1053f7cf5b65 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -104,7 +104,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 11af7b5d7413a9..3425a9d8b822b2 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -112,7 +112,7 @@ server cluster Groups = 4 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 7a6bea24441155..c971037730ec2a 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -193,7 +193,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 79c5f8211cc643..879702e6df8ef4 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -300,7 +300,7 @@ client cluster OnOff = 6 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index d122bdfb961da6..e9cdbc14c858f3 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -273,7 +273,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 43cc20a1e3cee1..d88bc0202f2545 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -273,7 +273,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 51f148979f8491..936bc170efeb5e 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -90,7 +90,7 @@ server cluster OnOff = 6 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } 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 2b60e25294c1a2..d5eb900787e676 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 @@ -8,7 +8,7 @@ struct LabelStruct { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } 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 0f0fa82faa66e7..89e2d4d191408b 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 @@ -170,7 +170,7 @@ server cluster OnOff = 6 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 26617541ec25cb..383b1096765494 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -418,7 +418,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 26617541ec25cb..383b1096765494 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -418,7 +418,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 814c74a749102e..f46ec3413c0e83 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -184,7 +184,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } 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 ec611de1097c57..db4a64e5c3e027 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 @@ -83,7 +83,7 @@ client cluster OnOff = 6 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 52b56ed2c4f91d..335b3d80b27478 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -8,7 +8,7 @@ struct LabelStruct { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index ea5fb8d06b6a74..88a9b4eff700d4 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -246,7 +246,7 @@ server cluster Scenes = 5 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index d9b338e17952d4..135981d0aca997 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -154,7 +154,7 @@ server cluster LevelControl = 8 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } 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 42d660c73d3f60..bacb1bb066b43f 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 @@ -519,7 +519,7 @@ server cluster BinaryInputBasic = 15 { client cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } @@ -533,7 +533,7 @@ client cluster Descriptor = 29 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 194d1568c2736d..810bf0eafa6e1e 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -226,7 +226,7 @@ server cluster Scenes = 5 { server cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp index e14ea6daf40462..fbd6574f06a59e 100644 --- a/src/app/clusters/descriptor/descriptor.cpp +++ b/src/app/clusters/descriptor/descriptor.cpp @@ -120,8 +120,8 @@ CHIP_ERROR DescriptorAttrAccess::ReadDeviceAttribute(EndpointId endpoint, Attrib for (auto & deviceType : deviceTypeList) { - deviceStruct.type = deviceType.deviceId; - deviceStruct.revision = deviceType.deviceVersion; + deviceStruct.deviceType = deviceType.deviceId; + deviceStruct.revision = deviceType.deviceVersion; ReturnErrorOnFailure(encoder.Encode(deviceStruct)); } diff --git a/src/app/tests/suites/TestDescriptorCluster.yaml b/src/app/tests/suites/TestDescriptorCluster.yaml index d49accc2f68cba..4b146ba502db3b 100644 --- a/src/app/tests/suites/TestDescriptorCluster.yaml +++ b/src/app/tests/suites/TestDescriptorCluster.yaml @@ -32,7 +32,7 @@ tests: command: "readAttribute" attribute: "DeviceTypeList" response: - value: [{ type: 22, revision: 1 }] + value: [{ DeviceType: 22, Revision: 1 }] - label: "Read attribute Server list" command: "readAttribute" diff --git a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml index 41cf218dd60e2d..c2393f383730b3 100644 --- a/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml @@ -19,8 +19,8 @@ limitations under the License. - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 50c53e93283245..a2923b8dcbd771 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -417,7 +417,7 @@ client cluster BinaryInputBasic = 15 { client cluster Descriptor = 29 { struct DeviceTypeStruct { - devtype_id type = 0; + devtype_id deviceType = 0; int16u revision = 1; } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index aae0878ab2d6a5..9251b1aa4c2241 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -1370,11 +1370,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { auto & entry_0 = iter_value_0.GetValue(); jobject newElement_0; - jobject newElement_0_type; - std::string newElement_0_typeClassName = "java/lang/Long"; - std::string newElement_0_typeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), entry_0.type, newElement_0_type); + jobject newElement_0_deviceType; + std::string newElement_0_deviceTypeClassName = "java/lang/Long"; + std::string newElement_0_deviceTypeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_deviceTypeClassName.c_str(), + newElement_0_deviceTypeCtorSignature.c_str(), + entry_0.deviceType, newElement_0_deviceType); jobject newElement_0_revision; std::string newElement_0_revisionClassName = "java/lang/Integer"; std::string newElement_0_revisionCtorSignature = "(I)V"; @@ -1398,7 +1399,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } - newElement_0 = env->NewObject(deviceTypeStructStructClass_1, deviceTypeStructStructCtor_1, newElement_0_type, + newElement_0 = env->NewObject(deviceTypeStructStructClass_1, deviceTypeStructStructCtor_1, newElement_0_deviceType, newElement_0_revision); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 70cff6f9eba4a4..bb69766bad252a 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -2735,11 +2735,12 @@ void CHIPDescriptorDeviceTypeListAttributeCallback::CallbackFn( { auto & entry_0 = iter_arrayListObj_0.GetValue(); jobject newElement_0; - jobject newElement_0_type; - std::string newElement_0_typeClassName = "java/lang/Long"; - std::string newElement_0_typeCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_typeClassName.c_str(), newElement_0_typeCtorSignature.c_str(), entry_0.type, newElement_0_type); + jobject newElement_0_deviceType; + std::string newElement_0_deviceTypeClassName = "java/lang/Long"; + std::string newElement_0_deviceTypeCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_deviceTypeClassName.c_str(), + newElement_0_deviceTypeCtorSignature.c_str(), + entry_0.deviceType, newElement_0_deviceType); jobject newElement_0_revision; std::string newElement_0_revisionClassName = "java/lang/Integer"; std::string newElement_0_revisionCtorSignature = "(I)V"; @@ -2763,8 +2764,8 @@ void CHIPDescriptorDeviceTypeListAttributeCallback::CallbackFn( return; } - newElement_0 = - env->NewObject(deviceTypeStructStructClass_1, deviceTypeStructStructCtor_1, newElement_0_type, newElement_0_revision); + newElement_0 = env->NewObject(deviceTypeStructStructClass_1, deviceTypeStructStructCtor_1, newElement_0_deviceType, + newElement_0_revision); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 5c721f652b3e45..fe28affd412eaf 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -75,11 +75,11 @@ public String toString() { } public static class DescriptorClusterDeviceTypeStruct { - public Long type; + public Long deviceType; public Integer revision; - public DescriptorClusterDeviceTypeStruct(Long type, Integer revision) { - this.type = type; + public DescriptorClusterDeviceTypeStruct(Long deviceType, Integer revision) { + this.deviceType = deviceType; this.revision = revision; } @@ -87,8 +87,8 @@ public DescriptorClusterDeviceTypeStruct(Long type, Integer revision) { public String toString() { StringBuilder output = new StringBuilder(); output.append("DescriptorClusterDeviceTypeStruct {\n"); - output.append("\ttype: "); - output.append(type); + output.append("\tdeviceType: "); + output.append(deviceType); output.append("\n"); output.append("\trevision: "); output.append(revision); diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 2f76dbf25eb71d..374ebc9565ab61 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -2583,11 +2583,11 @@ class DeviceTypeStruct(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="type", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="deviceType", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="revision", Tag=1, Type=uint), ]) - type: 'uint' = 0 + deviceType: 'uint' = 0 revision: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index e82619dd00ec5f..b37432051eb8fc 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5014,6 +5014,9 @@ CapabilityMinimaStruct: - caseSessionsPerFabric - subscriptionsPerFabric + Descriptor: + DeviceTypeStruct: + - deviceType events: OTASoftwareUpdateRequestor: - StateTransition @@ -5193,6 +5196,10 @@ structs: Descriptor: - DeviceType + struct fields: + Descriptor: + DeviceTypeStruct: + - type event fields: Switch: MultiPressComplete: @@ -5256,3 +5263,7 @@ Switch: MultiPressComplete: previousPosition: newPosition + struct fields: + Descriptor: + DeviceTypeStruct: + deviceType: type diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 574e6f2f55a505..e6bcf8fd7da5df 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -1274,7 +1274,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & auto & entry_0 = iter_0.GetValue(); MTRDescriptorClusterDeviceTypeStruct * newElement_0; newElement_0 = [MTRDescriptorClusterDeviceTypeStruct new]; - newElement_0.type = [NSNumber numberWithUnsignedInt:entry_0.type]; + newElement_0.deviceType = [NSNumber numberWithUnsignedInt:entry_0.deviceType]; newElement_0.revision = [NSNumber numberWithUnsignedShort:entry_0.revision]; [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 96afba006b24df..edca66b56db55e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -1535,7 +1535,7 @@ auto & entry_0 = iter_0.GetValue(); MTRDescriptorClusterDeviceTypeStruct * newElement_0; newElement_0 = [MTRDescriptorClusterDeviceTypeStruct new]; - newElement_0.type = [NSNumber numberWithUnsignedInt:entry_0.type]; + newElement_0.deviceType = [NSNumber numberWithUnsignedInt:entry_0.deviceType]; newElement_0.revision = [NSNumber numberWithUnsignedShort:entry_0.revision]; [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 9d30ab4f455605..aa32fe7d51dc02 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -33,7 +33,9 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) @interface MTRDescriptorClusterDeviceTypeStruct : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull type API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)); +@property (nonatomic, copy) NSNumber * _Nonnull deviceType MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull type API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)) + MTR_NEWLY_DEPRECATED("Please use deviceType"); @property (nonatomic, copy) NSNumber * _Nonnull revision API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2)); @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 0c2cf034b1542f..ce9447c4d8ffca 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -86,7 +86,7 @@ - (instancetype)init { if (self = [super init]) { - _type = @(0); + _deviceType = @(0); _revision = @(0); } @@ -97,7 +97,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone { auto other = [[MTRDescriptorClusterDeviceTypeStruct alloc] init]; - other.type = self.type; + other.deviceType = self.deviceType; other.revision = self.revision; return other; @@ -106,10 +106,20 @@ - (id)copyWithZone:(NSZone * _Nullable)zone - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: type:%@; revision:%@; >", NSStringFromClass([self class]), _type, _revision]; + [NSString stringWithFormat:@"<%@: deviceType:%@; revision:%@; >", NSStringFromClass([self class]), _deviceType, _revision]; return descriptionString; } +- (void)setType:(NSNumber * _Nonnull)type +{ + self.deviceType = type; +} + +- (NSNumber * _Nonnull)type +{ + return self.deviceType; +} + @end @implementation MTRDescriptorClusterDeviceType : MTRDescriptorClusterDeviceTypeStruct diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h index 504c6d137296ba..d2ac4ee7bc36f7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h +++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h @@ -267,8 +267,8 @@ typedef struct _ChannelInfo // Struct for DeviceTypeStruct typedef struct _DeviceTypeStruct { - chip::DeviceTypeId type; - uint16_t revision; + chip::DeviceTypeId DeviceType; + uint16_t Revision; } DeviceTypeStruct; // Struct for DlCredential diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index e84869f18199d0..9d46f27aac09b0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -2570,7 +2570,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kType)), type)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kDeviceType)), deviceType)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kRevision)), revision)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; @@ -2591,8 +2591,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kType): - ReturnErrorOnFailure(DataModel::Decode(reader, type)); + case to_underlying(Fields::kDeviceType): + ReturnErrorOnFailure(DataModel::Decode(reader, deviceType)); break; case to_underlying(Fields::kRevision): ReturnErrorOnFailure(DataModel::Decode(reader, revision)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index db6d28c4afa7a5..8a8653e904fecf 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -3075,15 +3075,15 @@ namespace Structs { namespace DeviceTypeStruct { enum class Fields { - kType = 0, - kRevision = 1, + kDeviceType = 0, + kRevision = 1, }; struct Type { public: - chip::DeviceTypeId type = static_cast(0); - uint16_t revision = static_cast(0); + chip::DeviceTypeId deviceType = static_cast(0); + uint16_t revision = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 75c96256835e13..9ce2367654ba7a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -476,13 +476,14 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DeviceTypeStruct.type", "type", value.isMember("type"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("DeviceTypeStruct.deviceType", "deviceType", value.isMember("deviceType"))); ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("DeviceTypeStruct.revision", "revision", value.isMember("revision"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "type"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.type, value["type"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "deviceType"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.deviceType, value["deviceType"])); snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "revision"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.revision, value["revision"])); @@ -492,7 +493,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, void ComplexArgumentParser::Finalize(chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request) { - ComplexArgumentParser::Finalize(request.type); + ComplexArgumentParser::Finalize(request.deviceType); ComplexArgumentParser::Finalize(request.revision); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index bffe45116c9d90..b97a368fd7e784 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -471,10 +471,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("Type", indent + 1, value.type); + CHIP_ERROR err = LogValue("DeviceType", indent + 1, value.deviceType); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Type'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DeviceType'"); return err; } } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 7cc1640812f99d..ee77f295132d5a 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -61122,7 +61122,7 @@ class TestDescriptorClusterSuite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("deviceTypeList", iter_0, 0)); - VerifyOrReturn(CheckValue("deviceTypeList[0].type", iter_0.GetValue().type, 22UL)); + VerifyOrReturn(CheckValue("deviceTypeList[0].deviceType", iter_0.GetValue().deviceType, 22UL)); VerifyOrReturn(CheckValue("deviceTypeList[0].revision", iter_0.GetValue().revision, 1U)); VerifyOrReturn(CheckNoMoreListItems("deviceTypeList", iter_0, 1)); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 79a768cea51471..859c8026370121 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -95063,8 +95063,9 @@ class TestDescriptorCluster : public TestCommandBridge { { id actualValue = value; VerifyOrReturn(CheckValue("DeviceTypeList", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("type", ((MTRDescriptorClusterDeviceTypeStruct *) actualValue[0]).type, 22UL)); - VerifyOrReturn(CheckValue("revision", ((MTRDescriptorClusterDeviceTypeStruct *) actualValue[0]).revision, 1U)); + VerifyOrReturn( + CheckValue("DeviceType", ((MTRDescriptorClusterDeviceTypeStruct *) actualValue[0]).deviceType, 22UL)); + VerifyOrReturn(CheckValue("Revision", ((MTRDescriptorClusterDeviceTypeStruct *) actualValue[0]).revision, 1U)); } NextTest();