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

Align naming in Descriptor cluster XML with the spec. #24238

Merged
merged 2 commits into from
Jan 3, 2023
Merged

Align naming in Descriptor cluster XML with the spec. #24238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa0f555
Align naming in Descriptor cluster XML with the spec.
bzbarsky-apple Dec 21, 2022
41b53c0
Regenerate generated files.
bzbarsky-apple Dec 22, 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
2 changes: 1 addition & 1 deletion 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 @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/nxp/zap/lighting-on-off.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct LabelStruct {

server cluster Descriptor = 29 {
struct DeviceTypeStruct {
devtype_id type = 0;
devtype_id deviceType = 0;
int16u revision = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/pump-common/pump-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct LabelStruct {

server cluster Descriptor = 29 {
struct DeviceTypeStruct {
devtype_id type = 0;
devtype_id deviceType = 0;
int16u revision = 1;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

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

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/clusters/descriptor/descriptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/tests/suites/TestDescriptorCluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ limitations under the License.

<struct name="DeviceTypeStruct">
<cluster code="0x001d"/>
<item name="type" type="DEVTYPE_ID"/>
<item name="revision" type="INT16U"/>
<item name="DeviceType" type="DEVTYPE_ID"/>
<item name="Revision" type="INT16U"/>
</struct>

<cluster>
Expand Down
Loading