Skip to content

Commit cf2bd64

Browse files
ankk-cssankk-css
authored
Merge branch 'master' into master
2 parents 8755436 + 681f951 commit cf2bd64

File tree

289 files changed

+16521
-3824
lines changed

Some content is hidden

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

289 files changed

+16521
-3824
lines changed

‎.github/dependabot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ updates:
5454
- dependency-name: "third_party/open-iot-sdk/repo"
5555
- dependency-name: "third_party/ot-br-posix/repo"
5656
- dependency-name: "third_party/perfetto/repo"
57-
- dependency-name: "third_party/pybind11/repo"
5857
- dependency-name: "third_party/qpg_sdk/repo"
5958
- dependency-name: "third_party/silabs/repo"
6059
- dependency-name: "third_party/simw-top-mini/repo"

‎.github/stale.yml

-42
This file was deleted.

‎.github/workflows/build.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jobs:
308308

309309
- name: Setup Build, Run Build and Run Tests
310310
run: |
311-
scripts/build/gn_gen.sh --args="enable_rtti=true enable_pylib=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
311+
scripts/build/gn_gen.sh --args="enable_rtti=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
312312
scripts/run_in_build_env.sh "ninja -C ./out"
313313
scripts/tests/gn_tests.sh
314314
- name: Setup test python environment
@@ -414,7 +414,6 @@ jobs:
414414
# "host clang" build, which uses the pigweed
415415
# clang.
416416
"default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
417-
"python_lib") GN_ARGS='enable_rtti=true enable_pylib=true';;
418417
esac
419418
BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
420419
scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"

‎.github/workflows/docker_img.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
# - "-imx"
103103
- "-java"
104104
- "-k32w"
105-
- "-mbed-os"
106105
- "-nrf-platform"
107106
- "-telink"
108107
- "-ti"

‎.github/workflows/examples-ameba.yaml

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

4040
container:
41-
image: ghcr.io/project-chip/chip-build-ameba:54
41+
image: ghcr.io/project-chip/chip-build-ameba:68
4242
options: --user root
4343

4444
steps:

‎.github/workflows/examples-bouffalolab.yaml

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

3939
container:
40-
image: ghcr.io/project-chip/chip-build-bouffalolab:54
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:68
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-mbed.yaml

-170
This file was deleted.

‎.github/workflows/stale.yaml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "Process Stale Issues and PRs"
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "30 1 * * *"
6+
7+
permissions:
8+
issues: write
9+
pull-requests: write
10+
11+
jobs:
12+
stale:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/stale@v9
16+
with:
17+
stale-issue-message:
18+
"This issue has been automatically marked as stale because
19+
it has not had recent activity. It will be closed if no
20+
further activity occurs. Remove stale label or comment or
21+
this will be closed in 30 days."
22+
stale-pr-message:
23+
"This pull request has been automatically marked as stale
24+
because it has not had recent activity. It will be closed
25+
if no further activity occurs. Remove stale label or
26+
comment or this will be closed in 10 days."
27+
close-issue-message:
28+
"This stale issue has been automatically closed. Thank you
29+
for your contributions."
30+
close-pr-message:
31+
"This stale pull request has been automatically closed.
32+
Thank you for your contributions."
33+
days-before-issue-stale: 30
34+
days-before-issue-close: -1 # Don't close them for now
35+
days-before-pr-stale: 90
36+
days-before-pr-close: 10
37+
exempt-issue-labels:
38+
"security,blocked,cert blocker,build issue,Spec XML
39+
align,CI/CD improvements,memory"
40+
exempt-pr-labels:
41+
"security,blocked,cert blocker,build issue,Spec XML
42+
align,CI/CD improvements,memory"

‎.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,6 @@
165165
path = third_party/infineon/psoc6/psoc6_sdk/libs/recipe-make-cat1a
166166
url = https://github.com/Infineon/recipe-make-cat1a
167167
platforms = infineon
168-
[submodule "third_party/pybind11/repo"]
169-
path = third_party/pybind11/repo
170-
url = https://github.com/pybind/pybind11
171-
branch = stable
172168
[submodule "p6/lwip"]
173169
path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip
174170
url = https://github.com/lwip-tcpip/lwip.git

‎BUILD.gn

-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
4444
chip_enable_python_modules =
4545
(current_os == "mac" || current_os == "linux") &&
4646
(host_cpu == "x64" || host_cpu == "arm64" || host_cpu == "arm")
47-
enable_pylib = false
4847

4948
# Build the Linux all clusters app example with default group
5049
chip_build_all_clusters_app = false
@@ -112,9 +111,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
112111
"${chip_root}/src/controller/python:chip-repl",
113112
"${chip_root}/src/python_testing/matter_testing_infrastructure:metadata_parser.wheel",
114113
]
115-
if (enable_pylib) {
116-
deps += [ "${chip_root}/src/pybindings/pycontroller" ]
117-
}
118114
}
119115
}
120116

@@ -214,9 +210,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
214210
data_deps = [ "${chip_root}/examples/chip-tool" ]
215211

216212
if (chip_enable_python_modules) {
217-
if (enable_pylib) {
218-
data_deps += [ "${chip_root}/src/pybindings/pycontroller" ]
219-
}
220213
data_deps += [ "${chip_root}/src/controller/python:chip-repl" ]
221214
}
222215

‎config/esp32/components/chip/CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,13 @@ if(NOT CONFIG_USE_MINIMAL_MDNS)
467467
endif()
468468
endif()
469469

470+
if(CONFIG_OPENTHREAD_BORDER_ROUTER)
471+
idf_component_get_property(rcp_update_lib espressif__esp_rcp_update COMPONENT_LIB)
472+
list(APPEND chip_libraries $<TARGET_FILE:${rcp_update_lib}>)
473+
idf_component_get_property(serial_flasher_lib espressif__esp-serial-flasher COMPONENT_LIB)
474+
list(APPEND chip_libraries $<TARGET_FILE:${serial_flasher_lib}>)
475+
endif()
476+
470477
if (CONFIG_ENABLE_ENCRYPTED_OTA)
471478
idf_component_get_property(esp_encrypted_img_lib espressif__esp_encrypted_img COMPONENT_LIB)
472479
list(APPEND chip_libraries $<TARGET_FILE:${esp_encrypted_img_lib}>)

‎config/esp32/components/chip/idf_component.yml

+5
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,8 @@ dependencies:
2525
rules:
2626
- if: "idf_version >=5.0"
2727
- if: "target != esp32h2"
28+
29+
espressif/esp_rcp_update:
30+
version: "1.0.3"
31+
rules:
32+
- if: "idf_version >=5.0"

‎docs/examples/index.md

+9
Original file line numberDiff line numberDiff line change
@@ -370,3 +370,12 @@ network-manager-app/README
370370
371371
lit-icd-app/**/README
372372
```
373+
374+
## Thread Border Router example
375+
376+
```{toctree}
377+
:glob:
378+
:maxdepth: 1
379+
380+
thread-br-app/**/README
381+
```

0 commit comments

Comments
 (0)