From 1e2204a108c46f6f73d3c00acacf333b567cb513 Mon Sep 17 00:00:00 2001 From: interfer Date: Wed, 1 Nov 2023 17:28:07 +0200 Subject: [PATCH 1/2] [Telink] Fixed hanging on BLE Shutdown (TC-SC-4.1) Refactored BLE shutdown condition to pass test TC-SC-4.1. Device would become stuck at scheduler routines after open-basic-commissioning-window time expires. Signed-off-by: Dmytro Huz --- src/platform/telink/BLEManagerImpl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp index c0fb4998645df7..14c870cb7bc5df 100644 --- a/src/platform/telink/BLEManagerImpl.cpp +++ b/src/platform/telink/BLEManagerImpl.cpp @@ -180,8 +180,10 @@ CHIP_ERROR BLEManagerImpl::_Init(void) void BLEManagerImpl::_Shutdown() { - bt_disable(); - mBLERadioInitialized = false; + if (mBLERadioInitialized) { + bt_disable(); + mBLERadioInitialized = false; + } } void BLEManagerImpl::DriveBLEState(intptr_t arg) From 2e3bde6c11ecb15a97582fd0b7dbc6e24897a77f Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 1 Nov 2023 15:33:18 +0000 Subject: [PATCH 2/2] Restyled by clang-format --- src/platform/telink/BLEManagerImpl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp index 14c870cb7bc5df..220501a84f673a 100644 --- a/src/platform/telink/BLEManagerImpl.cpp +++ b/src/platform/telink/BLEManagerImpl.cpp @@ -180,7 +180,8 @@ CHIP_ERROR BLEManagerImpl::_Init(void) void BLEManagerImpl::_Shutdown() { - if (mBLERadioInitialized) { + if (mBLERadioInitialized) + { bt_disable(); mBLERadioInitialized = false; }