Skip to content

Commit 16198cd

Browse files
PeterC1965PeterC1965
authored
Merge branch 'master' into add-water-heater-mode-sdk-code
2 parents eabbf55 + c91a779 commit 16198cd

File tree

549 files changed

+11478
-5912
lines changed

Some content is hidden

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

549 files changed

+11478
-5912
lines changed

‎.github/workflows/chef.yaml

+2-2
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:54
59+
image: ghcr.io/project-chip/chip-build-esp32:65
6060
options: --user root
6161

6262
steps:
@@ -77,7 +77,7 @@ jobs:
7777
if: github.actor != 'restyled-io[bot]'
7878

7979
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:54
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:65
8181
options: --user root
8282

8383
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:54
39+
image: ghcr.io/project-chip/chip-build-esp32:65
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:54
129+
image: ghcr.io/project-chip/chip-build-esp32:65
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-nrfconnect.yaml

+31-31
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-nrf-platform:54
42+
image: ghcr.io/project-chip/chip-build-nrf-platform:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545

@@ -78,119 +78,119 @@ jobs:
7878
- name: Build example nRF Connect SDK Lock App on nRF52840 DK
7979
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
8080
run: |
81-
scripts/examples/nrfconnect_example.sh lock-app nrf52840dk_nrf52840
81+
scripts/examples/nrfconnect_example.sh lock-app nrf52840dk/nrf52840
8282
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
8383
nrfconnect nrf52840dk_nrf52840 lock-app \
84-
examples/lock-app/nrfconnect/build/zephyr/zephyr.elf \
84+
examples/lock-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
8585
/tmp/bloat_reports/
8686
- name: Build example nRF Connect SDK Lighting App on nRF52840 Dongle
8787
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
8888
run: |
89-
scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle_nrf52840 -DCONF_FILE=prj_no_dfu.conf -DCONFIG_CHIP_ROTATING_DEVICE_ID=y
89+
scripts/examples/nrfconnect_example.sh lighting-app nrf52840dongle/nrf52840 -DCONFIG_CHIP_ROTATING_DEVICE_ID=y
9090
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
9191
nrfconnect nrf52840dongle_nrf52840 lighting-app \
92-
examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
92+
examples/lighting-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
9393
/tmp/bloat_reports/
9494
- name: Build example nRF Connect SDK Lighting App on nRF52840 DK with RPC
9595
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
9696
run: |
97-
scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay
97+
scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk/nrf52840 -DOVERLAY_CONFIG=rpc.overlay
9898
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
9999
nrfconnect nrf52840dk_nrf52840+rpc lighting-app \
100-
examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
100+
examples/lighting-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
101101
/tmp/bloat_reports/
102102
- name: Build example nRF Connect SDK Light Switch App on nRF52840 DK
103103
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
104104
run: |
105-
scripts/examples/nrfconnect_example.sh light-switch-app nrf52840dk_nrf52840
105+
scripts/examples/nrfconnect_example.sh light-switch-app nrf52840dk/nrf52840
106106
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
107107
nrfconnect nrf52840dk_nrf52840 light-switch-app \
108-
examples/light-switch-app/nrfconnect/build/zephyr/zephyr.elf \
108+
examples/light-switch-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
109109
/tmp/bloat_reports/
110110
- name: Build example nRF Connect SDK Shell on nRF52840 DK
111111
if: github.event_name == 'push' || steps.changed_paths.outputs.shell == 'true'
112112
run: |
113-
scripts/examples/nrfconnect_example.sh shell nrf52840dk_nrf52840
113+
scripts/examples/nrfconnect_example.sh shell nrf52840dk/nrf52840
114114
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
115115
nrfconnect nrf52840dk_nrf52840 shell \
116-
examples/shell/nrfconnect/build/zephyr/zephyr.elf \
116+
examples/shell/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
117117
/tmp/bloat_reports/
118118
- name: Build example nRF Connect SDK Pump App on nRF52840 DK
119119
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
120120
run: |
121-
scripts/examples/nrfconnect_example.sh pump-app nrf52840dk_nrf52840
121+
scripts/examples/nrfconnect_example.sh pump-app nrf52840dk/nrf52840
122122
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
123123
nrfconnect nrf52840dk_nrf52840 pump-app \
124-
examples/pump-app/nrfconnect/build/zephyr/zephyr.elf \
124+
examples/pump-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
125125
/tmp/bloat_reports/
126126
- name: Build example nRF Connect SDK Pump Controller App on nRF52840 DK
127127
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
128128
run: |
129-
scripts/examples/nrfconnect_example.sh pump-controller-app nrf52840dk_nrf52840
129+
scripts/examples/nrfconnect_example.sh pump-controller-app nrf52840dk/nrf52840
130130
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
131131
nrfconnect nrf52840dk_nrf52840 pump-controller-app \
132-
examples/pump-controller-app/nrfconnect/build/zephyr/zephyr.elf \
132+
examples/pump-controller-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
133133
/tmp/bloat_reports/
134134
- name: Build example nRF Connect SDK All Clusters App on nRF52840 DK
135135
run: |
136-
scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk_nrf52840
136+
scripts/examples/nrfconnect_example.sh all-clusters-app nrf52840dk/nrf52840
137137
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
138138
nrfconnect nrf52840dk_nrf52840 all-clusters-app \
139-
examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
139+
examples/all-clusters-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
140140
/tmp/bloat_reports/
141141
- name: Build example nRF Connect SDK All Clusters Minimal App on nRF52840 DK
142142
run: |
143-
scripts/examples/nrfconnect_example.sh all-clusters-minimal-app nrf52840dk_nrf52840 -DCONF_FILE=prj_dfu.conf
143+
scripts/examples/nrfconnect_example.sh all-clusters-minimal-app nrf52840dk/nrf52840 -DFILE_SUFFIX=dfu
144144
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
145145
nrfconnect nrf52840dk_nrf52840 all-clusters-minimal-app \
146-
examples/all-clusters-minimal-app/nrfconnect/build/zephyr/zephyr.elf \
146+
examples/all-clusters-minimal-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
147147
/tmp/bloat_reports/
148148
- name: Build example nRF Connect SDK Lock App on nRF5340 DK
149149
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
150150
run: |
151-
scripts/examples/nrfconnect_example.sh lock-app nrf5340dk_nrf5340_cpuapp
151+
scripts/examples/nrfconnect_example.sh lock-app nrf5340dk/nrf5340/cpuapp
152152
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
153153
nrfconnect nrf5340dk_nrf5340_cpuapp lock-app \
154-
examples/lock-app/nrfconnect/build/zephyr/zephyr.elf \
154+
examples/lock-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
155155
/tmp/bloat_reports/
156156
- name: Build example nRF Connect SDK Lighting App on nRF5340 DK
157157
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
158158
run: |
159-
scripts/examples/nrfconnect_example.sh lighting-app nrf5340dk_nrf5340_cpuapp
159+
scripts/examples/nrfconnect_example.sh lighting-app nrf5340dk/nrf5340/cpuapp
160160
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
161161
nrfconnect nrf5340dk_nrf5340_cpuapp lighting-app \
162-
examples/lighting-app/nrfconnect/build/zephyr/zephyr.elf \
162+
examples/lighting-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
163163
/tmp/bloat_reports/
164164
- name: Build example nRF Connect SDK Lock App on nRF7002 PDK
165165
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
166166
run: |
167-
scripts/examples/nrfconnect_example.sh lock-app nrf7002dk_nrf5340_cpuapp
167+
scripts/examples/nrfconnect_example.sh lock-app nrf7002dk/nrf5340/cpuapp
168168
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
169169
nrfconnect nrf7002dk_nrf5340_cpuapp lock-app \
170-
examples/lock-app/nrfconnect/build/zephyr/zephyr.elf \
170+
examples/lock-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
171171
/tmp/bloat_reports/
172172
- name: Build example nRF Connect SDK Light Switch App on nRF7002 PDK
173173
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
174174
run: |
175-
scripts/examples/nrfconnect_example.sh light-switch-app nrf7002dk_nrf5340_cpuapp
175+
scripts/examples/nrfconnect_example.sh light-switch-app nrf7002dk/nrf5340/cpuapp
176176
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
177177
nrfconnect nrf7002dk_nrf5340_cpuapp light-switch-app \
178-
examples/light-switch-app/nrfconnect/build/zephyr/zephyr.elf \
178+
examples/light-switch-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
179179
/tmp/bloat_reports/
180180
- name: Build example nRF Connect SDK Lighting App on nRF7002 PDK
181181
if: github.event_name == 'push' || steps.changed_paths.outputs.nrfconnect == 'true'
182182
run: |
183-
scripts/examples/nrfconnect_example.sh lighting-app nrf7002dk_nrf5340_cpuapp
183+
scripts/examples/nrfconnect_example.sh lighting-app nrf7002dk/nrf5340/cpuapp
184184
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
185185
nrfconnect nrf7002dk_nrf5340_cpuapp lighting-app \
186-
examples/light-switch-app/nrfconnect/build/zephyr/zephyr.elf \
186+
examples/light-switch-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
187187
/tmp/bloat_reports/
188188
- name: Build example nRF Connect SDK All Clusters App on nRF7002 PDK
189189
run: |
190-
scripts/examples/nrfconnect_example.sh all-clusters-app nrf7002dk_nrf5340_cpuapp -DCONF_FILE=prj_release.conf
190+
scripts/examples/nrfconnect_example.sh all-clusters-app nrf7002dk/nrf5340/cpuapp -DFILE_SUFFIX=release
191191
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
192192
nrfconnect nrf7002dk_nrf5340_cpuapp all-clusters-app \
193-
examples/all-clusters-app/nrfconnect/build/zephyr/zephyr.elf \
193+
examples/all-clusters-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
194194
/tmp/bloat_reports/
195195
- name: Run unit tests for Zephyr native_posix_64 platform
196196
if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true'

