Skip to content

Commit 29cad6b

Browse files
s07641069s07641069
committed
Merge branch 'master' into telink_image_update
2 parents 13f8ad2 + b88ac27 commit 29cad6b

File tree

828 files changed

+34915
-7942
lines changed

Some content is hidden

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

828 files changed

+34915
-7942
lines changed

‎.github/actions/bootstrap-cache/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
attempt_limit: 3
1212
attempt_delay: 2000
1313
with: |
14-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
14+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
1515
path: |
1616
.environment
1717
build_overrides/pigweed_environment.gni

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:64
37+
image: ghcr.io/project-chip/chip-build:65
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ on:
2626
run-codeql:
2727
required: false
2828
type: boolean
29-
29+
3030
concurrency:
3131
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
3232
cancel-in-progress: true
3333

3434
env:
3535
CHIP_NO_LOG_TIMESTAMPS: true
36-
36+
3737
jobs:
3838
build_linux_gcc_debug:
3939
name: Build on Linux (gcc_debug)
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:64
45+
image: ghcr.io/project-chip/chip-build:65
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -210,7 +210,7 @@ jobs:
210210
./scripts/run_in_build_env.sh \
211211
"./scripts/run-clang-tidy-on-compile-commands.py \
212212
--compile-database out/sanitizers/compile_commands.json \
213-
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|-ReadImpl|-InvokeSubscribeImpl|CodegenDataModel_Write' \
213+
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|-ReadImpl|-InvokeSubscribeImpl|CodegenDataModel_Write|QuieterReporting' \
214214
check \
215215
"
216216
- name: Clean output
@@ -243,7 +243,7 @@ jobs:
243243
run: |
244244
rm -rf ./zzz_pregenerated
245245
mv scripts/codegen.py.renamed scripts/codegen.py
246-
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
246+
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
247247
- name: Run fake linux tests with build_examples
248248
run: |
249249
./scripts/run_in_build_env.sh \
@@ -253,7 +253,7 @@ jobs:
253253
uses: ./.github/actions/perform-codeql-analysis
254254
with:
255255
language: cpp
256-
256+
257257
- name: Uploading core files
258258
uses: actions/upload-artifact@v4
259259
if: ${{ failure() && !env.ACT }}
@@ -430,7 +430,7 @@ jobs:
430430
./scripts/run_in_build_env.sh \
431431
"./scripts/run-clang-tidy-on-compile-commands.py \
432432
--compile-database out/default/compile_commands.json \
433-
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|CodegenDataModel_Write' \
433+
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|CodegenDataModel_Write|QuieterReporting' \
434434
check \
435435
"
436436
- name: Uploading diagnostic logs
@@ -445,7 +445,7 @@ jobs:
445445
uses: ./.github/actions/perform-codeql-analysis
446446
with:
447447
language: cpp
448-
448+
449449
# TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
450450
# TODO https://github.com/project-chip/connectedhomeip/issues/1512
451451

@@ -456,7 +456,7 @@ jobs:
456456
if: github.actor != 'restyled-io[bot]'
457457

458458
container:
459-
image: ghcr.io/project-chip/chip-build:64
459+
image: ghcr.io/project-chip/chip-build:65
460460
volumes:
461461
- "/:/runner-root-volume"
462462
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

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

3737
container:
38-
image: ghcr.io/project-chip/chip-build:64
38+
image: ghcr.io/project-chip/chip-build:65
3939
options: --user root
4040

4141
steps:

‎.github/workflows/examples-linux-standalone.yaml

+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:64
39+
image: ghcr.io/project-chip/chip-build:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-linux-tv-casting-app.yaml

+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:64
39+
image: ghcr.io/project-chip/chip-build:65
4040

4141
steps:
4242
- name: Checkout

‎.github/workflows/examples-mw320.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build:64
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-nxp.yaml

