Merge branch 'master' into telink_image_update

s07641069 · Jun 21, 2024 · 128f403 · 128f403
2 parents 2d23046 + 9d56786
commit 128f403
Show file tree

Hide file tree

Showing 128 changed files with 1,535 additions and 2,070 deletions.
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -110,7 +110,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
             - name: CI Examples Telink
               shell: bash
               run: |

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -33,7 +33,7 @@ jobs:
     name: EFR32
 
     env:
-      SILABS_BOARD: BRD4161A
+      SILABS_BOARD: BRD4187C
       BUILD_TYPE: gn_efr32
 
     runs-on: ubuntu-latest

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -57,7 +57,7 @@ jobs:
                 gh-context: ${{ toJson(github) }}
 
             # - name: Update Zephyr to specific revision (for developers purpose)
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -58,8 +58,8 @@ jobs:
     efr32:
         name: EFR32
         env:
-            SILABS_BOARD: BRD4161A
-            BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
+            SILABS_BOARD: BRD4187C
+            BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
 
         runs-on: ubuntu-latest
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -557,54 +557,18 @@
                 "bouffalolab-xt-zb6-devkit-light",
                 "bouffalolab-xt-zb6-devkit-light-rpc-115200",
                 "bouffalolab-bl706-night-light-light",
-                "efr32-brd4161a-light",
-                "efr32-brd4163a-light",
-                "efr32-brd4164a-light",
-                "efr32-brd4166a-light",
-                "efr32-brd4170a-light",
-                "efr32-brd4186a-light",
-                "efr32-brd4187a-light",
-                "efr32-brd4304a-light",
-                "efr32-brd4161a-light-rpc",
-                "efr32-brd4163a-light-rpc",
-                "efr32-brd4164a-light-rpc",
-                "efr32-brd4166a-light-rpc",
-                "efr32-brd4170a-light-rpc",
-                "efr32-brd4186a-light-rpc",
-                "efr32-brd4187a-light-rpc",
-                "efr32-brd4304a-light-rpc",
-                "efr32-brd4161a-lock",
-                "efr32-brd4163a-lock",
-                "efr32-brd4164a-lock",
-                "efr32-brd4166a-lock",
-                "efr32-brd4170a-lock",
-                "efr32-brd4186a-lock",
-                "efr32-brd4187a-lock",
-                "efr32-brd4304a-lock",
-                "efr32-brd4161a-unit-test",
-                "efr32-brd4163a-unit-test",
-                "efr32-brd4164a-unit-test",
-                "efr32-brd4166a-unit-test",
-                "efr32-brd4170a-unit-test",
-                "efr32-brd4186a-unit-test",
-                "efr32-brd4187a-unit-test",
-                "efr32-brd4304a-unit-test",
-                "efr32-brd4161a-switch",
-                "efr32-brd4163a-switch",
-                "efr32-brd4164a-switch",
-                "efr32-brd4166a-switch",
-                "efr32-brd4170a-switch",
-                "efr32-brd4186a-switch",
-                "efr32-brd4187a-switch",
-                "efr32-brd4304a-switch",
-                "efr32-brd4161a-window-covering",
-                "efr32-brd4163a-window-covering",
-                "efr32-brd4164a-window-covering",
-                "efr32-brd4166a-window-covering",
-                "efr32-brd4170a-window-covering",
-                "efr32-brd4186a-window-covering",
-                "efr32-brd4187a-window-covering",
-                "efr32-brd4304a-window-covering",
+                "efr32-brd4186c-light",
+                "efr32-brd4186c-light-rpc",
+                "efr32-brd4186c-lock",
+                "efr32-brd4186c-unit-test",
+                "efr32-brd4186c-switch",
+                "efr32-brd4186c-window-covering",
+                "efr32-brd4187c-light",
+                "efr32-brd4187c-light-rpc",
+                "efr32-brd4187c-lock",
+                "efr32-brd4187c-unit-test",
+                "efr32-brd4187c-switch",
+                "efr32-brd4187c-window-covering",
                 "efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
                 "esp32-c3devkit-all-clusters",
                 "esp32-devkitc-all-clusters",

diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
@@ -95,39 +95,40 @@ matter_add_gn_arg_bool  ("chip_logging"                           CONFIG_LOG)
 matter_add_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTHREAD)
 matter_add_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)
 matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
-matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
+matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_CHIP_IPV4)
 matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
-matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)
+matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   FALSE)
 matter_add_gn_arg_bool  ("chip_error_logging"                     CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)
 matter_add_gn_arg_bool  ("chip_progress_logging"                  CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)
 matter_add_gn_arg_bool  ("chip_detail_logging"                    CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
 matter_add_gn_arg_bool  ("chip_automation_logging"                FALSE)
 matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_W91)
 matter_add_gn_arg_bool  ("chip_enable_icd_server"                 CONFIG_CHIP_ENABLE_ICD_SUPPORT)
