Skip to content

Commit 67f43a3

Browse files
committed
Merge branch 'master' into python_for_noble
2 parents 1a8556e + d7b5527 commit 67f43a3

File tree

10 files changed

+34
-50
lines changed

10 files changed

+34
-50
lines changed

docs/testing/yaml.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,16 @@ NOTE: use the target appropriate to your system
349349

350350
[chiptool.py](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tests/chipyaml/chiptool.py)
351351
can be used to run tests against a commissioned DUT (commissioned by chip-tool).
352-
This will start an interactive instance of chip-tool automatically.
352+
To commission a DUT using chip-tool use the pairing command. For example:
353+
354+
```
355+
./out/linux-x64-chip-tool/chip-tool pairing code 0x12344321 MT:-24J0AFN00KA0648G00
356+
```
357+
358+
In this example, 0x12344321 is the node ID (0x12344321 is the test default) and
359+
MT:-24J0AFN00KA0648G00 is the QR code.
360+
361+
The chiptool.py tool can then be used to run the tests. For example:
353362

354363
```
355364
./scripts/tests/chipyaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool

examples/lighting-app/esp32/sdkconfig_rpc.defaults

+4
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,7 @@ CONFIG_ENABLE_PW_RPC=y
5555
CONFIG_MBEDTLS_HKDF_C=y
5656

5757
CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
58+
59+
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
60+
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
61+
CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH=y

examples/platform/esp32/pw_sys_io/sys_io_esp32.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define ECHO_TEST_RTS (UART_PIN_NO_CHANGE)
3737
#define ECHO_TEST_CTS (UART_PIN_NO_CHANGE)
3838

39-
#define ECHO_UART_PORT_NUM (CONFIG_EXAMPLE_UART_PORT_NUM)
39+
#define ECHO_UART_PORT_NUM (static_cast<uart_port_t>(CONFIG_EXAMPLE_UART_PORT_NUM))
4040
#define ECHO_UART_BAUD_RATE (CONFIG_EXAMPLE_UART_BAUD_RATE)
4141

4242
int console_getchar(uint8_t * chr)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
57 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)
1+
58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)

integrations/docker/images/stage-2/chip-build-telink/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -x \
1818
&& : # last line
1919

2020
# Setup Zephyr
21-
ARG ZEPHYR_REVISION=0e8032dfef7e02498f34ba0b5d5d2df71a62adb1
21+
ARG ZEPHYR_REVISION=ab81a585fca6a83b30e1f4e58a021113d6a3acb8
2222
WORKDIR /opt/telink/zephyrproject
2323
RUN set -x \
2424
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \

src/app/SpecificationDefinedRevisions.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ inline constexpr uint8_t kInteractionModelRevisionTag = 0xFF;
4141
* See section 7.1.1. "Revision History" in the "Data Model Specification"
4242
* chapter of the core Matter specification.
4343
*/
44-
inline constexpr uint16_t kDataModelRevision = 17;
44+
inline constexpr uint16_t kDataModelRevision = 18;
4545

4646
/*
4747
* A number identifying the specification version against which the
@@ -50,7 +50,7 @@ inline constexpr uint16_t kDataModelRevision = 17;
5050
* See section 11.1.5.22. "SpecificationVersion Attribute" in "Service and
5151
* Device Management" chapter of the core Matter specification.
5252
*/
53-
inline constexpr uint32_t kSpecificationVersion = 0x01030000;
53+
inline constexpr uint32_t kSpecificationVersion = 0x01040000;
5454

5555
} // namespace Revision
5656
} // namespace chip

src/app/tests/suites/TestBasicInformation.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ tests:
206206
command: "readAttribute"
207207
attribute: "SpecificationVersion"
208208
response:
209-
# For now all-clusters-app has a version 1.3.
210-
value: 0x01030000
209+
# For now all-clusters-app has a version 1.4.
210+
value: 0x01040000
211211

212212
- label: "Read the Max Paths Per Invoke value"
213213
command: "readAttribute"

src/app/tests/suites/TestCASERecovery.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ tests:
3333
command: "readAttribute"
3434
attribute: "DataModelRevision"
3535
response:
36-
value: 17
36+
constraints:
37+
type: int16u
38+
minValue: 17
3739

3840
- label: "Reboot the server"
3941
cluster: "SystemCommands"
@@ -72,4 +74,6 @@ tests:
7274
command: "readAttribute"
7375
attribute: "DataModelRevision"
7476
response:
75-
value: 17
77+
constraints:
78+
type: int16u
79+
minValue: 17

src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml

+6-39
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,15 @@ tests:
8686
value: "y"
8787

8888
- label: "Step 2: TH reads DataModelRevision from the DUT."
89-
PICS: BINFO.S.A0000
9089
command: "readAttribute"
9190
attribute: "DataModelRevision"
9291
response:
93-
value: 17
92+
value: 18
9493
saveAs: DataModelRevisionValue
9594
constraints:
9695
type: int16u
97-
minValue: 0
98-
maxValue: 65534
9996

10097
- label: "Step 3: TH writes DataModelRevision as '0x1124' "
101-
PICS: BINFO.S.A0000
10298
command: "writeAttribute"
10399
attribute: "DataModelRevision"
104100
arguments:
@@ -107,7 +103,6 @@ tests:
107103
error: UNSUPPORTED_WRITE
108104

109105
- label: "Step 4: TH reads DataModelRevision from the DUT."
110-
PICS: BINFO.S.A0000
111106
command: "readAttribute"
112107
attribute: "DataModelRevision"
113108
response:
@@ -720,48 +715,21 @@ tests:
720715
response:
721716
value: ProductAppearancevalue
722717

723-
- label: "Step 62: TH reads SpecificationVersion from the DUT."
724-
PICS: BINFO.S.A0015
725-
command: "readAttribute"
726-
attribute: "SpecificationVersion"
727-
response:
728-
saveAs: SpecificationVersionValue
729-
730-
- label:
731-
"Step 62: If the SpecificationVersion value is absent or zero this
732-
step cannot be verified, move on to the next step"
733-
PICS: BINFO.S.A0015
734-
cluster: "EqualityCommands"
735-
command: "UnsignedNumberEquals"
736-
arguments:
737-
values:
738-
- name: "Value1"
739-
value: SpecificationVersionValue
740-
- name: "Value2"
741-
value: null
742-
response:
743-
- values:
744-
- name: "Equals"
745-
saveAs: IsExpectedValue
746-
747718
- label:
748719
"Step 62: SpecificationVersion value should in the inclusive range of
749-
(0 to 4294967295) and the initial 7 bits are set to zero."
750-
runIf: "!IsExpectedValue"
751-
PICS: BINFO.S.A0015
720+
(0x01040000 to 0x0104FF00) and the lower 8 bits are set to zero."
752721
command: "readAttribute"
753722
attribute: "SpecificationVersion"
754723
response:
755-
value: SpecificationVersionValue
724+
saveAs: SpecificationVersionValue
756725
constraints:
757-
minValue: 0
758-
maxValue: 4294967295
759-
hasMasksClear: [0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40]
726+
minValue: 0x01040000
727+
maxValue: 0x0104FF00
728+
hasMasksClear: [0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80]
760729

761730
- label:
762731
"Step 63: TH sends Write request message to DUT to change the value of
763732
SpecificationVersion to '0x0103AAF1'."
764-
PICS: BINFO.S.A0015
765733
command: "writeAttribute"
766734
attribute: "SpecificationVersion"
767735
arguments:
@@ -770,7 +738,6 @@ tests:
770738
error: UNSUPPORTED_WRITE
771739

772740
- label: "Step 64: TH reads SpecificationVersion attribute from DUT"
773-
PICS: BINFO.S.A0015
774741
command: "readAttribute"
775742
attribute: "SpecificationVersion"
776743
response:

0 commit comments

Comments
 (0)