applications: nrf5340_audio: Move ACL update to discovery complete

- Update ACL interval when discovery is done
 - Moved to make sure controller is not busy
- OCT-3661

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>

Author: alexsven

applications/nrf5340_audio/include/zbus_common.h

@@ -34,6 +34,7 @@ enum le_audio_evt_type {
 	LE_AUDIO_EVT_SYNC_LOST,
 	LE_AUDIO_EVT_NO_VALID_CFG,
 	LE_AUDIO_EVT_COORD_SET_DISCOVERED,
+	LE_AUDIO_EVT_DISCOVERY_COMPLETE,
 };
 
 struct le_audio_msg {

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c

@@ -898,6 +898,8 @@ static void discover_cb(struct bt_conn *conn, int err, enum bt_audio_dir dir)
 		return;
 	}
 
+	le_audio_event_publish(LE_AUDIO_EVT_DISCOVERY_COMPLETE, conn, NULL, dir);
+
 	srv_store_unlock();
 	k_work_submit(&cap_start_work);
 }

applications/nrf5340_audio/unicast_client/main.c

@@ -281,34 +281,6 @@ static void le_audio_msg_sub_thread(void)
 			break;
 
 		case LE_AUDIO_EVT_CONFIG_RECEIVED:
-			struct bt_conn_info conn_info;
-			uint16_t interval = 0;
-
-			ret = bt_conn_get_info(msg.conn, &conn_info);
-			if (ret) {
-				LOG_ERR("Failed to get conn info");
-			} else {
-				interval = BT_GAP_US_TO_CONN_INTERVAL(conn_info.le.interval_us);
-			}
-
-			/* Only update conn param once */
-			if (((IS_ENABLED(CONFIG_BT_AUDIO_TX) && msg.dir == BT_AUDIO_DIR_SINK) ||
-			     (!IS_ENABLED(CONFIG_BT_AUDIO_TX) && msg.dir == BT_AUDIO_DIR_SOURCE)) &&
-			    interval != CONFIG_BLE_ACL_CONN_INTERVAL_SLOW) {
-				struct bt_le_conn_param param;
-
-				/* Set the ACL interval up to allow more time for ISO packets */
-				param.interval_min = CONFIG_BLE_ACL_CONN_INTERVAL_SLOW;
-				param.interval_max = CONFIG_BLE_ACL_CONN_INTERVAL_SLOW;
-				param.latency = CONFIG_BLE_ACL_SLAVE_LATENCY;
-				param.timeout = CONFIG_BLE_ACL_SUP_TIMEOUT;
-
-				ret = bt_conn_le_param_update(msg.conn, &param);
-				if (ret) {
-					LOG_WRN("Failed to update conn parameters: %d", ret);
-				}
-			}
-
 			LOG_DBG("LE audio config received");
 
 			ret = unicast_client_config_get(msg.stream, &bitrate_bps,
@@ -378,6 +350,42 @@ static void le_audio_msg_sub_thread(void)
 			/* Nothing to do. */
 			break;
 
+		case LE_AUDIO_EVT_DISCOVERY_COMPLETE:
+			LOG_DBG("Discovery complete event received");
+
+			/* Only update conn param once */
+			struct bt_conn_info conn_info;
+			uint16_t interval = 0;
+
+			ret = bt_conn_get_info(msg.conn, &conn_info);
+			if (ret) {
+				LOG_ERR("Failed to get conn info");
+			} else {
+				interval = BT_GAP_US_TO_CONN_INTERVAL(conn_info.le.interval_us);
+			}
+
+			if (((IS_ENABLED(CONFIG_BT_AUDIO_TX) && msg.dir == BT_AUDIO_DIR_SINK) ||
+			     (!IS_ENABLED(CONFIG_BT_AUDIO_TX) && msg.dir == BT_AUDIO_DIR_SOURCE)) &&
+			    interval != CONFIG_BLE_ACL_CONN_INTERVAL_SLOW) {
+				struct bt_le_conn_param param;
+
+				/* Set the ACL interval up to allow more time for ISO packets */
+				param.interval_min = CONFIG_BLE_ACL_CONN_INTERVAL_SLOW;
+				param.interval_max = CONFIG_BLE_ACL_CONN_INTERVAL_SLOW;
+				param.latency = CONFIG_BLE_ACL_SLAVE_LATENCY;
+				param.timeout = CONFIG_BLE_ACL_SUP_TIMEOUT;
+
+				ret = bt_conn_le_param_update(msg.conn, &param);
+				if (ret) {
+					LOG_WRN("Failed to update conn parameters: %d", ret);
+				}
+
+				LOG_DBG("Updated ACL conn interval to %3.2f ms for conn 0x%p",
+					1.25 * CONFIG_BLE_ACL_CONN_INTERVAL_SLOW, msg.conn);
+			}
+
+			break;
+
 		default:
 			LOG_WRN("Unexpected/unhandled le_audio event: %d", msg.event);
 			break;