project-chip · andy31415 · Apr 18, 2023 · Apr 14, 2023
diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
@@ -22,13 +22,15 @@ CONFIG_SERIAL=y
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
 CONFIG_PRINTK=y
-CONFIG_ASSERT=y
+# CONFIG_ASSERT=y
 CONFIG_CBPRINTF_LIBC_SUBSTS=y
 
 # Set the maximum log level (DEBUG)
 CONFIG_LOG_DEFAULT_LEVEL=4
 CONFIG_MATTER_LOG_LEVEL_DBG=y
+CONFIG_MCUBOOT_BOOTUTIL_LIB=y
 CONFIG_MCUBOOT_UTIL_LOG_LEVEL_DBG=y
+CONFIG_NET_LOG=y
 CONFIG_IEEE802154_DRIVER_LOG_LEVEL_DBG=y
 CONFIG_NVS_LOG_LEVEL_DBG=y
 CONFIG_OPENTHREAD_LOG_LEVEL_DEBG=y
@@ -125,10 +127,6 @@ CONFIG_TELINK_B91_REBOOT_ON_FAULT=y
 
 # Shell settings
 CONFIG_SHELL=n
-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
@@ -152,20 +152,20 @@ config CHIP_LOG_SIZE_OPTIMIZATION
 
 config CHIP_BUTTON_MANAGER_IRQ_MODE
 	bool "Use GPIO in an IRQ mode instead of polling the GPIO"
-	default n
+	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. 
 
 config CHIP_ENABLE_APPLICATION_STATUS_LED
 	bool "Enable application status LED"
-	default y
+	default !(PM)
 	help
 	  Enable application status LED.
 
 config CHIP_ENABLE_PM_DURING_BLE
 	bool "Enable PM during BLE operation"
-	default y
+	default PM
 	help
 	  Enable PM during BLE operation.
 
@@ -175,3 +175,7 @@ config CHIP_OPENTHREAD_TX_POWER
 	default 0
 	help
 	  OpenThread Transmission power in dBm.
+
+config SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE
+	int
+	default 255 if SHELL_BACKEND_SERIAL
diff --git a/examples/all-clusters-app/telink/prj.conf b/examples/all-clusters-app/telink/prj.conf
@@ -26,9 +26,7 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
 CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
@@ -63,13 +61,5 @@ CONFIG_CHIP_FACTORY_DATA=n
 CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
 CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/all-clusters-minimal-app/telink/prj.conf b/examples/all-clusters-minimal-app/telink/prj.conf
@@ -23,7 +23,8 @@ CONFIG_GPIO=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
+CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
+CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
 CONFIG_OPENTHREAD_PANID=4660
@@ -52,14 +53,8 @@ CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=y
 # CHIP shell
 CONFIG_CHIP_LIB_SHELL=n
 
-# Disable factory data support. 
+# Disable factory data support.
 CONFIG_CHIP_FACTORY_DATA=n
 CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
-
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
diff --git a/examples/bridge-app/telink/prj.conf b/examples/bridge-app/telink/prj.conf
@@ -26,9 +26,7 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=n
-CONFIG_OPENTHREAD_FTD=y
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
 CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
@@ -64,15 +62,8 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
 CONFIG_PM=n
-CONFIG_PM_DEVICE=n
 
 # Custom RF power values
 CONFIG_B91_BLE_CTRL_RF_POWER_P9P11DBM=y

