From 68e2de82f70ef4c1df7adcf85ea64a25138cdac2 Mon Sep 17 00:00:00 2001
From: Kamil Kasperczyk <66371704+kkasperczyk-no@users.noreply.github.com>
Date: Mon, 23 Jan 2023 15:55:58 +0100
Subject: [PATCH] [nrfconnect] Changed a few Bluetooth configs to make
 connection more reliable (#24586)

Summary of changes:
* Enabled Wi-Fi and Bluetooth LE coexistance configuration
* Increased BT connection timeout to make communication work in a more
reliable way and prevent fast connection drop outs.
* Decreased BT connection parameters update time, as some Matter controllers
request enabling IP networking very fast, what should not happen before
BT connection parameters were updated to preferred ones.
---
 config/nrfconnect/chip-module/Kconfig.defaults         | 10 ++++++++++
 .../nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults  |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
index f6010168f4b3da..5303d8b2b9940b 100644
--- a/config/nrfconnect/chip-module/Kconfig.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -104,9 +104,19 @@ config BT_PERIPHERAL_PREF_MIN_INT
 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
 
diff --git a/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults b/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults
index 83290b2b492f28..173766a44941c1 100644
--- a/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.hci_rpmsg.defaults
@@ -63,6 +63,10 @@ config BT_HCI_RAW_RESERVE
 config BT_BUF_CMD_TX_COUNT
     default 10
 
+# Enable support for Wi-Fi and Bluetooth LE coexistance
+config MPSL_CX
+    default y
+
 config ASSERT
     default y