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

* Align naming in Pressure Measurement cluster XML with the spec. * Regenerate generated code.
project-chip · Sep 6, 2023 · 2495128 · 2495128
1 parent 55fa0cf
commit 2495128
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
diff --git 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
@@ -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
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
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h