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 33a29558443f42..ac95afe0595b65 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 @@ -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 index 8c4e2c94f0f206..a239c45ce43f41 100644 --- 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 index 84c4410dbee398..854b69c531cd34 100644 --- 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 index 88e113b1845488..f3c47b24cc69d5 100644 --- 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 index 2b4efbf5b459aa..c9dc45bd2e6b24 100644 --- 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 index a022b6a9475012..9dcab099c7a369 100644 --- 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 index 5a86bf09654f7a..546b993a2e44c2 100644 --- 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 index 34e5856a092bc2..cc5b1913d1a60a 100644 --- 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 index 306df0864ddcfa..3cca83f208f9dd 100644 --- 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 index ec39982a78a0e5..3e3f8869165230 100644 --- 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 index d249a0ff8e5fe6..3cad341871df97 100644 --- 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 diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml index 8b494f02ef7bb4..8c367aee7c1ac8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml @@ -33,9 +33,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -57,9 +57,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -82,9 +82,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -107,9 +107,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -132,9 +132,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -157,9 +157,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -182,9 +182,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -207,9 +207,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -232,9 +232,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -257,9 +257,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -282,9 +282,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -307,9 +307,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -332,9 +332,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -357,9 +357,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -382,9 +382,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -407,9 +407,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -432,9 +432,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -457,9 +457,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -482,9 +482,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -507,9 +507,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -532,9 +532,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -557,9 +557,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -582,9 +582,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -607,9 +607,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -632,9 +632,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -657,9 +657,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -682,9 +682,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -707,9 +707,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -732,9 +732,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -757,9 +757,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -782,9 +782,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -807,9 +807,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -832,9 +832,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -857,9 +857,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -882,9 +882,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -907,9 +907,9 @@ limitations under the License. MinMeasuredValue MaxMeasuredValue PeakMeasuredValue - PeakMeasuredValueWindow + PeakMeasuredValueWindow AverageMeasuredValue - AverageMeasuredValueWindow + AverageMeasuredValueWindow Uncertainty MeasurementUnit MeasurementMedium @@ -1091,8 +1091,8 @@ limitations under the License. - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 463247067b2757..011cc3175ff5a7 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -5484,8 +5484,8 @@ client cluster CarbonMonoxideConcentrationMeasurement = 1036 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5539,8 +5539,8 @@ client cluster CarbonDioxideConcentrationMeasurement = 1037 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5594,8 +5594,8 @@ client cluster EthyleneConcentrationMeasurement = 1038 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5649,8 +5649,8 @@ client cluster EthyleneOxideConcentrationMeasurement = 1039 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5704,8 +5704,8 @@ client cluster HydrogenConcentrationMeasurement = 1040 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5759,8 +5759,8 @@ client cluster HydrogenSulfideConcentrationMeasurement = 1041 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5814,8 +5814,8 @@ client cluster NitricOxideConcentrationMeasurement = 1042 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5869,8 +5869,8 @@ client cluster NitrogenDioxideConcentrationMeasurement = 1043 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5924,8 +5924,8 @@ client cluster OxygenConcentrationMeasurement = 1044 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -5979,8 +5979,8 @@ client cluster OzoneConcentrationMeasurement = 1045 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6034,8 +6034,8 @@ client cluster SulfurDioxideConcentrationMeasurement = 1046 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6089,8 +6089,8 @@ client cluster DissolvedOxygenConcentrationMeasurement = 1047 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6144,8 +6144,8 @@ client cluster BromateConcentrationMeasurement = 1048 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6199,8 +6199,8 @@ client cluster ChloraminesConcentrationMeasurement = 1049 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6254,8 +6254,8 @@ client cluster ChlorineConcentrationMeasurement = 1050 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6309,8 +6309,8 @@ client cluster FecalColiformEColiConcentrationMeasurement = 1051 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6364,8 +6364,8 @@ client cluster FluorideConcentrationMeasurement = 1052 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6419,8 +6419,8 @@ client cluster HaloaceticAcidsConcentrationMeasurement = 1053 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6474,8 +6474,8 @@ client cluster TotalTrihalomethanesConcentrationMeasurement = 1054 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6529,8 +6529,8 @@ client cluster TotalColiformBacteriaConcentrationMeasurement = 1055 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6584,8 +6584,8 @@ client cluster TurbidityConcentrationMeasurement = 1056 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6639,8 +6639,8 @@ client cluster CopperConcentrationMeasurement = 1057 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6694,8 +6694,8 @@ client cluster LeadConcentrationMeasurement = 1058 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6749,8 +6749,8 @@ client cluster ManganeseConcentrationMeasurement = 1059 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6804,8 +6804,8 @@ client cluster SulfateConcentrationMeasurement = 1060 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6859,8 +6859,8 @@ client cluster BromodichloromethaneConcentrationMeasurement = 1061 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6914,8 +6914,8 @@ client cluster BromoformConcentrationMeasurement = 1062 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -6969,8 +6969,8 @@ client cluster ChlorodibromomethaneConcentrationMeasurement = 1063 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7024,8 +7024,8 @@ client cluster ChloroformConcentrationMeasurement = 1064 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7079,8 +7079,8 @@ client cluster SodiumConcentrationMeasurement = 1065 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7134,8 +7134,8 @@ client cluster Pm25ConcentrationMeasurement = 1066 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7189,8 +7189,8 @@ client cluster FormaldehydeConcentrationMeasurement = 1067 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7244,8 +7244,8 @@ client cluster Pm1ConcentrationMeasurement = 1068 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7299,8 +7299,8 @@ client cluster Pm10ConcentrationMeasurement = 1069 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7354,8 +7354,8 @@ client cluster TotalVolatileOrganicCompoundsConcentrationMeasurement = 1070 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } @@ -7409,8 +7409,8 @@ client cluster RadonConcentrationMeasurement = 1071 { } enum MeasurementMediumEnum : ENUM8 { - kGas = 0; - kLiquid = 1; + kAir = 0; + kWater = 1; kSoil = 2; } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index d0572a7909deec..9ff87878e50750 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -30832,8 +30832,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -31198,8 +31198,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -31564,8 +31564,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -31930,8 +31930,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -32296,8 +32296,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -32662,8 +32662,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -33028,8 +33028,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -33394,8 +33394,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -33760,8 +33760,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -34126,8 +34126,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -34492,8 +34492,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -34858,8 +34858,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -35224,8 +35224,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -35590,8 +35590,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -35956,8 +35956,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -36322,8 +36322,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -36688,8 +36688,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -37054,8 +37054,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -37420,8 +37420,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -37786,8 +37786,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -38152,8 +38152,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -38518,8 +38518,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -38884,8 +38884,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -39250,8 +39250,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -39616,8 +39616,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -39982,8 +39982,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -40348,8 +40348,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -40714,8 +40714,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -41080,8 +41080,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -41446,8 +41446,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -41812,8 +41812,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -42178,8 +42178,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -42544,8 +42544,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -42910,8 +42910,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -43276,8 +43276,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only @@ -43642,8 +43642,8 @@ class LevelValueEnum(MatterIntEnum): kUnknownEnumValue = 5, class MeasurementMediumEnum(MatterIntEnum): - kGas = 0x00 - kLiquid = 0x01 + kAir = 0x00 + kWater = 0x01 kSoil = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 00e1106f583134..d614d2f4c0c8c9 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -7820,8 +7820,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil CarbonMonoxideConcentrationMeasurement: LevelValueEnum: @@ -7840,8 +7840,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil FormaldehydeConcentrationMeasurement: LevelValueEnum: @@ -7860,8 +7860,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil NitrogenDioxideConcentrationMeasurement: LevelValueEnum: @@ -7880,8 +7880,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil OzoneConcentrationMeasurement: LevelValueEnum: @@ -7900,8 +7900,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil PM10ConcentrationMeasurement: LevelValueEnum: @@ -7920,8 +7920,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil PM1ConcentrationMeasurement: LevelValueEnum: @@ -7940,8 +7940,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil PM25ConcentrationMeasurement: LevelValueEnum: @@ -7960,8 +7960,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil RadonConcentrationMeasurement: LevelValueEnum: @@ -7980,8 +7980,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil TotalVolatileOrganicCompoundsConcentrationMeasurement: LevelValueEnum: @@ -8000,8 +8000,8 @@ - PM3 - BQM3 MeasurementMediumEnum: - - Gas - - Liquid + - Air + - Water - Soil DoorLock: DlLockState: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 57defcafb7613f..9bfee6cc121258 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -25698,8 +25698,8 @@ typedef NS_ENUM(uint8_t, MTRCarbonMonoxideConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRCarbonMonoxideConcentrationMeasurementMeasurementMedium) { - MTRCarbonMonoxideConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRCarbonMonoxideConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRCarbonMonoxideConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRCarbonMonoxideConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRCarbonMonoxideConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25732,8 +25732,8 @@ typedef NS_ENUM(uint8_t, MTRCarbonDioxideConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRCarbonDioxideConcentrationMeasurementMeasurementMedium) { - MTRCarbonDioxideConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRCarbonDioxideConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRCarbonDioxideConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRCarbonDioxideConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRCarbonDioxideConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25766,8 +25766,8 @@ typedef NS_ENUM(uint8_t, MTRNitrogenDioxideConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRNitrogenDioxideConcentrationMeasurementMeasurementMedium) { - MTRNitrogenDioxideConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRNitrogenDioxideConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRNitrogenDioxideConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRNitrogenDioxideConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRNitrogenDioxideConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25800,8 +25800,8 @@ typedef NS_ENUM(uint8_t, MTROzoneConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTROzoneConcentrationMeasurementMeasurementMedium) { - MTROzoneConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTROzoneConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTROzoneConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTROzoneConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTROzoneConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25834,8 +25834,8 @@ typedef NS_ENUM(uint8_t, MTRPM25ConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRPM25ConcentrationMeasurementMeasurementMedium) { - MTRPM25ConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRPM25ConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRPM25ConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRPM25ConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRPM25ConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25868,8 +25868,8 @@ typedef NS_ENUM(uint8_t, MTRFormaldehydeConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRFormaldehydeConcentrationMeasurementMeasurementMedium) { - MTRFormaldehydeConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRFormaldehydeConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRFormaldehydeConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRFormaldehydeConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRFormaldehydeConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25902,8 +25902,8 @@ typedef NS_ENUM(uint8_t, MTRPM1ConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRPM1ConcentrationMeasurementMeasurementMedium) { - MTRPM1ConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRPM1ConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRPM1ConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRPM1ConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRPM1ConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25936,8 +25936,8 @@ typedef NS_ENUM(uint8_t, MTRPM10ConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRPM10ConcentrationMeasurementMeasurementMedium) { - MTRPM10ConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRPM10ConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRPM10ConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRPM10ConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRPM10ConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -25970,8 +25970,8 @@ typedef NS_ENUM(uint8_t, MTRTotalVolatileOrganicCompoundsConcentrationMeasuremen } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRTotalVolatileOrganicCompoundsConcentrationMeasurementMeasurementMedium) { - MTRTotalVolatileOrganicCompoundsConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRTotalVolatileOrganicCompoundsConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRTotalVolatileOrganicCompoundsConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRTotalVolatileOrganicCompoundsConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRTotalVolatileOrganicCompoundsConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; @@ -26004,8 +26004,8 @@ typedef NS_ENUM(uint8_t, MTRRadonConcentrationMeasurementLevelValue) { } MTR_NEWLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRRadonConcentrationMeasurementMeasurementMedium) { - MTRRadonConcentrationMeasurementMeasurementMediumGas MTR_NEWLY_AVAILABLE = 0x00, - MTRRadonConcentrationMeasurementMeasurementMediumLiquid MTR_NEWLY_AVAILABLE = 0x01, + MTRRadonConcentrationMeasurementMeasurementMediumAir MTR_NEWLY_AVAILABLE = 0x00, + MTRRadonConcentrationMeasurementMeasurementMediumWater MTR_NEWLY_AVAILABLE = 0x01, MTRRadonConcentrationMeasurementMeasurementMediumSoil MTR_NEWLY_AVAILABLE = 0x02, } MTR_NEWLY_AVAILABLE; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 659703c03bb43c..9a93a523da85a5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -2527,8 +2527,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(CarbonMonoxideConcentra using EnumType = CarbonMonoxideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2574,8 +2574,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(CarbonDioxideConcentrat using EnumType = CarbonDioxideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2621,8 +2621,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(EthyleneConcentrationMe using EnumType = EthyleneConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2668,8 +2668,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(EthyleneOxideConcentrat using EnumType = EthyleneOxideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2715,8 +2715,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(HydrogenConcentrationMe using EnumType = HydrogenConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2762,8 +2762,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(HydrogenSulfideConcentr using EnumType = HydrogenSulfideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2809,8 +2809,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(NitricOxideConcentratio using EnumType = NitricOxideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2856,8 +2856,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(NitrogenDioxideConcentr using EnumType = NitrogenDioxideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2903,8 +2903,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OxygenConcentrationMeas using EnumType = OxygenConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2950,8 +2950,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OzoneConcentrationMeasu using EnumType = OzoneConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -2997,8 +2997,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(SulfurDioxideConcentrat using EnumType = SulfurDioxideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3044,8 +3044,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DissolvedOxygenConcentr using EnumType = DissolvedOxygenConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3091,8 +3091,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(BromateConcentrationMea using EnumType = BromateConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3138,8 +3138,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ChloraminesConcentratio using EnumType = ChloraminesConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3185,8 +3185,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ChlorineConcentrationMe using EnumType = ChlorineConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3232,8 +3232,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(FecalColiformEColiConce using EnumType = FecalColiformEColiConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3279,8 +3279,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(FluorideConcentrationMe using EnumType = FluorideConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3326,8 +3326,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(HaloaceticAcidsConcentr using EnumType = HaloaceticAcidsConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3373,8 +3373,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(TotalTrihalomethanesCon using EnumType = TotalTrihalomethanesConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3420,8 +3420,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(TotalColiformBacteriaCo using EnumType = TotalColiformBacteriaConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3467,8 +3467,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(TurbidityConcentrationM using EnumType = TurbidityConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3514,8 +3514,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(CopperConcentrationMeas using EnumType = CopperConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3561,8 +3561,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(LeadConcentrationMeasur using EnumType = LeadConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3608,8 +3608,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ManganeseConcentrationM using EnumType = ManganeseConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3655,8 +3655,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(SulfateConcentrationMea using EnumType = SulfateConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3702,8 +3702,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(BromodichloromethaneCon using EnumType = BromodichloromethaneConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3749,8 +3749,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(BromoformConcentrationM using EnumType = BromoformConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3796,8 +3796,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ChlorodibromomethaneCon using EnumType = ChlorodibromomethaneConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3843,8 +3843,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(ChloroformConcentration using EnumType = ChloroformConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3890,8 +3890,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(SodiumConcentrationMeas using EnumType = SodiumConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3937,8 +3937,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Pm25ConcentrationMeasur using EnumType = Pm25ConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -3984,8 +3984,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(FormaldehydeConcentrati using EnumType = FormaldehydeConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -4031,8 +4031,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Pm1ConcentrationMeasure using EnumType = Pm1ConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -4078,8 +4078,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Pm10ConcentrationMeasur using EnumType = Pm10ConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -4126,8 +4126,8 @@ EnsureKnownEnumValue(TotalVolatileOrganicCompoundsConcentrationMeasurement::Meas using EnumType = TotalVolatileOrganicCompoundsConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: @@ -4174,8 +4174,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RadonConcentrationMeasu using EnumType = RadonConcentrationMeasurement::MeasurementMediumEnum; switch (val) { - case EnumType::kGas: - case EnumType::kLiquid: + case EnumType::kAir: + case EnumType::kWater: case EnumType::kSoil: return val; default: 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 2d8b075fab06d6..ef5f3ec2a8e717 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 @@ -3370,9 +3370,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3430,9 +3430,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3490,9 +3490,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3550,9 +3550,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3610,9 +3610,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3670,9 +3670,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3730,9 +3730,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3790,9 +3790,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3850,9 +3850,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3910,9 +3910,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -3970,9 +3970,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4030,9 +4030,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4090,9 +4090,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4150,9 +4150,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4210,9 +4210,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4270,9 +4270,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4330,9 +4330,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4390,9 +4390,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4450,9 +4450,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4510,9 +4510,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4570,9 +4570,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4630,9 +4630,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4690,9 +4690,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4750,9 +4750,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4810,9 +4810,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4870,9 +4870,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4930,9 +4930,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -4990,9 +4990,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5050,9 +5050,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5110,9 +5110,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5170,9 +5170,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5230,9 +5230,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5290,9 +5290,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5350,9 +5350,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5410,9 +5410,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -5470,9 +5470,9 @@ enum class LevelValueEnum : uint8_t // Enum for MeasurementMediumEnum enum class MeasurementMediumEnum : uint8_t { - kGas = 0x00, - kLiquid = 0x01, - kSoil = 0x02, + kAir = 0x00, + kWater = 0x01, + kSoil = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 4706338ee85e5c..e740cfc7979371 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -23995,7 +23995,7 @@ class Test_TC_CDOCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -24015,7 +24015,7 @@ class Test_TC_CDOCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -24748,7 +24748,7 @@ class Test_TC_CMOCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -24768,7 +24768,7 @@ class Test_TC_CMOCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -25503,7 +25503,7 @@ class Test_TC_FLDCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -25523,7 +25523,7 @@ class Test_TC_FLDCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -26255,7 +26255,7 @@ class Test_TC_NDOCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -26275,7 +26275,7 @@ class Test_TC_NDOCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -27007,7 +27007,7 @@ class Test_TC_OZCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -27027,7 +27027,7 @@ class Test_TC_OZCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -27754,7 +27754,7 @@ class Test_TC_PMHCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -27774,7 +27774,7 @@ class Test_TC_PMHCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -28500,7 +28500,7 @@ class Test_TC_PMICONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -28520,7 +28520,7 @@ class Test_TC_PMICONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -29247,7 +29247,7 @@ class Test_TC_PMKCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -29267,7 +29267,7 @@ class Test_TC_PMKCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -29992,7 +29992,7 @@ class Test_TC_RNCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -30012,7 +30012,7 @@ class Test_TC_RNCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: @@ -30766,7 +30766,7 @@ class Test_TC_TVOCCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 6: @@ -30786,7 +30786,7 @@ class Test_TC_TVOCCONC_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 604800UL)); } break; case 8: diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 2b7c8d345c9052..4ddc2e17fccfc2 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -28802,7 +28802,7 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -28853,7 +28853,7 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -30307,7 +30307,7 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -30358,7 +30358,7 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -31812,7 +31812,7 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -31863,7 +31863,7 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -33317,7 +33317,7 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -33368,7 +33368,7 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -34820,7 +34820,7 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -34871,7 +34871,7 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -36325,7 +36325,7 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -36376,7 +36376,7 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -37830,7 +37830,7 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -37881,7 +37881,7 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -39335,7 +39335,7 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -39386,7 +39386,7 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -40838,7 +40838,7 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -40889,7 +40889,7 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -42377,7 +42377,7 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("peakMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }]; @@ -42430,7 +42430,7 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("averageMeasuredValueWindow", "elapsed_s", "elapsed_s")); VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValueWindow", [value unsignedIntValue], 0UL)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 259200UL)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValueWindow", [value unsignedIntValue], 604800UL)); NextTest(); }];