From a31b4ef06ee6913bc51c7e900459b1fed9067c70 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 24 Oct 2023 12:50:30 -0400 Subject: [PATCH 1/5] Fix case typo on pumpcc cluster to match spec --- .../data-model/chip/pump-configuration-and-control-cluster.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml index 9d2ef812ac609d..7aa34bc6554b68 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml @@ -121,7 +121,7 @@ limitations under the License. - + From 1fd951ffaad7e834881745be8f4e7b9f7be9e605 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 24 Oct 2023 12:55:31 -0400 Subject: [PATCH 2/5] Zap regen --- .../all-clusters-common/all-clusters-app.matter | 2 +- .../all-clusters-common/all-clusters-minimal-app.matter | 2 +- examples/chef/devices/rootnode_pump_5f904818cc.matter | 2 +- examples/chef/devices/rootnode_pump_a811bb33a0.matter | 2 +- examples/placeholder/linux/apps/app1/config.matter | 2 +- examples/placeholder/linux/apps/app2/config.matter | 2 +- examples/pump-app/pump-common/pump-app.matter | 2 +- examples/pump-app/silabs/data_model/pump-thread-app.matter | 2 +- examples/pump-app/silabs/data_model/pump-wifi-app.matter | 2 +- .../pump-controller-common/pump-controller-app.matter | 2 +- src/controller/data_model/controller-clusters.matter | 2 +- src/controller/python/chip/clusters/Objects.py | 2 +- src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h | 3 +-- .../app-common/app-common/zap-generated/cluster-enums.h | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 8b720e8cdb1d80..07add5998e6e7d 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3453,7 +3453,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index d8edc24a8e391d..c3007a362fc413 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -2654,7 +2654,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index 7d927a4ef4e2b5..3f6ae051117abf 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -915,7 +915,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 3bb9ba1c1018fd..ed8e9dbb011193 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -915,7 +915,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index bc62ad9ebc9c58..273a47c4a247a0 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -4121,7 +4121,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 689f75dbc008c8..3914636b7148e9 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -4080,7 +4080,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 23649a4461e95b..88c4336c767d97 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1215,7 +1215,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index 7a4f9d38022861..1252eee3367cff 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -1215,7 +1215,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index 7a4f9d38022861..1252eee3367cff 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -1215,7 +1215,7 @@ server cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 5f5f3b2cd16d63..ed30dfb881ceef 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -1140,7 +1140,7 @@ client cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 3527172e57b436..7d3f7e0ace4a6d 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -4382,7 +4382,7 @@ client cluster PumpConfigurationAndControl = 512 { bitmap PumpStatusBitmap : bitmap16 { kDeviceFault = 0x1; - kSupplyfault = 0x2; + kSupplyFault = 0x2; kSpeedLow = 0x4; kSpeedHigh = 0x8; kLocalOverride = 0x10; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 98a1a611ca54a5..9ab0e7d90132eb 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -22738,7 +22738,7 @@ class Feature(IntFlag): class PumpStatusBitmap(IntFlag): kDeviceFault = 0x1 - kSupplyfault = 0x2 + kSupplyFault = 0x2 kSpeedLow = 0x4 kSpeedHigh = 0x8 kLocalOverride = 0x10 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 996229a68b65d7..73a6f795d8ce68 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -15091,7 +15091,7 @@ typedef NS_OPTIONS(uint32_t, MTRPumpConfigurationAndControlPumpFeature) { typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) { MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x1, - MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x2, + MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault MTR_PROVISIONALLY_AVAILABLE = 0x2, MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x4, MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x8, MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x10, @@ -15103,7 +15103,6 @@ typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) { typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatus) { MTRPumpConfigurationAndControlPumpStatusDeviceFault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x1, - MTRPumpConfigurationAndControlPumpStatusSupplyfault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x2, MTRPumpConfigurationAndControlPumpStatusSpeedLow MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x4, MTRPumpConfigurationAndControlPumpStatusSpeedHigh MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x8, MTRPumpConfigurationAndControlPumpStatusLocalOverride MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x10, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 4c57da6b554d5f..3d1ce6c5665c52 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -2666,7 +2666,7 @@ enum class Feature : uint32_t enum class PumpStatusBitmap : uint16_t { kDeviceFault = 0x1, - kSupplyfault = 0x2, + kSupplyFault = 0x2, kSpeedLow = 0x4, kSpeedHigh = 0x8, kLocalOverride = 0x10, From e5b6e559f93a9a9c8c63c693b3aa78594abdeeff Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 24 Oct 2023 13:07:27 -0400 Subject: [PATCH 3/5] Minor change to re-kick CI --- .../clusters/PumpConfigurationControl.xml | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/data_model/clusters/PumpConfigurationControl.xml b/data_model/clusters/PumpConfigurationControl.xml index f943afc3c99ae4..59aaca66fcd0c7 100644 --- a/data_model/clusters/PumpConfigurationControl.xml +++ b/data_model/clusters/PumpConfigurationControl.xml @@ -1,59 +1,59 @@ - @@ -439,4 +439,4 @@ Davis, CA 95616, USA - \ No newline at end of file + From d81a5b13aefe15dd889756514c8f0669206e61e4 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 24 Oct 2023 13:08:29 -0400 Subject: [PATCH 4/5] Revert "Minor change to re-kick CI" This reverts commit e5b6e559f93a9a9c8c63c693b3aa78594abdeeff. t push # with '#' will be ignored, and an empty message aborts the commit. --- .../clusters/PumpConfigurationControl.xml | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/data_model/clusters/PumpConfigurationControl.xml b/data_model/clusters/PumpConfigurationControl.xml index 59aaca66fcd0c7..f943afc3c99ae4 100644 --- a/data_model/clusters/PumpConfigurationControl.xml +++ b/data_model/clusters/PumpConfigurationControl.xml @@ -1,59 +1,59 @@ - @@ -439,4 +439,4 @@ Davis, CA 95616, USA - + \ No newline at end of file From 4bd6caa4a8fe0510c411ecfc42fa2e02923b2472 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 24 Oct 2023 14:53:37 -0400 Subject: [PATCH 5/5] Fix Darwin availability annotations and codegen. --- .../Framework/CHIP/templates/MTRBaseClusters.zapt | 7 ++++++- .../Framework/CHIP/templates/availability.yaml | 15 +++++++++++++++ .../CHIP/zap-generated/MTRBaseClusters.h | 6 +++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt index 7cafe765538483..71a37db8356c94 100644 --- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt @@ -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}} diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 563f58e9858ee2..05d280d165687f 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -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 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 73a6f795d8ce68..a4a1bbf8a346da 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -15091,7 +15091,10 @@ typedef NS_OPTIONS(uint32_t, MTRPumpConfigurationAndControlPumpFeature) { typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) { MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x1, - MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault MTR_PROVISIONALLY_AVAILABLE = 0x2, + MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault MTR_NEWLY_AVAILABLE = 0x2, + MTRPumpConfigurationAndControlPumpStatusBitmapSupplyfault MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) + MTR_NEWLY_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault") + = 0x2, MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x4, MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x8, MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride MTR_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5)) = 0x10, @@ -15103,6 +15106,7 @@ typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatusBitmap) { typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatus) { MTRPumpConfigurationAndControlPumpStatusDeviceFault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapDeviceFault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x1, + MTRPumpConfigurationAndControlPumpStatusSupplyfault MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSupplyFault", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x2, MTRPumpConfigurationAndControlPumpStatusSpeedLow MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedLow", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x4, MTRPumpConfigurationAndControlPumpStatusSpeedHigh MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapSpeedHigh", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x8, MTRPumpConfigurationAndControlPumpStatusLocalOverride MTR_DEPRECATED("Please use MTRPumpConfigurationAndControlPumpStatusBitmapLocalOverride", ios(16.1, 16.5), macos(13.0, 13.4), watchos(9.1, 9.5), tvos(16.1, 16.5)) = 0x10,