From 1fa5d264661793e53fd869cec6e6a4c2aea23dd1 Mon Sep 17 00:00:00 2001 From: Nivedita Sarkar Date: Tue, 30 Jul 2024 10:42:26 -0700 Subject: [PATCH] Fixes --- .../thermostat-common/thermostat.matter | 1 + .../thermostat-common/thermostat.zap | 16 ++++++ .../certification/Test_TC_TSTAT_4_2.yaml | 50 +++++++++---------- .../CHIP/zap-generated/MTRBaseClusters.h | 8 +-- .../CHIP/zap-generated/MTRStructsObjc.mm | 4 +- .../zap-generated/cluster-objects.h | 4 +- 6 files changed, 50 insertions(+), 33 deletions(-) diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index e63ebeba6df9ae..6d1aa9f1b1abad 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -2539,6 +2539,7 @@ endpoint 1 { ram attribute absMaxHeatSetpointLimit default = 3000; ram attribute absMinCoolSetpointLimit default = 1600; ram attribute absMaxCoolSetpointLimit default = 3200; + ram attribute localTemperatureCalibration default = 0x00; persist attribute occupiedCoolingSetpoint default = 0x0A28; persist attribute occupiedHeatingSetpoint default = 0x07D0; ram attribute minHeatSetpointLimit default = 700; diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 483b79d7d434f5..e907730ee80696 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -4774,6 +4774,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "LocalTemperatureCalibration", + "code": 16, + "mfgCode": null, + "side": "server", + "type": "int8s", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "OccupiedCoolingSetpoint", "code": 17, diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_4_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_4_2.yaml index 31c84fa5e756e9..2581aefa7c9c95 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_4_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_4_2.yaml @@ -53,8 +53,8 @@ tests: - name: "expectedValue" value: "y" - - label: "Step 3a: Test Harness writes to the Presets attribute after calling the StartPresetsSchedulesEditRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + - label: "Step 3a: Test Harness writes to the Presets attribute after calling the StartPresetsSchedulesEditRequest command" + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -75,7 +75,7 @@ tests: - name: "expectedValue" value: "y" - - label: "Step 3b: Test Harness writes to the Presets attribute adding 3 presets for Sleep, Wake and GoingToSleep" + - label: "Step 3b: Test Harness writes to the Presets attribute adding 3 presets for Sleep, Wake and GoingToSleep" PICS: TSTAT.S.F08 && TSTAT.S.A0050 verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -242,7 +242,7 @@ tests: value: "y" - label: "Step 3d: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -323,7 +323,7 @@ tests: value: "y" - label: "Step 4a: Test Harness writes to the Presets attribute wherein a built-in preset is removed" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -458,7 +458,7 @@ tests: value: "y" - label: "Step 4c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -480,7 +480,7 @@ tests: value: "y" - label: "Step 5a: Test Harness writes to the Presets attribute wherein a preset is removed such that its handle matches the active preset handle" - PICS: TSTAT.S.F08 && TSTAT.C.C06.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C06.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -524,7 +524,7 @@ tests: value: "y" - label: "Step 5c: Test Harness calls StartPresetsSchedulesEditRequest" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -676,7 +676,7 @@ tests: value: "y" - label: "Step 5e: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -698,7 +698,7 @@ tests: value: "y" - label: "Step 6a: Test Harness writes to the Presets attribute wherein a built-in preset is modified to a non built-in preset" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -850,7 +850,7 @@ tests: value: "y" - label: "Step 6c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -872,7 +872,7 @@ tests: value: "y" - label: "Step 7a: Test Harness writes to the Presets attribute wherein a new preset is added with the builtIn flag set to true" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1024,7 +1024,7 @@ tests: value: "y" - label: "Step 7c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1046,7 +1046,7 @@ tests: value: "y" - label: "Step 8a: Test Harness writes to the Presets attribute with a preset having a non-null preset handle that doesn't exist in the Presets attribute" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1198,7 +1198,7 @@ tests: value: "y" - label: "Step 8c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1219,7 +1219,7 @@ tests: value: "y" - label: "Step 9a: Test Harness writes to the Presets attribute wherein there are 2 presets with the same preset handle" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1371,7 +1371,7 @@ tests: value: "y" - label: "Step 9c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1392,7 +1392,7 @@ tests: value: "y" - label: "Step 10a: Test Harness writes to the Presets attribute wherein a built-in preset is modified to be a non built-in preset" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1544,7 +1544,7 @@ tests: value: "y" - label: "Step 10c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1566,7 +1566,7 @@ tests: value: "y" - label: "Step 11a: Test Harness writes to the Presets attribute wherein a non built-in preset is modified to a built-in preset" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1718,7 +1718,7 @@ tests: value: "y" - label: "Step 11c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1740,7 +1740,7 @@ tests: - label: "Step 12a: Test Harness writes to the Presets attribute wherein a preset doesn't support names in the PresetTypeFeatures bitmap but has a name in the write presets command" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1892,7 +1892,7 @@ tests: value: "y" - label: "Step 12c: Test Harness calls the CommitPresetsSchedulesRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C09.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C09.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -1915,7 +1915,7 @@ tests: #TODO: Add tests for the total number of Presets exceeds the NumberOfPresets supported. Also Add tests for adding presets with preset scenario not present in PresetTypes. - label: "Step 13a: Test Harness writes to the Presets attribute but calls CancelPresetsSchedulesEditRequest command to cancel the edit request" - PICS: TSTAT.S.F08 && TSTAT.C.C07.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C07.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. @@ -2068,7 +2068,7 @@ tests: value: "y" - label: "Step 13c: Test Harness calls the CancelPresetsSchedulesEditRequest command" - PICS: TSTAT.S.F08 && TSTAT.C.C08.Tx + PICS: TSTAT.S.F08 && TSTAT.S.C08.Rsp verification: | Optional Attribute - If it is supported, then in TH log it will results in displaying the value, else it will display UNSUPPORTED_ATTRIBUTE. Below is the log of RPI the result may be vary on the basis of dut implementation. diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 88cc90f0b3ed6d..4b5db3c2872b6f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -17137,10 +17137,10 @@ MTR_DEPRECATED("Please use MTRBaseClusterUnitTesting", ios(16.1, 16.4), macos(13 @interface MTRBaseClusterTestCluster : MTRBaseClusterUnitTesting @end -typedef NS_ENUM(uint8_t, MTRDataTypeTestGlobalEnum) { - MTRDataTypeTestGlobalEnumSomeValue MTR_PROVISIONALLY_AVAILABLE = 0x00, - MTRDataTypeTestGlobalEnumSomeOtherValue MTR_PROVISIONALLY_AVAILABLE = 0x01, - MTRDataTypeTestGlobalEnumFinalValue MTR_PROVISIONALLY_AVAILABLE = 0x02, +typedef NS_ENUM(uint8_t, MTRGlobalsTestGlobal) { + MTRGlobalsTestGlobalSomeValue MTR_PROVISIONALLY_AVAILABLE = 0x00, + MTRGlobalsTestGlobalSomeOtherValue MTR_PROVISIONALLY_AVAILABLE = 0x01, + MTRGlobalsTestGlobalFinalValue MTR_PROVISIONALLY_AVAILABLE = 0x02, } MTR_PROVISIONALLY_AVAILABLE; typedef NS_ENUM(uint8_t, MTRIdentifyEffectIdentifier) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 94a6b90dfeac88..477da254447cd3 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN -@implementation MTRDataTypeTestGlobalStruct +@implementation MTRGlobalsClusterTestGlobalStruct - (instancetype)init { if (self = [super init]) { @@ -35,7 +35,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRDataTypeTestGlobalStruct alloc] init]; + auto other = [[MTRGlobalsClusterTestGlobalStruct alloc] init]; other.name = self.name; other.myBitmap = self.myBitmap; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index c802f8620dcae3..490f95e336d7e7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -335,8 +335,8 @@ struct Type { public: chip::CharSpan name; - DataModel::Nullable> myBitmap; - Optional> myEnum; + DataModel::Nullable> myBitmap; + Optional> myEnum; CHIP_ERROR Decode(TLV::TLVReader & reader);