Skip to content

Update Composed device type tag logic #52

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

Open
AryaHassanli wants to merge 6 commits into
base: main
Choose a base branch
from
+168 −57
Open

Update Composed device type tag logic #52

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0a5acd
Create device type requirements table
AryaHassanli Feb 12, 2026
2c07bc4
Merge branch 'main' into device_type_requirements
AryaHassanli Mar 12, 2026
800ed2f
Remove redundant composedDeviceType for main clsuter requirements
AryaHassanli Mar 12, 2026
198081c
Support element requirement
AryaHassanli May 27, 2026
a8b53c2
Render device location
AryaHassanli May 27, 2026
4002324
Render anywhere as anyEndpoint
AryaHassanli May 27, 2026
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
58 changes: 29 additions & 29 deletions dm/devicetype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,26 @@ func renderDeviceType(deviceType *matter.DeviceType) (output string, err error)
}

type deviceTypeRequirements struct {
deviceRequirements []*matter.DeviceTypeRequirement
clusterRequirements []*matter.DeviceTypeClusterRequirement
elementRequirements map[*matter.Cluster][]*matter.ElementRequirement
}

dtrs := make(map[*matter.DeviceType]*deviceTypeRequirements)

for _, dr := range deviceType.DeviceTypeRequirements {
if dr.DeviceType == nil {
continue
}

dtr, ok := dtrs[dr.DeviceType]
if !ok {
dtr = &deviceTypeRequirements{}
dtrs[dr.DeviceType] = dtr
}
dtr.deviceRequirements = append(dtr.deviceRequirements, dr)
}

for _, cr := range deviceType.ComposedDeviceTypeClusterRequirements {
if cr.DeviceType == nil {
continue
Expand Down Expand Up @@ -173,7 +187,11 @@ func renderDeviceType(deviceType *matter.DeviceType) (output string, err error)
cx := c.CreateElement("composedDeviceTypes")
deviceTypes := make([]*matter.DeviceType, 0, len(dtrs))
for _, dtr := range dtrs {
deviceTypes = append(deviceTypes, dtr.clusterRequirements[0].DeviceType)
if len(dtr.clusterRequirements) > 0 {
deviceTypes = append(deviceTypes, dtr.clusterRequirements[0].DeviceType)
} else if len(dtr.deviceRequirements) > 0 {
deviceTypes = append(deviceTypes, dtr.deviceRequirements[0].DeviceType)
}
}
slices.SortStableFunc(deviceTypes, func(a, b *matter.DeviceType) int {
return strings.Compare(a.Name, b.Name)
Expand All @@ -188,6 +206,16 @@ func renderDeviceType(deviceType *matter.DeviceType) (output string, err error)
dte.CreateAttr("deviceTypeId", dt.ID.HexString())
}
dte.CreateAttr("deviceTypeName", dt.Name)
if len(dtr.deviceRequirements) > 0 {
err = renderConformanceElement(dtr.deviceRequirements[0].Conformance, dte, nil)
if err != nil {
return
}
err = renderConstraintElement(dtr.deviceRequirements[0].Constraint, nil, dte, nil)
if err != nil {
return
}
}
Comment thread
AryaHassanli marked this conversation as resolved.
if len(dtr.clusterRequirements) > 0 {
crx := dte.CreateElement("clusterRequirements")
reqs := make([]*matter.DeviceTypeClusterRequirement, len(dtr.clusterRequirements))
Expand Down Expand Up @@ -215,34 +243,6 @@ func renderDeviceType(deviceType *matter.DeviceType) (output string, err error)

}

if len(deviceType.ComposedDeviceTypeClusterRequirements) > 0 {
cx := c.CreateElement("composedDeviceTypes")
reqs := make([]*matter.ClusterRequirement, len(deviceType.ClusterRequirements))
copy(reqs, deviceType.ClusterRequirements)
slices.SortStableFunc(reqs, sortClusterRequirements)
for _, cr := range reqs {
clx := cx.CreateElement("cluster")
clx.CreateAttr("id", cr.ClusterID.HexString())
clx.CreateAttr("name", cr.ClusterName)
switch cr.Interface {
case matter.InterfaceClient:
clx.CreateAttr("side", "client")
case matter.InterfaceServer:
clx.CreateAttr("side", "server")
}
renderQuality(clx, cr.Quality)
err = renderConformanceElement(cr.Conformance, clx, nil)
if err != nil {
return
}
err = renderElementRequirements(deviceType, cr, clx)
if err != nil {
return
}

}
}

x.Indent(2)

var b bytes.Buffer
Expand Down
Loading