Merge branch 'master' into ci_update_0.7.0

project-chip · Apr 6, 2023 · 2685551 · 2685551
2 parents 7fd0b2d + 14ffac0
commit 2685551
Show file tree

Hide file tree

Showing 86 changed files with 4,909 additions and 4,261 deletions.
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.7.0
+            image: connectedhomeip/chip-build-telink:0.6.53
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
@@ -129,3 +129,6 @@ CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=255
 
 # Legacy
 CONFIG_LEGACY_INCLUDE_PATH=y
+
+# BLE MAC address
+CONFIG_B91_BLE_CTRL_MAC_FLASH_ADDR=0x1FE000
diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
@@ -168,3 +168,10 @@ config CHIP_ENABLE_PM_DURING_BLE
 	default y
 	help
 	  Enable PM during BLE operation.
+
+config CHIP_OPENTHREAD_TX_POWER
+	int "OpenThread Transmission power"
+	range -30 9
+	default 0
+	help
+	  OpenThread Transmission power in dBm.