diff --git a/examples/common/pigweed/telink/PigweedLoggerMutex.h b/examples/common/pigweed/telink/PigweedLoggerMutex.h
@@ -20,7 +20,7 @@
 
 #include "PigweedLogger.h"
 #include "pigweed/RpcService.h"
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 namespace chip {
 namespace rpc {

diff --git a/examples/contact-sensor-app/telink/prj.conf b/examples/contact-sensor-app/telink/prj.conf
@@ -26,10 +26,8 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
-CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
-CONFIG_CHIP_THREAD_SSED=n 
+CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
+CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
 CONFIG_OPENTHREAD_PANID=4660
@@ -63,13 +61,5 @@ CONFIG_CHIP_FACTORY_DATA=n
 CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
-CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
+CONFIG_PM=y
diff --git a/examples/contact-sensor-app/telink/src/AppTask.cpp b/examples/contact-sensor-app/telink/src/AppTask.cpp
@@ -20,8 +20,8 @@
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 

diff --git a/examples/contact-sensor-app/telink/src/ContactSensorManager.cpp b/examples/contact-sensor-app/telink/src/ContactSensorManager.cpp
@@ -24,8 +24,8 @@
 #include <lib/support/CodeUtils.h>
 
 #include <zephyr/drivers/pwm.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 

diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
@@ -26,9 +26,7 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
-CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
+CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
 CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
@@ -64,13 +62,5 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
-CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
+CONFIG_PM=y
diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
@@ -26,9 +26,7 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=n
-CONFIG_OPENTHREAD_FTD=y
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
 CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
@@ -64,16 +62,8 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
 CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
 
 # Custom RF power values
 CONFIG_B91_BLE_CTRL_RF_POWER_P9P11DBM=y

diff --git a/examples/lock-app/telink/prj.conf b/examples/lock-app/telink/prj.conf
@@ -26,9 +26,7 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
-CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
+CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
 CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
@@ -63,13 +61,5 @@ CONFIG_CHIP_FACTORY_DATA=n
 CONFIG_CHIP_FACTORY_DATA_BUILD=n
 CONFIG_CHIP_FACTORY_DATA_MERGE_WITH_FIRMWARE=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
-CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
+CONFIG_PM=y
diff --git a/examples/ota-requestor-app/telink/prj.conf b/examples/ota-requestor-app/telink/prj.conf
@@ -26,9 +26,7 @@ CONFIG_PWM=y
 
 # OpenThread configs
 CONFIG_OPENTHREAD_MTD=y
-CONFIG_OPENTHREAD_FTD=n
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=n
-CONFIG_CHIP_SED_IDLE_INTERVAL=200
 CONFIG_CHIP_THREAD_SSED=n
 
 # Default OpenThread network settings
@@ -63,13 +61,5 @@ CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE=n
 # CHIP shell
 CONFIG_CHIP_LIB_SHELL=n
 
-# Enable Button IRQ mode. The poling mode is used by default.
-CONFIG_CHIP_BUTTON_MANAGER_IRQ_MODE=n
-
-# Disable Status LED.
-CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
-
 # Enable Power Management
 CONFIG_PM=n
-CONFIG_PM_DEVICE=n
-CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/platform/telink/common/include/AppTaskCommon.h b/examples/platform/telink/common/include/AppTaskCommon.h
@@ -30,8 +30,8 @@
 #endif
 
 #include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
 
 #include <platform/CHIPDeviceLayer.h>
 

diff --git a/examples/platform/telink/pw_sys_io/sys_io_telink.cc b/examples/platform/telink/pw_sys_io/sys_io_telink.cc
@@ -20,7 +20,7 @@
 #include "pw_sys_io/sys_io.h"
 #include "zephyr/console/console.h"
 #include <cassert>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #ifdef CONFIG_USB
 #include <zephyr/usb/usb_device.h>

diff --git a/examples/platform/telink/util/include/LEDWidget.h b/examples/platform/telink/util/include/LEDWidget.h
@@ -19,7 +19,7 @@
 
 #include <cstdint>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 class LEDWidget
 {

diff --git a/examples/platform/telink/util/src/ButtonManager.cpp b/examples/platform/telink/util/src/ButtonManager.cpp
@@ -16,13 +16,11 @@
  *    limitations under the License.
  */
 
-#include <assert.h>
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(ButtonManager);
 
@@ -37,7 +35,10 @@ void button_pressed(const struct device * dev, struct gpio_callback * cb, uint32
 
 void Button::Configure(const struct device * port, gpio_pin_t outPin, gpio_pin_t inPin, void (*callback)(void))
 {
-    __ASSERT(device_is_ready(port), "%s is not ready\n", port->name);
+    if (!device_is_ready(port))
+    {
+        LOG_ERR("%s is not ready\n", port->name);
+    }
 
     mPort     = port;
     mOutPin   = outPin;
@@ -207,7 +208,10 @@ void Button::PollIRQ()
 
 void Button::Configure(const struct device * port, gpio_pin_t inPin, void (*callback)(void))
 {
-    __ASSERT(device_is_ready(port), "%s is not ready\n", port->name);
+    if (!device_is_ready(port))
+    {
+        LOG_ERR("%s is not ready\n", port->name);
+    }
 
     mPort     = port;
     mInPin    = inPin;