Skip to content

Commit 2b1dd69

Browse files
Alami-AmineAlami-Amine
committed
Merge branch 'master' into AA/mypy_fixes
2 parents 89613a7 + f6022e4 commit 2b1dd69

File tree

473 files changed

+21837
-12463
lines changed

Some content is hidden

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

473 files changed

+21837
-12463
lines changed

‎.github/actions/bootstrap/action.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ runs:
2626
# because the bootstrapped Pigweed environment contains absolute paths.
2727
echo "Calculating bootstrap cache key for '$PWD'"
2828
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
29-
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
29+
case "$RUNNER_OS" in
30+
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
31+
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
32+
esac
33+
PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
34+
FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
3035
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
3136
3237
# Split caches across backends

‎.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:
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:57
101+
image: ghcr.io/project-chip/chip-build-telink:65
102102
options: --user root
103103

104104
steps:

‎.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# need to run with privilege, which isn't supported by job.XXX.contaner
4343
# https://github.com/actions/container-action/issues/2
4444
# container:
45-
# image: ghcr.io/project-chip/chip-build-cirque:54
45+
# image: ghcr.io/project-chip/chip-build-cirque:<VERSION_HERE>
4646
# volumes:
4747
# - "/tmp:/tmp"
4848
# - "/dev/pts:/dev/pts"

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:54
84+
image: ghcr.io/project-chip/chip-build-doxygen:65
8585

8686
if: github.actor != 'restyled-io[bot]'
8787

‎.github/workflows/examples-asr.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-asr:54
39+
image: ghcr.io/project-chip/chip-build-asr:65
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-efr32.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-efr32:56
43+
image: ghcr.io/project-chip/chip-build-efr32:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
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-linux-arm.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-crosscompile:54
39+
image: ghcr.io/project-chip/chip-build-crosscompile:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/examples-mbed.yaml

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

4444
container:
45-
image: ghcr.io/project-chip/chip-build-mbed-os:54
45+
image: ghcr.io/project-chip/chip-build-mbed-os:65
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848

‎.github/workflows/examples-nuttx.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-nuttx:54
38+
image: ghcr.io/project-chip/chip-build-nuttx:65
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-nxp.yaml

+2-2
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-k32w:54
42+
image: ghcr.io/project-chip/chip-build-k32w:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:
@@ -104,7 +104,7 @@ jobs:
104104
if: github.actor != 'restyled-io[bot]'
105105

106106
container:
107-
image: ghcr.io/project-chip/chip-build-nxp-zephyr:64
107+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:65
108108

109109
steps:
110110
- name: Checkout

‎.github/workflows/examples-openiotsdk.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-openiotsdk:54
43+
image: ghcr.io/project-chip/chip-build-openiotsdk:65
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
options: --privileged

‎.github/workflows/examples-rw61x.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-rw61x:54
42+
image: ghcr.io/project-chip/chip-build-rw61x:65
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-telink.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-telink:57
41+
image: ghcr.io/project-chip/chip-build-telink:65
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444

‎.github/workflows/examples-tizen.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-tizen:54
39+
image: ghcr.io/project-chip/chip-build-tizen:65
4040
options: --user root
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"

‎.github/workflows/full-android.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-android:54
41+
image: ghcr.io/project-chip/chip-build-android:65
4242
volumes:
4343
- "/tmp/log_output:/tmp/test_logs"
4444

‎.github/workflows/java-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-java:54
45+
image: ghcr.io/project-chip/chip-build-java:65
4646
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
4747
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
4848

‎.github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ jobs:
296296
':(exclude)src/app/util/attribute-table.cpp' \
297297
':(exclude)src/app/util/attribute-table.h' \
298298
':(exclude)src/app/util/ember-compatibility-functions.cpp' \
299+
':(exclude)src/app/util/mock/CodegenEmberMocks.cpp' \
299300
':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' \
300301
':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' \
301302
&& exit 1 || exit 0

‎.github/workflows/minimal-build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build-minimal:54
36+
image: ghcr.io/project-chip/chip-build-minimal:65
3737

3838
steps:
3939
- name: Checkout
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656

5757
container:
58-
image: ghcr.io/project-chip/chip-build-minimal:54
58+
image: ghcr.io/project-chip/chip-build-minimal:65
5959

6060
steps:
6161
- name: Checkout

‎.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/smoketest-android.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-android:54
40+
image: ghcr.io/project-chip/chip-build-android:65
4141
volumes:
4242
- "/:/runner-root-volume"
4343
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -576,14 +576,17 @@ 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'
579580
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"'
580581
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"'
581582
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"'
582583
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
583584
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
584585
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
586+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
585587
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
586588
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
589+
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'
587590
588591
- name: Uploading core files
589592
uses: actions/upload-artifact@v4

‎.gitmodules