+39-12
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,66 @@ jobs:
6060
run: |
6161
scripts/run_in_build_env.sh "\
6262
./scripts/build/build_examples.py \
63-
--target nxp-k32w0-lighting \
64-
--target nxp-k32w0-lighting-factory \
65-
--target nxp-k32w0-lighting-rotating-id \
66-
--target nxp-k32w0-contact-sensor \
67-
--target nxp-k32w0-contact-sensor-low-power \
68-
--target nxp-k32w0-contact-sensor-low-power-factory \
69-
--target nxp-k32w1-lighting \
70-
--target nxp-k32w1-contact-sensor-low-power \
63+
--target nxp-k32w0-freertos-lighting \
64+
--target nxp-k32w0-freertos-lighting-factory \
65+
--target nxp-k32w0-freertos-lighting-rotating-id \
66+
--target nxp-k32w0-freertos-contact-sensor \
67+
--target nxp-k32w0-freertos-contact-sensor-low-power \
68+
--target nxp-k32w0-freertos-contact-sensor-low-power-factory \
69+
--target nxp-k32w1-freertos-lighting \
70+
--target nxp-k32w1-freertos-contact-sensor-low-power \
7171
build \
7272
--copy-artifacts-to out/artifacts \
7373
"
7474
- name: Get lighting app size stats
7575
run: |
7676
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
7777
nxp k32w0+release light \
78-
out/artifacts/nxp-k32w0-lighting/chip-k32w0x-light-example.elf \
78+
out/artifacts/nxp-k32w0-freertos-lighting/chip-k32w0x-light-example.elf \
7979
/tmp/bloat_reports/
8080
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
8181
nxp k32w1+release light \
82-
out/artifacts/nxp-k32w1-lighting/chip-k32w1-light-example.elf \
82+
out/artifacts/nxp-k32w1-freertos-lighting/chip-k32w1-light-example.elf \
8383
/tmp/bloat_reports/
8484
- name: Get contact sensor size stats
8585
run: |
8686
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
8787
nxp k32w0+release contact \
88-
out/artifacts/nxp-k32w0-contact-sensor-low-power/chip-k32w0x-contact-example.elf \
88+
out/artifacts/nxp-k32w0-freertos-contact-sensor-low-power/chip-k32w0x-contact-example.elf \
8989
/tmp/bloat_reports/
9090
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
9191
nxp k32w1+release contact \
92-
out/artifacts/nxp-k32w1-contact-sensor-low-power/chip-k32w1-contact-example.elf \
92+
out/artifacts/nxp-k32w1-freertos-contact-sensor-low-power/chip-k32w1-contact-example.elf \
9393
/tmp/bloat_reports/
9494
- name: Uploading Size Reports
9595
uses: ./.github/actions/upload-size-reports
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
100+
zephyr:
101+
name: ZEPHYR_RW61X
102+
103+
runs-on: ubuntu-latest
104+
if: github.actor != 'restyled-io[bot]'
105+
106+
container:
107+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:64
108+
109+
steps:
110+
- name: Checkout
111+
uses: actions/checkout@v4
112+
- name: Checkout submodules & Bootstrap
113+
uses: ./.github/actions/checkout-submodules-and-bootstrap
114+
with:
115+
platform: nxp
116+
117+
- name: Build RW61x Zephyr examples
118+
run: |
119+
scripts/run_in_build_env.sh "\
120+
./scripts/build/build_examples.py \
121+
--target nxp-rw61x-zephyr-all-clusters \
122+
--target nxp-rw61x-zephyr-thermostat \
123+
--target nxp-rw61x-zephyr-laundry-washer-factory \
124+
build \
125+
"

‎.github/workflows/examples-qpg.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build:64
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-stm32.yaml

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

4242
container:
43-
image: ghcr.io/project-chip/chip-build:64
43+
image: ghcr.io/project-chip/chip-build:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/fuzzing-build.yaml

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

3535
container:
36-
image: ghcr.io/project-chip/chip-build:64
36+
image: ghcr.io/project-chip/chip-build:65
3737
volumes:
3838
- "/tmp/log_output:/tmp/test_logs"
3939

‎.github/workflows/lint.yml

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

3737
container:
38-
image: ghcr.io/project-chip/chip-build:64
38+
image: ghcr.io/project-chip/chip-build:65
3939

4040
steps:
4141
- name: Checkout

‎.github/workflows/tests.yaml

+7-2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ jobs:
112112
src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \
113113
src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml \
114114
src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml \
115+
src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml \
115116
src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml \
116117
src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \
117118
src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml \
@@ -191,6 +192,7 @@ jobs:
191192
src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml \
192193
src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
193194
src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml \
195+
src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml \
194196
src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \
195197
src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml \
196198
src/app/zap-templates/zcl/data-model/chip/window-covering.xml \
@@ -443,7 +445,7 @@ jobs:
443445
runs-on: ubuntu-latest
444446

445447
container:
446-
image: ghcr.io/project-chip/chip-build:64
448+
image: ghcr.io/project-chip/chip-build:65
447449
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
448450
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
449451

