Skip to content

Commit 9b179b8

Browse files
vatsalghelani-csavatsalghelani-csa
committed
Merge conflcits and merge master
2 parents bfcc78b + 7ee93d2 commit 9b179b8

File tree

688 files changed

+51509
-12252
lines changed

Some content is hidden

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

688 files changed

+51509
-12252
lines changed

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ href
650650
HSM
651651
hsm
652652
HTTPS
653+
Humidistat
653654
HW
654655
hwadr
655656
HydrogenConcentrationMeasurement

‎.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

‎.github/workflows/build.yaml

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

140140
container:
141-
image: ghcr.io/project-chip/chip-build:54
141+
image: ghcr.io/project-chip/chip-build:65
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

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

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:66
59+
image: ghcr.io/project-chip/chip-build-esp32:67
6060
options: --user root
6161

6262
steps:

‎.github/workflows/examples-esp32.yaml

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

@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:66
129+
image: ghcr.io/project-chip/chip-build-esp32:67
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-nxp.yaml

+64
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,71 @@ jobs:
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
rw61x:
100+
name: RW61X
99101

102+
env:
103+
BUILD_TYPE: gn_rw61x
104+
105+
runs-on: ubuntu-latest
106+
if: github.actor != 'restyled-io[bot]'
107+
108+
container:
109+
image: ghcr.io/project-chip/chip-build-rw61x:66
110+
volumes:
111+
- "/tmp/bloat_reports:/tmp/bloat_reports"
112+
steps:
113+
- name: Checkout
114+
uses: actions/checkout@v4
115+
- name: Checkout submodules & Bootstrap
116+
uses: ./.github/actions/checkout-submodules-and-bootstrap
117+
with:
118+
platform: nxp
119+
extra-submodule-parameters: --recursive
120+
121+
- name: Set up environment for size reports
122+
uses: ./.github/actions/setup-size-reports
123+
if: ${{ !env.ACT }}
124+
with:
125+
gh-context: ${{ toJson(github) }}
126+
127+
- name: Build RW61X all clusters example app
128+
run: |
129+
scripts/run_in_build_env.sh "\
130+
./scripts/build/build_examples.py \
131+
--target nxp-rw61x-freertos-all-clusters-wifi \
132+
--target nxp-rw61x-freertos-all-clusters-thread \
133+
--target nxp-rw61x-freertos-all-clusters-thread-wifi \
134+
build \
135+
--copy-artifacts-to out/artifacts \
136+
"
137+
138+
- name: Build RW61X thermostat example app
139+
run: |
140+
scripts/run_in_build_env.sh "\
141+
./scripts/build/build_examples.py \
142+
--target nxp-rw61x-freertos-thermostat-wifi \
143+
--target nxp-rw61x-freertos-thermostat-thread \
144+
--target nxp-rw61x-freertos-thermostat-thread-wifi \
145+
build \
146+
--copy-artifacts-to out/artifacts \
147+
"
148+
149+
- name: Build RW61X laundry-washer example app
150+
run: |
151+
scripts/run_in_build_env.sh "\
152+
./scripts/build/build_examples.py \
153+
--target nxp-rw61x-freertos-laundry-washer-wifi \
154+
--target nxp-rw61x-freertos-laundry-washer-thread \
155+
--target nxp-rw61x-freertos-laundry-washer-thread-wifi \
156+
build \
157+
--copy-artifacts-to out/artifacts \
158+
"
159+
- name: Uploading Size Reports
160+
uses: ./.github/actions/upload-size-reports
161+
if: ${{ !env.ACT }}
162+
with:
163+
platform-name: RW61X
100164
zephyr:
101165
name: ZEPHYR_RW61X
102166

‎.github/workflows/examples-rw61x.yaml

-96
This file was deleted.

‎.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ jobs:
290290
git grep -I -n 'emberAfWriteAttribute' -- './*' \
291291
':(exclude).github/workflows/lint.yml' \
292292
':(exclude)examples/common/pigweed/rpc_services/Attributes.h' \
293-
':(exclude)src/app/codegen-data-model/CodegenDataModel_Write.cpp' \
294-
':(exclude)src/app/codegen-data-model/tests/EmberReadWriteOverride.cpp' \
293+
':(exclude)src/app/codegen-data-model-provider/CodegenDataModelProvider_Write.cpp' \
294+
':(exclude)src/app/codegen-data-model-provider/tests/EmberReadWriteOverride.cpp' \
295295
':(exclude)src/app/util/attribute-table.cpp' \
296296
':(exclude)src/app/util/attribute-table.h' \
297297
':(exclude)src/app/util/ember-compatibility-functions.cpp' \

