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

Move Pump Configuration and Control to match spec #29955

Merged
merged 5 commits into from
Oct 25, 2023
Merged

Move Pump Configuration and Control to match spec #29955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a31b4ef
Fix case typo on pumpcc cluster to match spec
andreilitvin Oct 24, 2023
1fd951f
Zap regen
andreilitvin Oct 24, 2023
e5b6e55
Minor change to re-kick CI
andreilitvin Oct 24, 2023
d81a5b1
Revert "Minor change to re-kick CI"
andreilitvin Oct 24, 2023
4bd6caa
Fix Darwin availability annotations and codegen.
bzbarsky-apple Oct 24, 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 @@ -3453,7 +3453,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
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 @@ -2654,7 +2654,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_pump_5f904818cc.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_pump_a811bb33a0.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
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 @@ -4121,7 +4121,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
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 @@ -4080,7 +4080,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
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 @@ -1215,7 +1215,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/silabs/data_model/pump-thread-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/silabs/data_model/pump-wifi-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ server cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
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 @@ -1140,7 +1140,7 @@ client cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ limitations under the License.
<bitmap name="PumpStatusBitmap" type="bitmap16">
<cluster code="0x0200"/>
<field name="DeviceFault" mask="0x1"/>
<field name="Supplyfault" mask="0x2"/>
<field name="SupplyFault" mask="0x2"/>
<field name="SpeedLow" mask="0x4"/>
<field name="SpeedHigh" mask="0x8"/>
<field name="LocalOverride" mask="0x10"/>
Expand Down
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 @@ -4382,7 +4382,7 @@ client cluster PumpConfigurationAndControl = 512 {

bitmap PumpStatusBitmap : bitmap16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
kSupplyFault = 0x2;
kSpeedLow = 0x4;
kSpeedHigh = 0x8;
kLocalOverride = 0x10;
Expand Down
2 changes: 1 addition & 1 deletion src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

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

7 changes: 6 additions & 1 deletion src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,12 @@ typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitm
{{/if}}
{{/if}}
{{/inline}}
{{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
{{! The cluster or the bitmap or the value could have been renamed, so this is a bit of a pain... Just cover the cases that matter to us for now }}
{{#if (hasOldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
{{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
{{else if (hasOldName (asUpperCamelCase ../../name preserveAcronyms=true) bitmap=(asUpperCamelCase ../name preserveAcronyms=true) bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
{{> oldNameItemDecl oldItemName=(oldName (asUpperCamelCase ../../name preserveAcronyms=true) bitmap=(asUpperCamelCase ../name preserveAcronyms=true) bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
{{/if}}
{{/zcl_bitmap_items}}
}
{{/inline}}
Expand Down
15 changes: 15 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 @@ -7728,3 +7728,18 @@

- release: "Future"
versions: "future"
introduced:
bitmap values:
PumpConfigurationAndControl:
PumpStatusBitmap:
- SupplyFault
deprecated:
bitmap values:
PumpConfigurationAndControl:
PumpStatusBitmap:
- Supplyfault
renames:
bitmap values:
PumpConfigurationAndControl:
PumpStatusBitmap:
SupplyFault: Supplyfault
7 changes: 5 additions & 2 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.

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.

Loading