From 24951288bc04f216c3ffd3cc9c045ffda28261e9 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 13 Jan 2023 12:09:54 -0500 Subject: [PATCH] Align naming in Pressure Measurement cluster XML with the spec. (#24390) * Align naming in Pressure Measurement cluster XML with the spec. * Regenerate generated code. --- .../all-clusters-common/all-clusters-app.matter | 2 +- .../all-clusters-common/all-clusters-minimal-app.matter | 2 +- .../devices/rootnode_pressuresensor_s0qC9wLH4k.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 +- .../pump-controller-common/pump-controller-app.matter | 2 +- .../zcl/data-model/chip/pressure-measurement-cluster.xml | 2 +- src/controller/data_model/controller-clusters.matter | 2 +- src/darwin/Framework/CHIP/templates/availability.yaml | 9 +++++++++ .../Framework/CHIP/zap-generated/MTRBaseClusters.h | 5 ++++- .../app-common/app-common/zap-generated/cluster-enums.h | 2 +- .../app-common/app-common/zap-generated/enums.h | 4 ++-- 13 files changed, 25 insertions(+), 13 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 9a7b55d575fbc6..453c4a425aaca8 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 @@ -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; 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 49524b16ef18ab..41265fd93aa923 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 @@ -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; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 0f9d11dfa62f60..1d12e24554afc5 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -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; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 956a3eead3b7d5..257de66ec153f0 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -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; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 0e5ab941009479..74539476259918 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -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; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index ec599d5e71b27e..baa135f952c490 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -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; 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 e864254efb8cf7..263c0c8c257d2f 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 @@ -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; diff --git a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml index e7d4ad0ce95140..1a519353270924 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml @@ -38,6 +38,6 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 8e0857f405e907..a4e66e691a0455 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -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; diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 98255e4af4d09b..c6f10ff992b00a 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5320,6 +5320,9 @@ - WPAPersonal - WPA2Personal - WPA3Personal + PressureMeasurement: + PressureFeature: + - Extended deprecated: clusters: - OtaSoftwareUpdateProvider @@ -5428,6 +5431,9 @@ - WpaPersonal - Wpa2Personal - Wpa3Personal + PressureMeasurement: + PressureFeature: + - EXT apis: - Timed Invoke for server to client commands - Deprecated global attribute names @@ -5603,3 +5609,6 @@ WPAPersonal: WpaPersonal WPA2Personal: Wpa2Personal WPA3Personal: Wpa3Personal + PressureMeasurement: + PressureFeature: + Extended: EXT diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 3d2835298fb782..6122c5cfbb9052 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -18571,7 +18571,10 @@ typedef NS_ENUM(uint8_t, MTRIlluminanceMeasurementLightSensorType) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTRPressureMeasurementPressureFeature) { - MTRPressureMeasurementPressureFeatureEXT API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, + MTRPressureMeasurementPressureFeatureExtended MTR_NEWLY_AVAILABLE = 0x1, + MTRPressureMeasurementPressureFeatureEXT API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRPressureMeasurementPressureFeatureExtended") + = 0x1, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRChannelStatus) { 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 1a05d9196134d5..be72b6ae08bd53 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 @@ -1934,7 +1934,7 @@ namespace PressureMeasurement { // Bitmap for PressureFeature enum class PressureFeature : uint32_t { - kExt = 0x1, + kExtended = 0x1, }; } // namespace PressureMeasurement diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 63b8af9976e1aa..fe568a150e46ce 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -796,8 +796,8 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_POWER_SOURCE_FEATURE_RECHARGEABLE_OFFSET (2) #define EMBER_AF_POWER_SOURCE_FEATURE_REPLACEABLE (8) #define EMBER_AF_POWER_SOURCE_FEATURE_REPLACEABLE_OFFSET (3) -#define EMBER_AF_PRESSURE_FEATURE_EXT (1) -#define EMBER_AF_PRESSURE_FEATURE_EXT_OFFSET (0) +#define EMBER_AF_PRESSURE_FEATURE_EXTENDED (1) +#define EMBER_AF_PRESSURE_FEATURE_EXTENDED_OFFSET (0) #define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1) #define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0) #define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)