Skip to content

Commit 98235b2

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/re-invent-app-installation-flow
2 parents 456adc1 + 9d56786 commit 98235b2

File tree

297 files changed

+12068
-3560
lines changed

Some content is hidden

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

297 files changed

+12068
-3560
lines changed

‎.clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Checks: >
1212
readability-redundant-string-init,
1313
-bugprone-assignment-in-if-condition,
1414
-bugprone-branch-clone,
15+
-bugprone-casting-through-void, #TODO remove this after fixing issues in source code, issue 34008
1516
-bugprone-copy-constructor-init,
1617
-bugprone-easily-swappable-parameters,
1718
-bugprone-forward-declaration-namespace,

‎.github/workflows/chef.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

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

104104
steps:
@@ -110,7 +110,7 @@ jobs:
110110
platform: telink
111111
# - name: Update Zephyr to specific revision (for developers purpose)
112112
# shell: bash
113-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
113+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
114114
- name: CI Examples Telink
115115
shell: bash
116116
run: |

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
name: EFR32
3434

3535
env:
36-
SILABS_BOARD: BRD4161A
36+
SILABS_BOARD: BRD4187C
3737
BUILD_TYPE: gn_efr32
3838

3939
runs-on: ubuntu-latest

‎.github/workflows/examples-telink.yaml

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

@@ -57,7 +57,7 @@ jobs:
5757
gh-context: ${{ toJson(github) }}
5858

5959
# - name: Update Zephyr to specific revision (for developers purpose)
60-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
60+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
6161

6262
- name: Build example Telink (B92 retention) Air Quality Sensor App
6363
run: |

‎.github/workflows/release_artifacts.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
efr32:
5959
name: EFR32
6060
env:
61-
SILABS_BOARD: BRD4161A
62-
BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
61+
SILABS_BOARD: BRD4187C
62+
BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
6363

6464
runs-on: ubuntu-latest
6565

‎.github/workflows/tests.yaml

+49-38
Large diffs are not rendered by default.

‎.gitmodules

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252
[submodule "third_party/boringssl/repo/src"]
253253
path = third_party/boringssl/repo/src
254254
url = https://github.com/google/boringssl.git
255+
branch = master
255256
[submodule "third_party/mt793x_sdk/filogic"]
256257
path = third_party/mt793x_sdk/filogic
257258
url = https://github.com/MediaTek-Labs/genio-matter-bsp.git

‎.pullapprove.yml

+8
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,14 @@ groups:
133133
teams: [reviewers-google]
134134
reviews:
135135
request: 10
136+
shared-reviewers-grundfos:
137+
type: optional
138+
conditions:
139+
- files.include('*')
140+
reviewers:
141+
teams: [reviewers-grundfos]
142+
reviews:
143+
request: 10
136144
shared-reviewers-irobot:
137145
type: optional
138146
conditions:

‎.vscode/tasks.json