‎.github/workflows/lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ jobs:
9898
--known-failure controller/ExamplePersistentStorage.cpp \
9999
--known-failure controller/ExamplePersistentStorage.h \
100100
--known-failure app/AttributeAccessToken.h \
101-
--known-failure app/CommandHandlerInterface.h \
102101
--known-failure app/CommandResponseSender.h \
103102
--known-failure app/CommandSenderLegacyCallback.h \
104103
--known-failure app/ReadHandler.h \

‎.github/workflows/qemu.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-esp32-qemu:54
43+
image: ghcr.io/project-chip/chip-build-esp32-qemu:65
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646

‎.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:54
35+
image: ghcr.io/project-chip/chip-build-esp32:65
3636

3737
steps:
3838
- name: Checkout

‎.github/workflows/tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ jobs:
576576
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_RVCOPSTATE_2_1.py'
577577
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_RVCOPSTATE_2_3.py'
578578
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_RVCOPSTATE_2_4.py'
579+
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_7_1.py'
580+
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_SWTCH.py'
579581
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.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"'
580582
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"'
581583
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"'
@@ -585,6 +587,7 @@ jobs:
585587
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
586588
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
587589
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
590+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'
588591
589592
- name: Uploading core files
590593
uses: actions/upload-artifact@v4

‎config/nrfconnect/.nrfconnect-recommended-revision

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.6.0
1+
v2.7.0