+matter_add_gn_arg_bool  ("chip_enable_factory_data"               CONFIG_CHIP_FACTORY_DATA)
+matter_add_gn_arg_bool  ("chip_mdns_minimal"                      CONFIG_WIFI_W91)
+matter_add_gn_arg_bool  ("chip_mdns_platform"                     CONFIG_NET_L2_OPENTHREAD)
 
 if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
-    matter_add_gn_arg_bool  ("chip_enable_icd_lit"                      CONFIG_CHIP_ICD_LIT_SUPPORT)
-    matter_add_gn_arg_bool  ("chip_enable_icd_checkin"                  CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
-    matter_add_gn_arg_bool  ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
+    matter_add_gn_arg_bool  ("chip_enable_icd_lit"                       CONFIG_CHIP_ICD_LIT_SUPPORT)
+    matter_add_gn_arg_bool  ("chip_enable_icd_checkin"                   CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
+    matter_add_gn_arg_bool  ("chip_enable_icd_user_active_mode_trigger"  CONFIG_CHIP_ICD_UAT_SUPPORT)
 endif()
 
-if (CONFIG_CHIP_FACTORY_DATA)
-    matter_add_gn_arg_bool  ("chip_use_transitional_commissionable_data_provider"  "false")
-    matter_add_gn_arg_bool  ("chip_enable_factory_data"                            "true")
-elseif (CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
-    matter_add_gn_arg_bool  ("chip_use_transitional_commissionable_data_provider"  "false")
+if (CONFIG_CHIP_FACTORY_DATA OR CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
+    matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider"  FALSE)
+    matter_add_gn_arg_bool("chip_use_transitional_device_instance_info_provider" FALSE)
 endif()
 
 if (CONFIG_CHIP_ROTATING_DEVICE_ID)
-    matter_add_gn_arg_bool("chip_enable_rotating_device_id"          "true")
-    matter_add_gn_arg_bool("chip_enable_additional_data_advertising" "true")
+    matter_add_gn_arg_bool("chip_enable_rotating_device_id"          TRUE)
+    matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
 endif()
 
-if (CONFIG_NET_L2_OPENTHREAD)
-    matter_add_gn_arg_string("chip_mdns" "platform")
-elseif(CONFIG_WIFI_W91)
+if(CONFIG_WIFI_W91)
     matter_add_gn_arg_string("chip_mdns" "minimal")
+elseif (CONFIG_NET_L2_OPENTHREAD)
+    matter_add_gn_arg_string("chip_mdns" "platform")
 else()
     matter_add_gn_arg_string("chip_mdns" "none")
 endif()

diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
@@ -178,9 +178,18 @@ config CHIP_LOG_SIZE_OPTIMIZATION
 	  full configuration enabled by this option in the
 	  platform/telink/CHIPPlatformConfig.h file.
 
+config CHIP_IPV4
+	bool "IPv4 support for Matter"
+	default n
+	depends on NET_IPV4
+	help
+	  If disabled, it allows to build Telink SDK application
+	  with IPv4 support independently of the Matter stack still
+	  running over IPv6.
+
 config CHIP_BUTTON_MANAGER_IRQ_MODE
 	bool "Use GPIO in an IRQ mode instead of polling the GPIO"
-	default PM || BOARD_TLSR9118BDK40D
+	default PM
 	help
 	  Use GPIO in an IRQ mode to avoid button polling loop and extend the battery lifetime by waking up by GPIO event. 
 	  GPIO events are working only with GPIO IRQ. This option changes button matrix configuration. 

diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -34,11 +34,11 @@ choice LOG_MODE
 endchoice
 
 choice MATTER_LOG_LEVEL_CHOICE
-    default MATTER_LOG_LEVEL_INF
+    default MATTER_LOG_LEVEL_DBG
 endchoice
 
 config CHIP_APP_LOG_LEVEL
-    default 3 # info
+    default 4 # debug
 
 config LOG_DEFAULT_LEVEL
     default 1 # error
@@ -108,7 +108,6 @@ config GPIO
 # Bluetooth Low Energy configs
 
 config BT
-    default n if BOARD_TLSR9118BDK40D
     default y
 
 if BT
@@ -138,10 +137,12 @@ config BT_BUF_ACL_TX_SIZE
     default 251
 
 config BT_RX_STACK_SIZE
-    default 810
+    default 810 if BT_B9X
+    default 2048 if BT_W91
 
 config BT_HCI_TX_STACK_SIZE
-    default 640
+    default 640 if BT_B9X
+    default 2048 if BT_W91
 
 config BT_DEVICE_NAME_GATT_WRITABLE
     bool
@@ -300,13 +301,32 @@ config CHIP_WIFI
 	select WIFI_W91
 	select WIFI
 	select NET_STATISTICS
-	select NET_L2_ETHERNET
 	select NET_IPV6_ND # enable Neighbor Discovery to handle Router Advertisements
 	select NET_IPV6_NBR_CACHE
 	select NET_STATISTICS_USER_API
+#	select NET_IPV4 # TODO: remove IPv4 when IPv6 will be ready (see CHIP_IPV4)
+#	select NET_CONFIG_NEED_IPV4
+#	select NET_DHCPV4
 
 if CHIP_WIFI
 
+config DEFAULT_WIFI_SSID
+	string "Default WiFi SSID"
+	depends on CHIP_WIFI
+	default ""
+	help
+	  The SSID of network to connect to if no WiFi station configuration exists in NV storage
+	  at the time the device boots.
+	  This option is for testing only and should be disabled in production releases
+
+config DEFAULT_WIFI_PASSWORD
+	string "Default WiFi Password"
+	depends on CHIP_WIFI
+	default ""
+	help
+	  The password for the default WiFi network.
+	  This option is for testing only and should be disabled in production releases.
+
 config CHIP_WIFI_CONNECTION_RECOVERY_MINIMUM_INTERVAL
 	int "Define the minimum connection recovery time interval in milliseconds"
 	depends on CHIP_WIFI

diff --git a/examples/chef/sample_app_util/README.md b/examples/chef/sample_app_util/README.md
@@ -96,7 +96,7 @@ The list of platforms supported here (as of writing this) are:
 
 ```
 m5stack
-brd4161a
+brd4187c
 nrf52840dk
 linux_x86
 ```
@@ -105,7 +105,7 @@ For example, here are some valid names:
 
 ```
 m5stack_rootnode_humiditysensor_pv0comNKyT
-brd4161a_rootnode_humiditysensor_pv0comNKyT
+brd4187c_rootnode_humiditysensor_pv0comNKyT
 nrf52840dk_rootnode_humiditysensor_pv0comNKyT
 linux_x86_rootnode_humiditysensor_pv0comNKyT
 ```

diff --git a/examples/light-switch-app/silabs/README.md b/examples/light-switch-app/silabs/README.md
@@ -1,6 +1,6 @@
 # Matter EFR32 Light Switch Example
 
-An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
+An example showing the use of CHIP on the Silicon Labs EFR32 MG24.
 
 <hr>
 
@@ -79,22 +79,6 @@ Silicon Labs platform.
         > [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
         > in the Silicon Labs Matter Github Repo
 
-    MG12 boards:
-
-    -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
-    -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
-        915MHz@19dBm
-    -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
-
-    MG21 boards: Currently not supported due to RAM limitation.
-
-    -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
     MG24 boards :
 
     -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
@@ -212,17 +196,11 @@ combination with JLinkRTTClient as follows:
 
 -   Run the JLinkExe tool with arguments to autoconnect to the WSTK board:
 
-    For MG12 use:
-
-          $ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
-
-    For MG21 use:
-
-          $ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
-
     For MG24 use:
 
+          ```
           $ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
+          ```
 
 -   In a second terminal, run the JLinkRTTClient to view logs:
 

diff --git a/examples/lighting-app/silabs/README.md b/examples/lighting-app/silabs/README.md
@@ -1,6 +1,6 @@
 # Matter EFR32 Lighting Example
 
-An example showing the use of CHIP on the Silicon Labs EFR32 MG12 and MG24.
+An example showing the use of CHIP on the Silicon Labs EFR32 MG24.
 
 <hr>
 
@@ -73,22 +73,6 @@ Silicon Labs platform.
         > [Hardware Requirements](https://github.com/SiliconLabs/matter/blob/latest/docs/silabs/general/HARDWARE_REQUIREMENTS.md)
         > in the Silicon Labs Matter Github Repo
 
-    MG12 boards:
-
-    -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
-    -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
-        915MHz@19dBm
-    -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
-
-    MG21 boards: Currently not supported due to RAM limitation.
-
-    -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
     MG24 boards :
 
     -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
@@ -202,13 +186,11 @@ combination with JLinkRTTClient as follows:
 
 -   Run the JLinkExe tool with arguments to autoconnect to the WSTK board:
 
-    For MG12 use:
-
-          $ JLinkExe -device EFR32MG12PXXXF1024 -if JTAG -speed 4000 -autoconnect 1
-
-    For MG21 use:
+    For MG24 use:
 
-          $ JLinkExe -device EFR32MG21AXXXF1024 -if SWD -speed 4000 -autoconnect 1
+          ```
+          $ JLinkExe -device EFR32MG24AXXXF1536 -if SWD -speed 4000 -autoconnect 1
+          ```
 
 -   In a second terminal, run the JLinkRTTClient to view logs: