Skip to content

Commit 1989bab

Browse files
Merge branch 'master' into silabs/ota_requestor
2 parents 9cf01e5 + 0d6b2fb commit 1989bab

File tree

62 files changed

+2312
-582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2312
-582
lines changed

.github/.wordlist.txt

+5
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ CurrentHue
333333
CurrentLevel
334334
CurrentSaturation
335335
customAcl
336+
customizable
336337
customizations
337338
cvfJ
338339
cxx
@@ -1060,6 +1061,7 @@ otatesting
10601061
otaURL
10611062
OTBR
10621063
otcli
1064+
OU
10631065
outform
10641066
outgoingCommands
10651067
overridable
@@ -1171,6 +1173,7 @@ PyObject
11711173
pypi
11721174
PyRun
11731175
pytest
1176+
PYTHONPATH
11741177
QEMU
11751178
Qorvo
11761179
QPG
@@ -1349,6 +1352,7 @@ SRP
13491352
SRV
13501353
SSBL
13511354
SSID
1355+
SSL
13521356
startoffset
13531357
StartScan
13541358
startsWith
@@ -1516,6 +1520,7 @@ unfocus
15161520
Unicast
15171521
UniFlash
15181522
UnitLocalization
1523+
unittest
15191524
unpair
15201525
unprovisioned
15211526
Unsecure

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:98
39+
image: ghcr.io/project-chip/chip-build:115
4040

4141
steps:
4242
- name: Checkout

.vscode/launch.json

+27-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,37 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"name": "Python: Mock Server Tests",
9+
"type": "debugpy",
10+
"request": "launch",
11+
"module": "unittest",
12+
"args": [
13+
"${workspaceFolder}/integrations/mock_server/tests/test_mock_server.py"
14+
],
15+
"env": {
16+
"PYTHONPATH": "${workspaceFolder}/integrations/mock_server/src:${PYTHONPATH}"
17+
},
18+
"console": "integratedTerminal",
19+
"cwd": "${workspaceFolder}"
20+
},
721
{
822
"name": "Python Debugger: test_dcl_server",
923
"type": "debugpy",
1024
"request": "launch",
11-
"program": "/workspace/connectedhomeip/examples/chip-tool/commands/dcl/test_dcl_server.py",
12-
"args": [],
25+
"program": "${workspaceFolder}/integrations/mock_server/src/main.py",
26+
"args": [
27+
"--port",
28+
"8443",
29+
"--config",
30+
"${workspaceFolder}/integrations/mock_server/configurations/server_config.json",
31+
"--routing-config-dir",
32+
"${workspaceFolder}/integrations/mock_server/configurations/fake_distributed_compliance_ledger",
33+
"--cert",
34+
"${workspaceFolder}/server.crt",
35+
"--key",
36+
"${workspaceFolder}/server.key"
37+
],
1338
"console": "integratedTerminal"
1439
},
1540
{

examples/chip-tool/commands/dcl/test_dcl_server.py

-251
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
115 : [nrfconnect] Add gcc-multilib and g++-multilib
1+
116 : [TI] Update Sysconfig Version to 1.22.0

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ RUN set -x \
1212

1313
# Install Sysconfig
1414
RUN set -x \
15-
&& wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.18.1.3343/sysconfig-1.18.1_3343-setup.run \
16-
&& chmod +x sysconfig-1.18.1_3343-setup.run \
17-
&& ./sysconfig-1.18.1_3343-setup.run --mode unattended \
15+
&& wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.22.0.3893/sysconfig-1.22.0_3893-setup.run \
16+
&& chmod +x sysconfig-1.22.0_3893-setup.run \
17+
&& ./sysconfig-1.22.0_3893-setup.run --mode unattended \
1818
&& : # last line
1919

20-
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1
20+
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.22.0

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproje
5353

5454
COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
5555

56-
COPY --from=ti /opt/ti/sysconfig_1.18.1 /opt/ti/sysconfig_1.18.1
56+
COPY --from=ti /opt/ti/sysconfig_1.22.0 /opt/ti/sysconfig_1.22.0
5757

5858
COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/
5959

@@ -127,7 +127,7 @@ ENV QEMU_ESP32_DIR=/opt/espressif/qemu
127127
ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot
128128
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
129129
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
130-
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1
130+
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.22.0
131131
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
132132
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.17.0
133133
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb

0 commit comments

Comments
 (0)