From 68ce16cf86c34a5a252b9ae526856cdedd47ef1e Mon Sep 17 00:00:00 2001
From: Joakim Andersson <joakim.andersson@nordicsemi.no>
Date: Tue, 28 Apr 2020 20:19:28 +0200
Subject: [PATCH] Bluetooth: tests: Update EDTT configuration for easier
 debugging

Update EDTT default configuration to make it easier to debug. The
use of maximum log level to restrict default output caused some
confusion. Instead remove debug options to reduce the default log
output. Enabling debug logs is now similar to other samples and tests.

Remove options commented out, no need to keep them.
Move comment to the matching CONFIG.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
---
 .../edtt_ble_test_app/gatt_test_app/prj.conf       | 14 ++++++--------
 .../edtt_ble_test_app/hci_test_app/prj.conf        | 11 ++---------
 .../edtt_ble_test_app/hci_test_app/prj_legacy.conf |  8 +-------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/prj.conf b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/prj.conf
index 287a8ea6984..e1b0e695538 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/prj.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/gatt_test_app/prj.conf
@@ -14,18 +14,16 @@ CONFIG_BT_DEVICE_APPEARANCE=833
 CONFIG_BT_GATT_DYNAMIC_DB=y
 
 CONFIG_BT_CTLR=y
-# CONFIG_BT_LL_SW_LEGACY=y
 CONFIG_BT_LL_SW_SPLIT=y
-#
-# NOTE: In order to get ACL_FLOW_CONTROL to work it is imperative that BT_CTRL_RX_BUFFERS is increased from its default value of 1.
-#
+
 CONFIG_BT_HCI_ACL_FLOW_CONTROL=y
 CONFIG_BT_L2CAP_RX_MTU=512
 CONFIG_BT_L2CAP_TX_MTU=512
-CONFIG_BT_CTLR_RX_BUFFERS=3
 CONFIG_BT_DEBUG_LOG=y
-#
+
+# NOTE: In order to get ACL_FLOW_CONTROL to work it is imperative that
+# BT_CTRL_RX_BUFFERS is increased from its default value of 1.
+CONFIG_BT_CTLR_RX_BUFFERS=3
+
 # To make DEVICE Name writable...
-#
 CONFIG_BT_DEVICE_NAME_DYNAMIC=y
-CONFIG_LOG_MAX_LEVEL=2
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj.conf b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj.conf
index ad0fe193b0d..cfd2c3bedee 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj.conf
@@ -5,20 +5,14 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_DEBUG_LOG=y
-# CONFIG_BT_DEBUG_HCI_CORE=y
-CONFIG_BT_DEBUG_RPA=y
-CONFIG_BT_DEBUG_CONN=y
 CONFIG_BT_ECC=y
 CONFIG_BT_TINYCRYPT_ECC=y
-# CONFIG_BT_PRIVACY=y
-# CONFIG_BT_SIGNING=y
-# CONFIG_BT_L2CAP_TX_BUF_COUNT=6
-# CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+
 ##
 ## Enabling BT_CTRL_DTM_HCI requires BT_LL_SW which requires BT_CTRL
 ##
 CONFIG_BT_CTLR=y
-# CONFIG_BT_LL_SW_LEGACY=y
+
 CONFIG_BT_LL_SW_SPLIT=y
 CONFIG_BT_CTLR_CRYPTO=y
 CONFIG_BT_CTLR_LE_ENC=y
@@ -31,4 +25,3 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_TICKLESS_IDLE=y
 CONFIG_TICKLESS_KERNEL=y
-CONFIG_LOG_MAX_LEVEL=2
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_legacy.conf b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_legacy.conf
index 871038bbf8e..a3f4cfa4cc6 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_legacy.conf
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/prj_legacy.conf
@@ -5,14 +5,9 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_CENTRAL=y
 CONFIG_BT_DEBUG_LOG=y
-# CONFIG_BT_DEBUG_HCI_CORE=y
 CONFIG_BT_ECC=y
 CONFIG_BT_TINYCRYPT_ECC=y
-# CONFIG_BT_SMP=y
-# CONFIG_BT_PRIVACY=y
-# CONFIG_BT_SIGNING=y
-# CONFIG_BT_L2CAP_TX_BUF_COUNT=6
-# CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
+
 ##
 ## Enabling BT_CTRL_DTM_HCI requires BT_LL_SW which requires BT_CTRL
 ##
@@ -28,4 +23,3 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=60
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_TICKLESS_IDLE=y
 CONFIG_TICKLESS_KERNEL=y
-CONFIG_LOG_MAX_LEVEL=2