Skip to content

Commit 5179595

Browse files
gmarcosbgmarcosb
authored
Merge branch 'project-chip:master' into camera-webrtc-server
2 parents 1de3906 + c389092 commit 5179595

File tree

183 files changed

+3566
-1348
lines changed

Some content is hidden

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

183 files changed

+3566
-1348
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1+
2+
#### Testing
3+
14
> !!!!!!!!!! Please delete the instructions below and replace with PR
2-
> description
5+
> description above.
36
>
47
> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
58
> change description
69
>
710
> If you do not have an issue number, please have a good description of the
811
> problem and the fix. Help the reviewer understand what to expect.
912
>
10-
> Complete/append to the `### Testing` section below, to describe how testing
13+
> Complete/append to the `### Testing` section above, to describe how testing
1114
> was done. See
1215
> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
1316
>
1417
> Make sure you delete these instructions (to prove you have read them).
1518
>
1619
> !!!!!!!!!! Instructions end
17-
18-
#### Testing

‎.github/workflows/build.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,8 @@ jobs:
363363
python -m ensurepip --upgrade
364364
python -m pip install -r scripts/setup/requirements.setuppayload.txt
365365
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
366+
- name: Run revocation set generation tests
367+
run: scripts/run_in_build_env.sh 'python3 -m unittest -v credentials/generate_revocation_set.py'
366368

367369
build_linux_python_lighting_device:
368370
name: Build on Linux (python lighting-app)

‎.github/workflows/examples-efr32.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:94
44+
image: ghcr.io/project-chip/chip-build-efr32:95
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

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

+4
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,10 @@ if (CONFIG_OPENTHREAD_BORDER_ROUTER)
432432
list(APPEND matter_requires espressif__esp_rcp_update)
433433
endif()
434434

435+
if (CONFIG_SEC_CERT_DAC_PROVIDER)
436+
list(APPEND matter_requires espressif__esp_secure_cert_mgr)
437+
endif()
438+
435439
add_prebuilt_library(matterlib "${CMAKE_CURRENT_BINARY_DIR}/lib/libCHIP.a"
436440
REQUIRES ${matter_requires})
437441

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})
8888
# Set up custom OpenThread configuration
8989

9090
if (CONFIG_CHIP_OPENTHREAD_CONFIG)
91-
get_filename_component(CHIP_OPENTHREAD_CONFIG
91+
get_filename_component(CHIP_OPENTHREAD_CONFIG
9292
${CONFIG_CHIP_OPENTHREAD_CONFIG}
9393
REALPATH
9494
BASE_DIR ${CMAKE_SOURCE_DIR}
@@ -125,7 +125,7 @@ matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_
125125
matter_add_gn_arg_bool ("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
126126
matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
127127
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
128-
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
128+
matter_add_gn_arg_bool ("chip_enable_nfc_onboarding_payload" CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD)
129129
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
130130
matter_add_gn_arg_bool ("chip_persist_subscriptions" CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS)
131131
matter_add_gn_arg_bool ("chip_monolithic_tests" CONFIG_CHIP_BUILD_TESTS)

‎config/nrfconnect/chip-module/Kconfig

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

37-
config CHIP_NFC_COMMISSIONING
37+
config CHIP_NFC_ONBOARDING_PAYLOAD
3838
bool "Share onboarding payload in NFC tag"
3939
default n
4040
imply NFC_T2T_NRFXLIB

‎config/nrfconnect/chip-module/Kconfig.defaults

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ config MPSL_FEM_NRF21540_RUNTIME_PA_GAIN_CONTROL
178178
default y if MPSL_FEM
179179

180180
# ==============================================================================
181-
# NFC configuration
181+
# NFC Onboarding Payload configuration
182182
# ==============================================================================
183183

184-
config CHIP_NFC_COMMISSIONING
184+
config CHIP_NFC_ONBOARDING_PAYLOAD
185185
default y
186186

187187
# Disable not needed NFC callback to save flash

‎config/qpg/chip-gn/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ lwip_debug = false
2424
chip_enable_openthread = true
2525
chip_config_network_layer_ble = true
2626
chip_inet_config_enable_ipv4 = false
27-
chip_enable_nfc = false
27+
chip_enable_nfc_onboarding_payload = false
2828
chip_build_tests = false
2929
chip_monolithic_tests = false
3030
chip_inet_config_enable_tcp_endpoint = false

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<telink-mbedtls-config.h>)
6969
# Set up custom OpenThread configuration
7070

7171
if (CONFIG_CHIP_OPENTHREAD_CONFIG)
72-
get_filename_component(CHIP_OPENTHREAD_CONFIG
72+
get_filename_component(CHIP_OPENTHREAD_CONFIG
7373
${CONFIG_CHIP_OPENTHREAD_CONFIG}
7474
REALPATH
7575
BASE_DIR ${CMAKE_SOURCE_DIR}
@@ -96,7 +96,7 @@ matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_
9696
matter_add_gn_arg_bool ("chip_openthread_ftd" CONFIG_OPENTHREAD_FTD)
9797
matter_add_gn_arg_bool ("chip_config_network_layer_ble" CONFIG_BT)
9898
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
99-
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
99+
matter_add_gn_arg_bool ("chip_enable_nfc_onboarding_payload" CONFIG_CHIP_NFC_ONBOARDING_PAYLOAD)
100100
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
101101
matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" FALSE)
102102
matter_add_gn_arg_bool ("chip_error_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)

‎config/telink/chip-module/Kconfig

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

25-
config CHIP_NFC_COMMISSIONING
25+
config CHIP_NFC_ONBOARDING_PAYLOAD
2626
bool "Share onboarding payload in NFC tag"
2727
default n
2828
imply I2C

‎config/zephyr/Kconfig

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ menuconfig CHIP
3030
imply NET_IPV6
3131
imply NET_CONFIG_NEED_IPV6
3232
imply NET_SOCKETS
33-
imply NET_SOCKETS_POSIX_NAMES if !ARCH_POSIX && CHIP_NRF_PLATFORM
3433
imply NETWORKING
3534
imply HWINFO
3635
imply FLASH

0 commit comments

Comments
 (0)