Skip to content

Commit a765851

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/easy-review-pr
2 parents b79e144 + 304df86 commit a765851

File tree

11 files changed

+36
-28
lines changed

11 files changed

+36
-28
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -9071,7 +9071,7 @@ endpoint 1 {
90719071
callback attribute eventList;
90729072
callback attribute attributeList;
90739073
ram attribute featureMap default = 0x0123;
9074-
ram attribute clusterRevision default = 6;
9074+
ram attribute clusterRevision default = 7;
90759075

90769076
handle command SetpointRaiseLower;
90779077
handle command SetActiveScheduleRequest;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -16918,7 +16918,7 @@
1691816918
"storageOption": "RAM",
1691916919
"singleton": 0,
1692016920
"bounded": 0,
16921-
"defaultValue": "6",
16921+
"defaultValue": "7",
1692216922
"reportable": 1,
1692316923
"minInterval": 0,
1692416924
"maxInterval": 65344,

‎examples/thermostat/thermostat-common/thermostat.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2801,7 +2801,7 @@ endpoint 1 {
28012801
callback attribute acceptedCommandList;
28022802
callback attribute attributeList;
28032803
ram attribute featureMap default = 0x123;
2804-
ram attribute clusterRevision default = 6;
2804+
ram attribute clusterRevision default = 7;
28052805

28062806
handle command SetpointRaiseLower;
28072807
handle command SetActiveScheduleRequest;

‎examples/thermostat/thermostat-common/thermostat.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5088,7 +5088,7 @@
50885088
"storageOption": "RAM",
50895089
"singleton": 0,
50905090
"bounded": 0,
5091-
"defaultValue": "6",
5091+
"defaultValue": "7",
50925092
"reportable": 1,
50935093
"minInterval": 0,
50945094
"maxInterval": 65344,

‎src/app/clusters/commissioner-control-server/commissioner-control-server.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,15 @@ bool emberAfCommissionerControlClusterCommissionNodeCallback(
236236
// Set IP address and port in the CommissionNodeInfo struct
237237
commissionNodeInfo->port = commandData.port;
238238
err = commissionNodeInfo->ipAddress.SetIPAddress(commandData.ipAddress);
239-
SuccessOrExit(err == CHIP_NO_ERROR);
239+
SuccessOrExit(err);
240240

241241
// Validate the commission node command.
242242
err = delegate->ValidateCommissionNodeCommand(sourceNodeId, requestId);
243-
SuccessOrExit(err == CHIP_NO_ERROR);
243+
SuccessOrExit(err);
244244

245245
// Populate the parameters for the commissioning window
246246
err = delegate->GetCommissioningWindowParams(commissionNodeInfo->params);
247-
SuccessOrExit(err == CHIP_NO_ERROR);
247+
SuccessOrExit(err);
248248

249249
// Add the response for the commissioning window.
250250
AddReverseOpenCommissioningWindowResponse(commandObj, commandPath, commissionNodeInfo->params);

‎src/app/tests/suites/certification/PICS.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -6525,7 +6525,7 @@ PICS:
65256525
- label:
65266526
"Does the device implement receiving the AtomicRequest command for
65276527
Thermostat?"
6528-
id: TSTAT.S.CFE.Rsp
6528+
id: TSTAT.S.Cfe.Rsp
65296529

65306530
#
65316531
# server / commandsGenerated
@@ -6567,6 +6567,9 @@ PICS:
65676567
- label: "Supports a local temperature not exposed"
65686568
id: TSTAT.S.F06
65696569

6570+
- label: "Supports enhanced schedules"
6571+
id: TSTAT.S.F07
6572+
65706573
- label: "Supports setpoint presets"
65716574
id: TSTAT.S.F08
65726575

@@ -6616,7 +6619,7 @@ PICS:
66166619
id: TSTAT.C.C06.Tx
66176620

66186621
- label: "Does the device implement sending the AtomicRequest command?"
6619-
id: TSTAT.C.CFE.Tx
6622+
id: TSTAT.C.Cfe.Tx
66206623

66216624
#
66226625
# client / manually

‎src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tests:
3737
command: "readAttribute"
3838
attribute: "ClusterRevision"
3939
response:
40-
value: 6
40+
value: 7
4141
constraints:
4242
type: int16u
4343

‎src/app/tests/suites/certification/Test_TC_TSTAT_4_1.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,39 +70,39 @@ tests:
7070
saveAs: SchedulesValue
7171

7272
- label: "Step 2: TH reads the PresetTypes attribute from the DUT"
73-
PICS: TSTAT.S.F08 & TSTAT.S.A0048
73+
PICS: TSTAT.S.F08 && TSTAT.S.A0048
7474
command: "readAttribute"
7575
attribute: "PresetTypes"
7676
response:
7777
constraints:
7878
type: list
7979

8080
- label: "Step 3: TH reads the NumberOfPresets attribute from the DUT"
81-
PICS: TSTAT.S.F08 & TSTAT.S.A004a
81+
PICS: TSTAT.S.F08 && TSTAT.S.A004a
8282
command: "readAttribute"
8383
attribute: "NumberOfPresets"
8484
response:
8585
constraints:
8686
type: int8u
8787

8888
- label: "Step 4: TH reads the ActivePresetHandle attribute from the DUT"
89-
PICS: TSTAT.S.F08 & TSTAT.S.A004e
89+
PICS: TSTAT.S.F08 && TSTAT.S.A004e
9090
command: "readAttribute"
9191
attribute: "ActivePresetHandle"
9292
response:
9393
constraints:
9494
type: octstr
9595

9696
- label: "Step 5: TH reads the Presets attribute from the DUT"
97-
PICS: TSTAT.S.F08 & TSTAT.S.A0050
97+
PICS: TSTAT.S.F08 && TSTAT.S.A0050
9898
command: "readAttribute"
9999
attribute: "Presets"
100100
response:
101101
constraints:
102102
type: list
103103

104104
- label: "Step 6: TH reads the Schedules attribute from the DUT"
105-
PICS: TSTAT.S.F07 & TSTAT.S.A0051
105+
PICS: TSTAT.S.F07 && TSTAT.S.A0051
106106
command: "readAttribute"
107107
attribute: "Schedules"
108108
response:

‎src/app/tests/suites/certification/ci-pics-values

+4-3
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,7 @@ TSTAT.S.F03=0
19311931
TSTAT.S.F04=0
19321932
TSTAT.S.F05=1
19331933
TSTAT.S.F06=0
1934+
TSTAT.S.F07=0
19341935
TSTAT.S.F08=1
19351936

19361937
TSTAT.S.A0000=1
@@ -1987,7 +1988,7 @@ TSTAT.S.A0048=1
19871988
TSTAT.S.A004a=1
19881989
TSTAT.S.A004e=1
19891990
TSTAT.S.A0050=1
1990-
TSTAT.S.A0051=1
1991+
TSTAT.S.A0051=0
19911992

19921993
TSTAT.S.M.MinSetpointDeadBandWritable=1
19931994
TSTAT.S.M.HVACSystemTypeConfigurationWritable=0
@@ -1999,7 +2000,7 @@ TSTAT.S.C02.Rsp=0
19992000
TSTAT.S.C03.Rsp=0
20002001
TSTAT.S.C04.Rsp=0
20012002
TSTAT.S.C06.Rsp=1
2002-
TSTAT.S.CFE.Rsp=1
2003+
TSTAT.S.Cfe.Rsp=1
20032004
TSTAT.S.CFD.Tx=1
20042005

20052006
# Client
@@ -2016,7 +2017,7 @@ TSTAT.C.C03.Tx=0
20162017
TSTAT.S.C00.Tx=0
20172018
TSTAT.S.C01.Tx=0
20182019
TSTAT.C.C06.Tx=1
2019-
TSTAT.C.CFE.Tx=1
2020+
TSTAT.C.Cfe.Tx=1
20202021

20212022
# Client Commands
20222023
TSTAT.C.C00.Tx=1

‎src/platform/BUILD.gn

+3
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,9 @@ if (chip_device_platform != "none") {
611611
group("platform") {
612612
public_deps = [ ":platform_buildconfig" ]
613613
}
614+
615+
source_set("platform_base") {
616+
}
614617
}
615618

616619
source_set("syscalls_stub") {

‎src/python_testing/TC_TSTAT_4_2.py

+11-10
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ async def test_TC_TSTAT_4_2(self):
219219
await self.write_presets(endpoint=endpoint, presets=new_presets, expected_status=Status.InvalidInState)
220220

221221
self.step("3")
222+
222223
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
223224
await self.send_atomic_request_begin_command()
224225

@@ -239,7 +240,7 @@ async def test_TC_TSTAT_4_2(self):
239240
asserts.assert_equal(presets, initial_presets, "Presets were updated which is not expected")
240241

241242
self.step("4")
242-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
243+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
243244

244245
# Send the AtomicRequest begin command
245246
await self.send_atomic_request_begin_command()
@@ -256,7 +257,7 @@ async def test_TC_TSTAT_4_2(self):
256257
asserts.assert_equal(presets, new_presets_with_handle, "Presets were not updated which is not expected")
257258

258259
self.step("5")
259-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
260+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
260261

261262
# Send the AtomicRequest begin command
262263
await self.send_atomic_request_begin_command()
@@ -270,7 +271,7 @@ async def test_TC_TSTAT_4_2(self):
270271
await self.send_atomic_request_commit_command(expected_overall_status=Status.Failure, expected_preset_status=Status.ConstraintError)
271272

272273
self.step("6")
273-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.C06.Rsp") and self.check_pics("TSTAT.S.CFE.Rsp")):
274+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.C06.Rsp") and self.check_pics("TSTAT.S.Cfe.Rsp")):
274275

275276
# Send the SetActivePresetRequest command
276277
await self.send_set_active_preset_handle_request_command(value=b'\x03')
@@ -292,7 +293,7 @@ async def test_TC_TSTAT_4_2(self):
292293
await self.send_atomic_request_commit_command(expected_overall_status=Status.Failure, expected_preset_status=Status.InvalidInState)
293294

294295
self.step("7")
295-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
296+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
296297

297298
# Send the AtomicRequest begin command
298299
await self.send_atomic_request_begin_command()
@@ -307,7 +308,7 @@ async def test_TC_TSTAT_4_2(self):
307308
await self.send_atomic_request_rollback_command()
308309

309310
self.step("8")
310-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
311+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
311312

312313
# Send the AtomicRequest begin command
313314
await self.send_atomic_request_begin_command()
@@ -323,7 +324,7 @@ async def test_TC_TSTAT_4_2(self):
323324
await self.send_atomic_request_rollback_command()
324325

325326
self.step("9")
326-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
327+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
327328

328329
# Send the AtomicRequest begin command
329330
await self.send_atomic_request_begin_command()
@@ -339,7 +340,7 @@ async def test_TC_TSTAT_4_2(self):
339340
await self.send_atomic_request_rollback_command()
340341

341342
self.step("10")
342-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
343+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
343344

344345
# Send the AtomicRequest begin command
345346
await self.send_atomic_request_begin_command()
@@ -355,7 +356,7 @@ async def test_TC_TSTAT_4_2(self):
355356
await self.send_atomic_request_rollback_command()
356357

357358
self.step("11")
358-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
359+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
359360

360361
# Send the AtomicRequest begin command
361362
await self.send_atomic_request_begin_command()
@@ -370,7 +371,7 @@ async def test_TC_TSTAT_4_2(self):
370371
await self.send_atomic_request_rollback_command()
371372

372373
self.step("12")
373-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
374+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
374375

375376
# Send the AtomicRequest begin command
376377
await self.send_atomic_request_begin_command()
@@ -385,7 +386,7 @@ async def test_TC_TSTAT_4_2(self):
385386
await self.send_atomic_request_rollback_command()
386387

387388
self.step("13")
388-
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.CFE.Rsp")):
389+
if self.pics_guard(self.check_pics("TSTAT.S.F08") and self.check_pics("TSTAT.S.A0050") and self.check_pics("TSTAT.S.Cfe.Rsp")):
389390

390391
# Send the AtomicRequest begin command
391392
await self.send_atomic_request_begin_command()

0 commit comments

Comments
 (0)