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 Pressure Measurement cluster XML with the spec. #24390

Merged
merged 2 commits into from
Jan 13, 2023
Merged

Align naming in Pressure Measurement cluster XML with the spec. #24390

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
9557c5d
Align naming in Pressure Measurement cluster XML with the spec.
bzbarsky-apple Jan 12, 2023
1892008
Regenerate generated code.
bzbarsky-apple Jan 12, 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
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 @@ -3078,7 +3078,7 @@ server cluster TemperatureMeasurement = 1026 {

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

readonly attribute nullable int16s measuredValue = 0;
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 @@ -2476,7 +2476,7 @@ server cluster TemperatureMeasurement = 1026 {

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

readonly attribute nullable int16s measuredValue = 0;
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 @@ -1043,7 +1043,7 @@ server cluster UserLabel = 65 {

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

readonly attribute nullable int16s measuredValue = 0;
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 @@ -2086,7 +2086,7 @@ server cluster TemperatureMeasurement = 1026 {

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

readonly attribute nullable int16s measuredValue = 0;
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 @@ -2063,7 +2063,7 @@ server cluster TemperatureMeasurement = 1026 {

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

readonly attribute nullable int16s measuredValue = 0;
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 @@ -1212,7 +1212,7 @@ server cluster TemperatureMeasurement = 1026 {

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

readonly attribute nullable int16s measuredValue = 0;
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 @@ -1086,7 +1086,7 @@ client cluster TemperatureMeasurement = 1026 {

client cluster PressureMeasurement = 1027 {
bitmap PressureFeature : BITMAP32 {
kExt = 0x1;
kExtended = 0x1;
}

readonly attribute nullable int16s measuredValue = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ limitations under the License.

<bitmap name="PressureFeature" type="BITMAP32">
<cluster code="0x0403"/>
<field name="EXT" mask="0x1"/>
<field name="Extended" mask="0x1"/>
</bitmap>
</configurator>
2 changes: 1 addition & 1 deletion src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3434,7 +3434,7 @@ client cluster TemperatureMeasurement = 1026 {

client cluster PressureMeasurement = 1027 {
bitmap PressureFeature : BITMAP32 {
kExt = 0x1;
kExtended = 0x1;
}

readonly attribute nullable int16s measuredValue = 0;
Expand Down
9 changes: 9 additions & 0 deletions src/darwin/Framework/CHIP/templates/availability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5320,6 +5320,9 @@
- WPAPersonal
- WPA2Personal
- WPA3Personal
PressureMeasurement:
PressureFeature:
- Extended
deprecated:
clusters:
- OtaSoftwareUpdateProvider
Expand Down Expand Up @@ -5428,6 +5431,9 @@
- WpaPersonal
- Wpa2Personal
- Wpa3Personal
PressureMeasurement:
PressureFeature:
- EXT
apis:
- Timed Invoke for server to client commands
- Deprecated global attribute names
Expand Down Expand Up @@ -5603,3 +5609,6 @@
WPAPersonal: WpaPersonal
WPA2Personal: Wpa2Personal
WPA3Personal: Wpa3Personal
PressureMeasurement:
PressureFeature:
Extended: EXT
5 changes: 4 additions & 1 deletion 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.

2 changes: 1 addition & 1 deletion 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.

4 changes: 2 additions & 2 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.