@@ -493,7 +495,7 @@ jobs:
493495
- name: Run Tests
494496
run: |
495497
mkdir -p out/trace_data
496-
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --quiet --app-args "--trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--log-level INFO -t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
498+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/controller/python/test/test_scripts/mobile-device-test.py'
497499
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ACE_1_2.py'
498500
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ACE_1_3.py'
499501
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ACE_1_4.py'
@@ -529,6 +531,7 @@ jobs:
529531
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ICDManagementCluster.py'
530532
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_IDM_1_2.py'
531533
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_IDM_1_4.py'
534+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_IDM_4_2.py'
532535
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_PWRTL_2_1.py'
533536
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RR_1_1.py'
534537
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SC_3_6.py'
@@ -579,6 +582,8 @@ jobs:
579582
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
580583
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
581584
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
585+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
586+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
582587
583588
- name: Uploading core files
584589
uses: actions/upload-artifact@v4

‎.github/workflows/unit_integration_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-latest
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build:64
42+
image: ghcr.io/project-chip/chip-build:65
4343
volumes:
4444
- "/:/runner-root-volume"
4545
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/zap_regeneration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
runs-on: ubuntu-20.04
3232
container:
33-
image: ghcr.io/project-chip/chip-build:64
33+
image: ghcr.io/project-chip/chip-build:65
3434
defaults:
3535
run:
3636
shell: sh

‎.github/workflows/zap_templates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
runs-on: ubuntu-20.04
3636
container:
37-
image: ghcr.io/project-chip/chip-build:64
37+
image: ghcr.io/project-chip/chip-build:65
3838
defaults:
3939
run:
4040
shell: sh

‎.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@
133133
"random": "cpp",
134134
"thread": "cpp",
135135
"variant": "cpp",
136-
"any": "cpp"
136+
"any": "cpp",
137+
"future": "cpp"
137138
},
138139
// Configure paths or glob patterns to exclude from file watching.
139140
"files.watcherExclude": {

‎config/esp32/components/chip/Kconfig

+3-1
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,11 @@ menu "CHIP Device Layer"
330330
config MAX_EVENT_QUEUE_SIZE
331331
int "Max Event Queue Size"
332332
range 0 65535
333-
default 25
333+
default 40
334334
help
335335
The maximum number of events that can be held in the CHIP Platform event queue.
336+
Should be set greater than CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM. For SoCs other than
337+
ESP32-C2, where the Wi-Fi buffer number is 8, recommended to use the default value.
336338

337339
config ENABLE_EXTENDED_DISCOVERY
338340
bool "Enable Extended discovery Support"

‎config/python/CHIPProjectConfig.h

+11-4
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,19 @@
2626
#define CHIP_CONFIG_EVENT_LOGGING_NUM_EXTERNAL_CALLBACKS 2
2727

2828
// Uncomment this for a large Tunnel MTU.
29-
//#define CHIP_CONFIG_TUNNEL_INTERFACE_MTU (9000)
29+
// #define CHIP_CONFIG_TUNNEL_INTERFACE_MTU (9000)
3030

3131
// Enable support functions for parsing command-line arguments
3232
#define CHIP_CONFIG_ENABLE_ARG_PARSER 1
3333

34-
// Use a default pairing code if one hasn't been provisioned in flash.
35-
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
36-
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
34+
// Enable use of test setup parameters for testing purposes only.
35+
//
36+
// WARNING: This option makes it possible to circumvent basic chip security functionality.
37+
// Because of this it SHOULD NEVER BE ENABLED IN PRODUCTION BUILDS.
38+
//
39+
#ifndef CHIP_DEVICE_CONFIG_ENABLE_TEST_SETUP_PARAMS
40+
#define CHIP_DEVICE_CONFIG_ENABLE_TEST_SETUP_PARAMS 1
41+
#endif
3742

3843
// Enable reading DRBG seed data from /dev/(u)random.
3944
// This is needed for test applications and the CHIP device manager to function
@@ -46,6 +51,8 @@
4651
// WARNING: These options make it possible to circumvent basic Chip security functionality,
4752
// including message encryption. Because of this they MUST NEVER BE ENABLED IN PRODUCTION BUILDS.
4853
//
54+
// To build with this flag, pass 'treat_warnings_as_errors=false' to gn/ninja.
55+
//
4956
#define CHIP_CONFIG_SECURITY_TEST_MODE 0
5057

5158
#define CHIP_CONFIG_ENABLE_UPDATE 1

0 commit comments

Comments
 (0)