Making changes to MeasurementMedium enum types in line with spec chan…

…ges and making changes to the time windows in line with spec changes (project-chip#27576)
vivien-apple · Jul 3, 2023 · b3002c6 · b3002c6
1 parent 35b60f6
commit b3002c6
Show file tree

Hide file tree

Showing 20 changed files with 518 additions and 518 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
@@ -4224,8 +4224,8 @@ server cluster CarbonMonoxideConcentrationMeasurement = 1036 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4279,8 +4279,8 @@ server cluster CarbonDioxideConcentrationMeasurement = 1037 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4334,8 +4334,8 @@ server cluster NitrogenDioxideConcentrationMeasurement = 1043 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4389,8 +4389,8 @@ server cluster OzoneConcentrationMeasurement = 1045 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4444,8 +4444,8 @@ server cluster Pm25ConcentrationMeasurement = 1066 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4499,8 +4499,8 @@ server cluster FormaldehydeConcentrationMeasurement = 1067 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4554,8 +4554,8 @@ server cluster Pm1ConcentrationMeasurement = 1068 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4609,8 +4609,8 @@ server cluster Pm10ConcentrationMeasurement = 1069 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4664,8 +4664,8 @@ server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 
@@ -4719,8 +4719,8 @@ server cluster RadonConcentrationMeasurement = 1071 {
   }
 
   enum MeasurementMediumEnum : ENUM8 {
-    kGas = 0;
-    kLiquid = 1;
+    kAir = 0;
+    kWater = 1;
     kSoil = 2;
   }
 

diff --git a/src/app/tests/suites/certification/Test_TC_CDOCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CDOCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: CDOCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: CDOCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_CMOCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CMOCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: CMOCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: CMOCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_FLDCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLDCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: FLDCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: FLDCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_NDOCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_NDOCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: NDOCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: NDOCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_OZCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OZCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: OZCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: OZCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_PMHCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PMHCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: PMHCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: PMHCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_PMICONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PMICONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: PMICONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: PMICONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_PMKCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PMKCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: PMKCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: PMKCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_RNCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RNCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: RNCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: RNCONC.S.A0008

diff --git a/src/app/tests/suites/certification/Test_TC_TVOCCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TVOCCONC_2_1.yaml
@@ -79,7 +79,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the AverageMeasuredValue attribute."
       PICS: TVOCCONC.S.A0005
@@ -99,7 +99,7 @@ tests:
           constraints:
               type: elapsed_s
               minValue: 0
-              maxValue: 259200
+              maxValue: 604800
 
     - label: "TH reads from the DUT the MeasurementUnit attribute."
       PICS: TVOCCONC.S.A0008