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

Mark 'group names supported' in the groups cluster feature map #20458

Merged
merged 1 commit into from
Jul 9, 2022
Merged

Mark 'group names supported' in the groups cluster feature map #20458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions 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 @@ -48,6 +48,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions 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 @@ -42,6 +42,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
8 changes: 8 additions & 0 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

client cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -54,6 +58,10 @@ client cluster Groups = 4 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
8 changes: 8 additions & 0 deletions examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

client cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -54,6 +58,10 @@ client cluster Groups = 4 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
8 changes: 8 additions & 0 deletions examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

client cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -54,6 +58,10 @@ client cluster Groups = 4 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
8 changes: 8 additions & 0 deletions examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

client cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -54,6 +58,10 @@ client cluster Groups = 4 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
8 changes: 8 additions & 0 deletions examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

client cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand All @@ -54,6 +58,10 @@ client cluster Groups = 4 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions 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 @@ -83,6 +83,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions 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 @@ -48,6 +48,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions 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 @@ -42,6 +42,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 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 @@ -42,6 +42,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;
Expand Down
4 changes: 4 additions & 0 deletions examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ server cluster Identify = 3 {
}

server cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
13 changes: 11 additions & 2 deletions src/app/clusters/groups-server/groups-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,21 @@ static EmberAfStatus GroupRemove(FabricIndex fabricIndex, EndpointId endpointId,
void emberAfGroupsClusterServerInitCallback(EndpointId endpointId)
{
// The most significant bit of the NameSupport attribute indicates whether or not group names are supported
static constexpr uint8_t nameSupport = 0x80;
EmberAfStatus status = Attributes::NameSupport::Set(endpointId, nameSupport);
//
// According to spec, highest bit (Group Names supported) MUST match feature bit 0 (Group Names supported)
static constexpr uint8_t kNameSuppportFlagGroupNamesSupported = 0x80;

EmberAfStatus status = Attributes::NameSupport::Set(endpointId, kNameSuppportFlagGroupNamesSupported);
if (status != EMBER_ZCL_STATUS_SUCCESS)
{
ChipLogDetail(Zcl, "ERR: writing name support %x", status);
}

status = Attributes::FeatureMap::Set(endpointId, static_cast<uint32_t>(GroupClusterFeature::kGroupNames));
if (status != EMBER_ZCL_STATUS_SUCCESS)
{
ChipLogDetail(Zcl, "ERR: writing group feature map %x", status);
}
}

bool emberAfGroupsClusterAddGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
Expand Down
6 changes: 5 additions & 1 deletion src/app/zap-templates/zcl/data-model/silabs/general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,5 +456,9 @@ limitations under the License.
<field name="OnOff" mask="0x1"/>
<field name="Lighting" mask="0x2"/>
<field name="Frequency" mask="0x4"/>
</bitmap>
</bitmap>
<bitmap name="GroupClusterFeature" type="BITMAP32">
<cluster code="0x0004"/>
<field name="GroupNames" mask="0x1"/>
</bitmap>
</configurator>
4 changes: 4 additions & 0 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ client cluster Identify = 3 {
}

client cluster Groups = 4 {
bitmap GroupClusterFeature : BITMAP32 {
kGroupNames = 0x1;
}

readonly attribute bitmap8 nameSupport = 0;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
4 changes: 4 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions zzz_generated/app-common/app-common/zap-generated/enums.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.