[Telink] fix commissioning after last fabric removed and improve BLE stability (project-chip#67831)

Author: s07641069

config/telink/chip-module/Kconfig

@@ -282,7 +282,7 @@ config TFLM_FEATURE
 
 choice CHIP_LAST_FABRIC_REMOVED_ACTION
 	prompt "An action to perform after removing the last fabric"
-	default CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
+	default CHIP_LAST_FABRIC_REMOVED_ERASE_ONLY
 
 	config CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
 	bool "After removing the last fabric erase NVS and reboot"

config/telink/chip-module/Kconfig.defaults

@@ -139,6 +139,25 @@ if BT
 config BT_PERIPHERAL
     default y
 
+config BT_PERIPHERAL_PREF_MIN_INT
+    default 36
+
+config BT_PERIPHERAL_PREF_MAX_INT
+    default 36
+
+# Increase BT timeout to 5 s to improve connection reliability and avoid fast drop outs.
+config BT_PERIPHERAL_PREF_TIMEOUT
+    default 500
+
+config BT_GAP_AUTO_UPDATE_CONN_PARAMS
+    default y
+
+# Decrease connection parameters update time, as some Matter controllers request
+# enabling IP networking faster than BT connection parameters are updated, what may result
+# in commissioning instabilities.
+config BT_CONN_PARAM_UPDATE_TIMEOUT
+    default 1000
+
 config BT_GATT_DYNAMIC_DB
     default y
 

examples/platform/telink/util/include/FabricTableDelegate.h

@@ -21,7 +21,6 @@
 #include <app/server/Server.h>
 #include <zephyr/fs/nvs.h>
 #include <zephyr/settings/settings.h>
-#include <zephyr/sys/reboot.h>
 #ifdef CONFIG_CHIP_WIFI
 #include "WiFiManager.h"
 #endif
@@ -46,6 +45,13 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate
 
         if (server.GetFabricTable().FabricCount() == 0)
         {
+            // ScheduleFactoryReset in case of failed commissioning
+            if (AppTaskCommon::IsCommissioningFailed())
+            {
+                chip::Server::GetInstance().ScheduleFactoryReset();
+                return;
+            }
+
             if (chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled())
             {
                 server.GetCommissioningWindowManager().CloseCommissioningWindow();
@@ -63,9 +69,8 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate
         {
             LogErrorOnFailure(chip::DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) {
 #ifdef CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
-#ifdef CONFIG_CHIP_WIFI
                 chip::Server::GetInstance().ScheduleFactoryReset();
-#else
+#elif defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_ONLY)
                 ChipLogProgress(DeviceLayer, "Erasing settings partition");
                 // TC-OPCREDS-3.6 (device doesn't need to reboot automatically after the last fabric is removed) can't use
                 // FactoryReset
@@ -89,14 +94,7 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate
 #ifdef CONFIG_TFLM_FEATURE
                 AppTask::MicroSpeechProcessStop();
 #endif
-                // Reboot in case of failed commissioning to allow new pairing via BLE
-                if (AppTaskCommon::IsCommissioningFailed())
-                {
-                    ChipLogProgress(DeviceLayer, "Rebooting board");
-                    sys_reboot(SYS_REBOOT_WARM);
-                }
-#endif // CONFIG_CHIP_WIFI
-#elif defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_ONLY) || defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START)
+#elif defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START)
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
                 LogErrorOnFailure(chip::DeviceLayer::ThreadStackMgr().ClearAllSrpHostAndServices());
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
@@ -112,7 +110,6 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate
                 LogErrorOnFailure(chip::DeviceLayer::WiFiManager::Instance().Disconnect());
                 chip::DeviceLayer::ConnectivityMgr().ClearWiFiStationProvision();
 #endif
-#ifdef CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD && !CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
                 LogErrorOnFailure(chip::DeviceLayer::ThreadStackMgr().SetThreadEnabled(false));
                 LogErrorOnFailure(chip::DeviceLayer::PlatformMgr().ScheduleWork(StartThreadPrescan, 0));
@@ -127,7 +124,6 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate
                 }
                 ChipLogError(FabricProvisioning, "Could not start Bluetooth LE advertising");
 #endif
-#endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
             }));
         }