+24-17
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@
9797
path = third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos
9898
url = https://github.com/Infineon/abstraction-rtos
9999
platforms = infineon
100-
[submodule "p6/bluetooth-freertos"]
101-
path = third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos
102-
url = https://github.com/Infineon/bluetooth-freertos
103-
branch = v2.X
104-
platforms = infineon
105100
[submodule "p6/btstack"]
106101
path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack
107102
url = https://github.com/Infineon/btstack
@@ -134,10 +129,6 @@
134129
path = third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1
135130
url = https://github.com/Infineon/mtb-pdl-cat1
136131
platforms = infineon
137-
[submodule "p6/psoc6cm0p"]
138-
path = third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p
139-
url = https://github.com/Infineon/psoc6cm0p
140-
platforms = infineon
141132
[submodule "p6/whd-bsp-integration"]
142133
path = third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration
143134
url = https://github.com/Infineon/whd-bsp-integration
@@ -185,10 +176,6 @@
185176
[submodule "third_party/jsoncpp/repo"]
186177
path = third_party/jsoncpp/repo
187178
url = https://github.com/open-source-parsers/jsoncpp.git
188-
[submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
189-
path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota
190-
url = https://github.com/Infineon/anycloud-ota
191-
platforms = infineon
192179
[submodule "third_party/mbed-mcu-boot/repo"]
193180
path = third_party/mbed-mcu-boot/repo
194181
url = https://github.com/ATmobica/mcuboot.git
@@ -312,10 +299,6 @@
312299
url = https://github.com/STMicroelectronics/STM32CubeWB.git
313300
branch = v1.18.0
314301
platforms = stm32
315-
[submodule "p6/lwip-network-interface-integration"]
316-
path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
317-
url = https://github.com/Infineon/lwip-network-interface-integration.git
318-
platforms = infineon
319302
[submodule "third_party/infineon/trustm/optiga-trust-m"]
320303
path = third_party/infineon/trustm/optiga-trust-m
321304
url = https://github.com/Infineon/optiga-trust-m.git
@@ -326,3 +309,27 @@
326309
url = https://github.com/NXP/nxp_matter_support.git
327310
branch = master
328311
platforms = nxp
312+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration"]
313+
path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration
314+
url = https://github.com/Infineon/btstack-integration.git
315+
platforms = infineon
316+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p"]
317+
path = third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p
318+
url = https://github.com/Infineon/cat1cm0p.git
319+
platforms = infineon
320+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cmsis"]
321+
path = third_party/infineon/psoc6/psoc6_sdk/libs/cmsis
322+
url = https://github.com/Infineon/cmsis.git
323+
platforms = infineon
324+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction"]
325+
path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction
326+
url = https://github.com/Infineon/ota-bootloader-abstraction.git
327+
platforms = infineon
328+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-update"]
329+
path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-update
330+
url = https://github.com/Infineon/ota-update.git
331+
platforms = infineon
332+
[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration"]
333+
path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
334+
url = https://github.com/Infineon/lwip-network-interface-integration.git
335+
platforms = infineon

‎config/nrfconnect/chip-module/Kconfig

-9
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ config CHIP_NRF_PLATFORM
3434
config CHIP_DEVICE_VENDOR_NAME
3535
default "Nordic Semiconductor ASA"
3636

37-
config CHIP_APP_LOG_LEVEL
38-
int "Logging level in application"
39-
default LOG_DEFAULT_LEVEL
40-
depends on LOG
41-
help
42-
Sets the logging level in the Matter application. Use this configuration
43-
option only within the application. To set the logging level for the
44-
Matter stack, use the MATTER_LOG_LEVEL configuration option.
45-
4637
config CHIP_NFC_COMMISSIONING
4738
bool "Share onboarding payload in NFC tag"
4839
default n

‎config/nxp/chip-module/Kconfig

-9
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ config CHIP_NXP_PLATFORM
3030
config CHIP_DEVICE_VENDOR_NAME
3131
default "NXP Semiconductors"
3232

33-
config CHIP_APP_LOG_LEVEL
34-
int "Logging level in application"
35-
default LOG_DEFAULT_LEVEL
36-
depends on LOG
37-
help
38-
Sets the logging level in the Matter application. Use this configuration
39-
option only within the application. To set the logging level for the
40-
Matter stack, use the MATTER_LOG_LEVEL configuration option.
41-
4233
config CHIP_EXAMPLE_DEVICE_INFO_PROVIDER
4334
bool "Include default device information provider build"
4435
default y

‎config/telink/app/bootloader_usb.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
# USB DFU configuration
1818
CONFIG_USB_DFU_WILL_DETACH=n
19-
CONFIG_BOOT_USB_DFU_GPIO=y
20-
CONFIG_MCUBOOT_INDICATION_LED=y
19+
CONFIG_BOOT_USB_DFU_GPIO=n
20+
CONFIG_MCUBOOT_INDICATION_LED=n

‎config/telink/chip-module/Kconfig

-9
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ if CHIP
2222
config CHIP_DEVICE_VENDOR_NAME
2323
default "Telink Semiconductor"
2424

25-
config CHIP_APP_LOG_LEVEL
26-
int "Logging level in application"
27-
default LOG_DEFAULT_LEVEL
28-
depends on LOG
29-
help
30-
Sets the logging level in the Matter application. Use this configuration
31-
option only within the application. To set the logging level for the
32-
Matter stack, use the MATTER_LOG_LEVEL configuration option.
33-
3425
config CHIP_NFC_COMMISSIONING
3526
bool "Share onboarding payload in NFC tag"
3627
default n

0 commit comments

Comments
 (0)