+12-48
Original file line numberDiff line numberDiff line change
@@ -557,54 +557,18 @@
557557
"bouffalolab-xt-zb6-devkit-light",
558558
"bouffalolab-xt-zb6-devkit-light-rpc-115200",
559559
"bouffalolab-bl706-night-light-light",
560-
"efr32-brd4161a-light",
561-
"efr32-brd4163a-light",
562-
"efr32-brd4164a-light",
563-
"efr32-brd4166a-light",
564-
"efr32-brd4170a-light",
565-
"efr32-brd4186a-light",
566-
"efr32-brd4187a-light",
567-
"efr32-brd4304a-light",
568-
"efr32-brd4161a-light-rpc",
569-
"efr32-brd4163a-light-rpc",
570-
"efr32-brd4164a-light-rpc",
571-
"efr32-brd4166a-light-rpc",
572-
"efr32-brd4170a-light-rpc",
573-
"efr32-brd4186a-light-rpc",
574-
"efr32-brd4187a-light-rpc",
575-
"efr32-brd4304a-light-rpc",
576-
"efr32-brd4161a-lock",
577-
"efr32-brd4163a-lock",
578-
"efr32-brd4164a-lock",
579-
"efr32-brd4166a-lock",
580-
"efr32-brd4170a-lock",
581-
"efr32-brd4186a-lock",
582-
"efr32-brd4187a-lock",
583-
"efr32-brd4304a-lock",
584-
"efr32-brd4161a-unit-test",
585-
"efr32-brd4163a-unit-test",
586-
"efr32-brd4164a-unit-test",
587-
"efr32-brd4166a-unit-test",
588-
"efr32-brd4170a-unit-test",
589-
"efr32-brd4186a-unit-test",
590-
"efr32-brd4187a-unit-test",
591-
"efr32-brd4304a-unit-test",
592-
"efr32-brd4161a-switch",
593-
"efr32-brd4163a-switch",
594-
"efr32-brd4164a-switch",
595-
"efr32-brd4166a-switch",
596-
"efr32-brd4170a-switch",
597-
"efr32-brd4186a-switch",
598-
"efr32-brd4187a-switch",
599-
"efr32-brd4304a-switch",
600-
"efr32-brd4161a-window-covering",
601-
"efr32-brd4163a-window-covering",
602-
"efr32-brd4164a-window-covering",
603-
"efr32-brd4166a-window-covering",
604-
"efr32-brd4170a-window-covering",
605-
"efr32-brd4186a-window-covering",
606-
"efr32-brd4187a-window-covering",
607-
"efr32-brd4304a-window-covering",
560+
"efr32-brd4186c-light",
561+
"efr32-brd4186c-light-rpc",
562+
"efr32-brd4186c-lock",
563+
"efr32-brd4186c-unit-test",
564+
"efr32-brd4186c-switch",
565+
"efr32-brd4186c-window-covering",
566+
"efr32-brd4187c-light",
567+
"efr32-brd4187c-light-rpc",
568+
"efr32-brd4187c-lock",
569+
"efr32-brd4187c-unit-test",
570+
"efr32-brd4187c-switch",
571+
"efr32-brd4187c-window-covering",
608572
"efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
609573
"esp32-c3devkit-all-clusters",
610574
"esp32-devkitc-all-clusters",

‎BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
161161
"${chip_root}/examples/shell/standalone:chip-shell",
162162
"${chip_root}/src/app/tests/integration:chip-im-initiator",
163163
"${chip_root}/src/app/tests/integration:chip-im-responder",
164+
"${chip_root}/src/inet/tests:inet-layer-test-tool",
164165
"${chip_root}/src/lib/address_resolve:address-resolve-tool",
165166
"${chip_root}/src/messaging/tests/echo:chip-echo-requester",
166167
"${chip_root}/src/messaging/tests/echo:chip-echo-responder",

‎build/chip/tests.gni

100644100755
+3-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717

18+
import("${chip_root}/build/chip/tools.gni")
1819
import("${chip_root}/src/platform/device.gni")
1920

2021
declare_args() {
@@ -40,6 +41,6 @@ declare_args() {
4041
}
4142

4243
declare_args() {
43-
# Enable use of nlfaultinjection.
44-
chip_with_nlfaultinjection = chip_build_tests
44+
# Enable use of nlfaultinjection when building tests or when building tools.
45+
chip_with_nlfaultinjection = chip_build_tests || chip_build_tools
4546
}

‎config/common/cmake/chip_gn.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ macro(matter_build target)
158158
${CHIP_ROOT}/src/include
159159
${CHIP_ROOT}/third_party/nlassert/repo/include
160160
${CHIP_ROOT}/third_party/nlio/repo/include
161+
${CHIP_ROOT}/third_party/nlfaultinjection/include
161162
${CHIP_ROOT}/zzz_generated/app-common
162163
${CMAKE_CURRENT_BINARY_DIR}/gen/include
163164
)

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