‎.github/workflows/qemu.yaml

+7-2
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-esp32-qemu:66
43+
image: ghcr.io/project-chip/chip-build-esp32-qemu:67
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646

@@ -75,7 +75,12 @@ jobs:
7575
name: Tizen
7676

7777
runs-on: ubuntu-latest
78-
if: github.actor != 'restyled-io[bot]'
78+
# NOTE: job temporarely disabled as it seems flaky. The flake does not result in usable
79+
# logs so the current theory is that we run out of space. This is unusual as
80+
# larger docker images succeed at bootstrap, however it needs more investigation
81+
# to detect an exact/real root cause.
82+
if: false
83+
# if: github.actor != 'restyled-io[bot]'
7984

8085
container:
8186
image: ghcr.io/project-chip/chip-build-tizen-qemu:54

‎.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
container:
35-
image: ghcr.io/project-chip/chip-build-esp32:66
35+
image: ghcr.io/project-chip/chip-build-esp32:67
3636

3737
steps:
3838
- name: Checkout

‎.github/workflows/tests.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ jobs:
9191
--no-print \
9292
--log-level info \
9393
src/app/zap-templates/zcl/data-model/chip/global-attributes.xml \
94+
src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml \
95+
src/app/zap-templates/zcl/data-model/chip/global-enums.xml \
9496
src/app/zap-templates/zcl/data-model/chip/global-structs.xml \
9597
src/app/zap-templates/zcl/data-model/chip/semantic-tag-namespace-enums.xml \
9698
src/app/zap-templates/zcl/data-model/chip/access-control-definitions.xml \
@@ -504,7 +506,6 @@ jobs:
504506
run: |
505507
mkdir -p out/trace_data
506508
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'
507-
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/execute_python_tests.py --env-file /tmp/test_env.yaml --search-directory src/python_testing'
508509
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
509510
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
510511
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'

‎.vscode/settings.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@
134134
"thread": "cpp",
135135
"variant": "cpp",
136136
"any": "cpp",
137-
"future": "cpp"
137+
"future": "cpp",
138+
"list": "cpp",
139+
"unordered_set": "cpp"
138140
},
139141
// Configure paths or glob patterns to exclude from file watching.
140142
"files.watcherExclude": {

‎BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
5757
"${chip_root}/src/lib/core/tests:fuzz-tlv-reader",
5858
"${chip_root}/src/lib/dnssd/minimal_mdns/tests:fuzz-minmdns-packet-parsing",
5959
"${chip_root}/src/lib/format/tests:fuzz-payload-decoder",
60+
"${chip_root}/src/setup_payload/tests:fuzz-setup-payload-base38",
61+
"${chip_root}/src/setup_payload/tests:fuzz-setup-payload-base38-decode",
6062
]
6163
}
6264
}

‎build/config/compiler/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ config("libfuzzer_fuzzing") {
489489

490490
config("oss_fuzz") {
491491
cflags = string_split(getenv("CFLAGS"))
492+
cflags_cc = string_split(getenv("CXXFLAGS"))
492493
ldflags = string_split(getenv("CXXFLAGS"))
493494
ldflags += [ getenv("LIB_FUZZING_ENGINE") ]
494495
}

‎config/nrfconnect/chip-module/CMakeLists.txt

+10-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ matter_generate_args_tmp_file()
200200
# ==============================================================================
201201

202202
matter_build(chip
203-
LIB_SHELL ${CONFIG_CHIP_LIB_SHELL}
204203
LIB_TESTS ${CONFIG_CHIP_BUILD_TESTS}
205204
DEVICE_INFO_EXAMPLE_PROVIDER ${CONFIG_CHIP_EXAMPLE_DEVICE_INFO_PROVIDER}
206205
GN_DEPENDENCIES kernel
@@ -225,6 +224,16 @@ if (CONFIG_CHIP_MALLOC_SYS_HEAP_OVERRIDE)
225224
)
226225
endif()
227226

227+
if (CONFIG_CHIP_LIB_SHELL)
228+
# Force pulling chip::Shell::Engine::RunMainLoop() in the final binary.
229+
# Without this workaround, the linker script does not process the shell and
230+
# init objects defined in MainLoopZephyr.cpp unless the Matter library or
231+
# the Matter shell library is linked using the '--whole-archive' flag.
232+
target_link_options(chip INTERFACE
233+
-Wl,-u,_ZN4chip5Shell6Engine11RunMainLoopEv
234+
)
235+
endif()
236+
228237
# ==============================================================================
229238
# Define 'chip-ota-image' target for building CHIP OTA image
230239
# ==============================================================================

0 commit comments

Comments
 (0)