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

Standardise feature names #25896

Merged
merged 7 commits into from
Mar 30, 2023
Merged

Standardise feature names #25896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92afaab
Standardize feature flags name into CLUSTERFeature
andy31415 Mar 30, 2023
5d50553
Zap regen
andy31415 Mar 30, 2023
82dae86
Fix group cluster feature naming
andy31415 Mar 30, 2023
88afd93
Correct Darwin availability annotations for feature bitmap renames.
bzbarsky-apple Mar 30, 2023
db79839
Fix usage of pump configuration and control feature naming
andy31415 Mar 30, 2023
1e63744
Fix window covering feature usage
andy31415 Mar 30, 2023
0bd4a49
Fix one more use of WindowCoveringFeature
andy31415 Mar 30, 2023
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
30 changes: 15 additions & 15 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 @@ -52,7 +52,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -116,14 +116,14 @@ server cluster Groups = 4 {
}

server cluster Scenes = 5 {
bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}

bitmap ScenesFeature : BITMAP32 {
kSceneNames = 0x1;
}

struct ExtensionFieldSet {
cluster_id clusterID = 0;
AttributeValuePair attributeValueList[] = 1;
Expand Down Expand Up @@ -2734,14 +2734,6 @@ server cluster WindowCovering = 258 {
kTiltEncoderControlled = 0x40;
}

bitmap Feature : BITMAP32 {
kLift = 0x1;
kTilt = 0x2;
kPositionAwareLift = 0x4;
kAbsolutePosition = 0x8;
kPositionAwareTilt = 0x10;
}

bitmap Mode : BITMAP8 {
kMotorDirectionReversed = 0x1;
kCalibrationMode = 0x2;
Expand Down Expand Up @@ -2770,6 +2762,14 @@ server cluster WindowCovering = 258 {
kProtection = 0x800;
}

bitmap WindowCoveringFeature : BITMAP32 {
kLift = 0x1;
kTilt = 0x2;
kPositionAwareLift = 0x4;
kAbsolutePosition = 0x8;
kPositionAwareTilt = 0x10;
}

readonly attribute Type type = 0;
readonly attribute int16u physicalClosedLimitLift = 1;
readonly attribute int16u physicalClosedLimitTilt = 2;
Expand Down Expand Up @@ -2861,7 +2861,7 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
bitmap PumpConfigurationAndControlFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
Expand Down Expand Up @@ -3487,7 +3487,7 @@ server cluster TemperatureMeasurement = 1026 {
}

server cluster PressureMeasurement = 1027 {
bitmap PressureFeature : BITMAP32 {
bitmap PressureMeasurementFeature : BITMAP32 {
kExtended = 0x1;
}

Expand Down
30 changes: 15 additions & 15 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 @@ -51,7 +51,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -115,14 +115,14 @@ server cluster Groups = 4 {
}

server cluster Scenes = 5 {
bitmap SceneFeatures : BITMAP32 {
kSceneNames = 0x1;
}

bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}

bitmap ScenesFeature : BITMAP32 {
kSceneNames = 0x1;
}

struct ExtensionFieldSet {
cluster_id clusterID = 0;
AttributeValuePair attributeValueList[] = 1;
Expand Down Expand Up @@ -2376,14 +2376,6 @@ server cluster WindowCovering = 258 {
kTiltEncoderControlled = 0x40;
}

bitmap Feature : BITMAP32 {
kLift = 0x1;
kTilt = 0x2;
kPositionAwareLift = 0x4;
kAbsolutePosition = 0x8;
kPositionAwareTilt = 0x10;
}

bitmap Mode : BITMAP8 {
kMotorDirectionReversed = 0x1;
kCalibrationMode = 0x2;
Expand Down Expand Up @@ -2412,6 +2404,14 @@ server cluster WindowCovering = 258 {
kProtection = 0x800;
}

bitmap WindowCoveringFeature : BITMAP32 {
kLift = 0x1;
kTilt = 0x2;
kPositionAwareLift = 0x4;
kAbsolutePosition = 0x8;
kPositionAwareTilt = 0x10;
}

readonly attribute Type type = 0;
readonly attribute ConfigStatus configStatus = 7;
readonly attribute OperationalStatus operationalStatus = 10;
Expand Down Expand Up @@ -2446,7 +2446,7 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
bitmap PumpConfigurationAndControlFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
Expand Down Expand Up @@ -2813,7 +2813,7 @@ server cluster TemperatureMeasurement = 1026 {
}

server cluster PressureMeasurement = 1027 {
bitmap PressureFeature : BITMAP32 {
bitmap PressureMeasurementFeature : BITMAP32 {
kExtended = 0x1;
}

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -47,7 +47,7 @@ server cluster Identify = 3 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -47,7 +47,7 @@ server cluster Identify = 3 {
}

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

Expand Down
4 changes: 2 additions & 2 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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -105,7 +105,7 @@ client cluster Groups = 4 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down
4 changes: 2 additions & 2 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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -105,7 +105,7 @@ client cluster Groups = 4 {
}

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

Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -105,7 +105,7 @@ client cluster Groups = 4 {
}

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

Expand Down
4 changes: 2 additions & 2 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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -105,7 +105,7 @@ client cluster Groups = 4 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down
6 changes: 3 additions & 3 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 @@ -46,7 +46,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -110,7 +110,7 @@ client cluster Groups = 4 {
}

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

Expand Down Expand Up @@ -1171,7 +1171,7 @@ server cluster UserLabel = 65 {
}

server cluster PressureMeasurement = 1027 {
bitmap PressureFeature : BITMAP32 {
bitmap PressureMeasurementFeature : BITMAP32 {
kExtended = 0x1;
}

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down
4 changes: 2 additions & 2 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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down Expand Up @@ -105,7 +105,7 @@ client cluster Groups = 4 {
}

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

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 @@ -41,7 +41,7 @@ server cluster Identify = 3 {
}

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

Expand Down
Loading