‎config/nrfconnect/app/check-sysbuild-use.cmake

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#
2+
# Copyright (c) 2024 Project CHIP Authors
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
# This script checks is sysbuild is used to build the target. If not, it prints the fatal error
18+
# message, as the nRF Connect examples do not support deprecated child-image approach anymore.
19+
20+
if (NOT SYSBUILD)
21+
message(FATAL_ERROR " ###################################################################################\n"
22+
" # This example does not support child-image approach anymore. #\n"
23+
" # The nRF Connect SDK platform marked child-image approach as deprecated #\n"
24+
" # from v2.7.0 and it is recommended to use the new sysbuild solution. #\n"
25+
" # #\n"
26+
" # To build this application with sysbuild support enabled, #\n"
27+
" # you have to add --sysbuild flag to the build command, for example: #\n"
28+
" # #\n"
29+
" # west build -b <your_board_name> --sysbuild #\n"
30+
" ###################################################################################\n")
31+
endif()

‎config/nrfconnect/app/flashing.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ add_custom_command(OUTPUT "${FLASHBUNDLE_FLASHER_PLATFORM}"
4040
VERBATIM)
4141

4242
if (merged_hex_to_flash)
43-
set(flashbundle_hex_to_copy "zephyr/${merged_hex_to_flash}")
43+
set(flashbundle_hex_to_copy "${merged_hex_to_flash}")
4444
else()
45-
set(flashbundle_hex_to_copy "zephyr/${KERNEL_HEX_NAME}")
45+
set(flashbundle_hex_to_copy "../merged.hex")
4646
endif()
4747

4848
add_custom_command(OUTPUT "${FLASHBUNDLE_FIRMWARE}"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ endif()
229229
# Define 'chip-ota-image' target for building CHIP OTA image
230230
# ==============================================================================
231231

232-
if (CONFIG_CHIP_OTA_IMAGE_BUILD)
232+
if (CONFIG_CHIP_OTA_IMAGE_BUILD AND NOT SYSBUILD)
233233
chip_ota_image(chip-ota-image
234234
INPUT_FILES ${PROJECT_BINARY_DIR}/dfu_multi_image.bin
235235
OUTPUT_FILE ${PROJECT_BINARY_DIR}/${CONFIG_CHIP_OTA_IMAGE_FILE_NAME}
@@ -240,7 +240,7 @@ endif()
240240
# Define 'factory_data' target for generating a factory data partition
241241
# ==============================================================================
242242

243-
if (CONFIG_CHIP_FACTORY_DATA_BUILD)
243+
if(CONFIG_CHIP_FACTORY_DATA_BUILD AND (NOT SYSBUILD OR NOT CONFIG_PARTITION_MANAGER_ENABLED))
244244
nrfconnect_generate_factory_data()
245245
endif()
246246

0 commit comments

Comments
 (0)