+16-15
Original file line numberDiff line numberDiff line change
@@ -95,39 +95,40 @@ matter_add_gn_arg_bool ("chip_logging" CONFIG_LOG)
9595
matter_add_gn_arg_bool ("chip_enable_openthread" CONFIG_NET_L2_OPENTHREAD)
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)
98-
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_NET_IPV4)
98+
matter_add_gn_arg_bool ("chip_inet_config_enable_ipv4" CONFIG_CHIP_IPV4)
9999
matter_add_gn_arg_bool ("chip_enable_nfc" CONFIG_CHIP_NFC_COMMISSIONING)
100100
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
101-
matter_add_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS)
101+
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)
103103
matter_add_gn_arg_bool ("chip_progress_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)
104104
matter_add_gn_arg_bool ("chip_detail_logging" CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
105105
matter_add_gn_arg_bool ("chip_automation_logging" FALSE)
106106
matter_add_gn_arg_bool ("chip_enable_wifi" CONFIG_WIFI_W91)
107107
matter_add_gn_arg_bool ("chip_enable_icd_server" CONFIG_CHIP_ENABLE_ICD_SUPPORT)
108+
matter_add_gn_arg_bool ("chip_enable_factory_data" CONFIG_CHIP_FACTORY_DATA)
109+
matter_add_gn_arg_bool ("chip_mdns_minimal" CONFIG_WIFI_W91)
110+
matter_add_gn_arg_bool ("chip_mdns_platform" CONFIG_NET_L2_OPENTHREAD)
108111

109112
if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
110-
matter_add_gn_arg_bool ("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
111-
matter_add_gn_arg_bool ("chip_enable_icd_checkin" CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
112-
matter_add_gn_arg_bool ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
113+
matter_add_gn_arg_bool ("chip_enable_icd_lit" CONFIG_CHIP_ICD_LIT_SUPPORT)
114+
matter_add_gn_arg_bool ("chip_enable_icd_checkin" CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
115+
matter_add_gn_arg_bool ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
113116
endif()
114117

115-
if (CONFIG_CHIP_FACTORY_DATA)
116-
matter_add_gn_arg_bool ("chip_use_transitional_commissionable_data_provider" "false")
117-
matter_add_gn_arg_bool ("chip_enable_factory_data" "true")
118-
elseif (CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
119-
matter_add_gn_arg_bool ("chip_use_transitional_commissionable_data_provider" "false")
118+
if (CONFIG_CHIP_FACTORY_DATA OR CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
119+
matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider" FALSE)
120+
matter_add_gn_arg_bool("chip_use_transitional_device_instance_info_provider" FALSE)
120121
endif()
121122

122123
if (CONFIG_CHIP_ROTATING_DEVICE_ID)
123-
matter_add_gn_arg_bool("chip_enable_rotating_device_id" "true")
124-
matter_add_gn_arg_bool("chip_enable_additional_data_advertising" "true")
124+
matter_add_gn_arg_bool("chip_enable_rotating_device_id" TRUE)
125+
matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
125126
endif()
126127

127-
if (CONFIG_NET_L2_OPENTHREAD)
128-
matter_add_gn_arg_string("chip_mdns" "platform")
129-
elseif(CONFIG_WIFI_W91)
128+
if(CONFIG_WIFI_W91)
130129
matter_add_gn_arg_string("chip_mdns" "minimal")
130+
elseif (CONFIG_NET_L2_OPENTHREAD)
131+
matter_add_gn_arg_string("chip_mdns" "platform")
131132
else()
132133
matter_add_gn_arg_string("chip_mdns" "none")
133134
endif()

‎config/telink/chip-module/Kconfig

+10-1
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,18 @@ config CHIP_LOG_SIZE_OPTIMIZATION
178178
full configuration enabled by this option in the
179179
platform/telink/CHIPPlatformConfig.h file.
180180

181+
config CHIP_IPV4
182+
bool "IPv4 support for Matter"
183+
default n
184+
depends on NET_IPV4
185+
help
186+
If disabled, it allows to build Telink SDK application
187+
with IPv4 support independently of the Matter stack still
188+
running over IPv6.
189+
181190
config CHIP_BUTTON_MANAGER_IRQ_MODE
182191
bool "Use GPIO in an IRQ mode instead of polling the GPIO"
183-
default PM || BOARD_TLSR9118BDK40D
192+
default PM
184193
help
185194
Use GPIO in an IRQ mode to avoid button polling loop and extend the battery lifetime by waking up by GPIO event.
186195
GPIO events are working only with GPIO IRQ. This option changes button matrix configuration.

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

+26-6
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ choice LOG_MODE
3434
endchoice
3535

3636
choice MATTER_LOG_LEVEL_CHOICE
37-
default MATTER_LOG_LEVEL_INF
37+
default MATTER_LOG_LEVEL_DBG
3838
endchoice
3939

4040
config CHIP_APP_LOG_LEVEL
41-
default 3 # info
41+
default 4 # debug
4242

4343
config LOG_DEFAULT_LEVEL
4444
default 1 # error
@@ -108,7 +108,6 @@ config GPIO
108108
# Bluetooth Low Energy configs
109109

110110
config BT
111-
default n if BOARD_TLSR9118BDK40D
112111
default y
113112

114113
if BT
@@ -138,10 +137,12 @@ config BT_BUF_ACL_TX_SIZE
138137
default 251
139138

140139
config BT_RX_STACK_SIZE
141-
default 810
140+
default 810 if BT_B9X
141+
default 2048 if BT_W91
142142

143143
config BT_HCI_TX_STACK_SIZE
144-
default 640
144+
default 640 if BT_B9X
145+
default 2048 if BT_W91
145146

146147
config BT_DEVICE_NAME_GATT_WRITABLE
147148
bool
@@ -300,13 +301,32 @@ config CHIP_WIFI
300301
select WIFI_W91
301302
select WIFI
302303
select NET_STATISTICS
303-
select NET_L2_ETHERNET
304304
select NET_IPV6_ND # enable Neighbor Discovery to handle Router Advertisements
305305
select NET_IPV6_NBR_CACHE
306306
select NET_STATISTICS_USER_API
307+
# select NET_IPV4 # TODO: remove IPv4 when IPv6 will be ready (see CHIP_IPV4)
308+
# select NET_CONFIG_NEED_IPV4
309+
# select NET_DHCPV4
307310

308311
if CHIP_WIFI
309312

313+
config DEFAULT_WIFI_SSID
314+
string "Default WiFi SSID"
315+
depends on CHIP_WIFI
316+
default ""
317+
help
318+
The SSID of network to connect to if no WiFi station configuration exists in NV storage
319+
at the time the device boots.
320+
This option is for testing only and should be disabled in production releases
321+
322+
config DEFAULT_WIFI_PASSWORD
323+
string "Default WiFi Password"
324+
depends on CHIP_WIFI
325+
default ""
326+
help
327+
The password for the default WiFi network.
328+
This option is for testing only and should be disabled in production releases.
329+
310330
config CHIP_WIFI_CONNECTION_RECOVERY_MINIMUM_INTERVAL
311331
int "Define the minimum connection recovery time interval in milliseconds"
312332
depends on CHIP_WIFI

‎credentials/development/gen_commissioner_dut_test_plan_table.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ def main():
8686
with open(path, 'r') as f:
8787
j = json.loads(f.read())
8888
success_expected = j['is_success_case'].lower() == 'true'
89-
pid = 177 if 'fallback_encoding' in p else 32768
90-
desc = TestInfo(desc=j['description'], dir=p, pid=pid)
89+
desc = TestInfo(desc=j['description'], dir=p, pid=int(j['basic_info_pid']))
9190
if success_expected:
9291
success_cases.append(desc)
9392
else:

0 commit comments

Comments
 (0)