Skip to content

Commit b4f4e48

Browse files
author
mkuettner97
committed
connected callback only after connection param exchange
1 parent 1a3c682 commit b4f4e48

5 files changed

Lines changed: 14 additions & 11 deletions

File tree

boards/teco/openearable_v2/openearable_v2_nrf5340_cpuapp_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
55
# CONFIG_BOARD_OPENEARABLE_V2_NRF5340_CPUAPP=y
66

7-
# Oscillator Parameters
7+
# Oscillator Parameters 32mHz / 8pF / 20ppm
88
CONFIG_SOC_HFXO_CAP_INTERNAL=y
99
CONFIG_SOC_HFXO_CAP_INT_VALUE_X2=16
1010

src/audio/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,9 @@ target_sources(app PRIVATE
1111
${CMAKE_CURRENT_SOURCE_DIR}/sw_codec_select.c
1212
${CMAKE_CURRENT_SOURCE_DIR}/le_audio_rx.c
1313
# ${CMAKE_CURRENT_SOURCE_DIR}/pdm_mic.c
14-
${CMAKE_CURRENT_SOURCE_DIR}/Equalizer.cpp
14+
# ${CMAKE_CURRENT_SOURCE_DIR}/Equalizer.cpp
1515
)
16+
17+
18+
target_sources_ifdef(CONFIG_EQAULIZER_SOFTWARE app PRIVATE
19+
${CMAKE_CURRENT_SOURCE_DIR}/Equalizer.cpp)

src/audio/audio_datapath.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,15 +1080,15 @@ int audio_datapath_init(void)
10801080
ctrl_blk.drift_comp.enabled = true;
10811081
ctrl_blk.pres_comp.enabled = true;
10821082

1083-
//if ((IS_ENABLED(CONFIG_STREAM_BIDIRECTIONAL) || (CONFIG_AUDIO_DEV == GATEWAY)) && IS_ENABLED(CONFIG_AUDIO_MIC_I2S)) {
1083+
if (IS_ENABLED(CONFIG_STREAM_BIDIRECTIONAL) && (CONFIG_AUDIO_DEV == GATEWAY)) {
10841084
/* Disable presentation compensation feature for microphone return on gateway,
10851085
* since there's only one stream output from gateway for now, so no need to
10861086
* qhave presentation compensation.
10871087
*/
1088-
// ctrl_blk.pres_comp.enabled = false;
1089-
//} else {
1090-
// ctrl_blk.pres_comp.enabled = true;
1091-
//}
1088+
ctrl_blk.pres_comp.enabled = false;
1089+
} else {
1090+
ctrl_blk.pres_comp.enabled = true;
1091+
}
10921092

10931093
ctrl_blk.pres_comp.pres_delay_us = CONFIG_BT_AUDIO_PRESENTATION_DELAY_US;
10941094

src/audio/streamctrl.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#include "button_assignments.h"
1717
#include "macros_common.h"
1818
#include "audio_system.h"
19-
//#include "button_handler.h"
20-
#include "../src/buttons/button_manager.h"
19+
2120
#include "bt_le_audio_tx.h"
2221
#include "bt_mgmt.h"
2322
#include "bt_rendering_and_capture.h"

src/bluetooth/bt_management/bt_mgmt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ static void connected_cb(struct bt_conn *conn, uint8_t err)
160160
/* NOTE: The string below is used by the Nordic CI system */
161161
LOG_INF("Connected: %s", addr);
162162

163-
msg.event = BT_MGMT_CONNECTED;
163+
/*msg.event = BT_MGMT_CONNECTED;
164164
msg.conn = conn;
165165
166166
ret = zbus_chan_pub(&bt_mgmt_chan, &msg, K_NO_WAIT);
167-
ERR_CHK(ret);
167+
ERR_CHK(ret);*/
168168

169169
static struct bt_gatt_exchange_params exchange_params;
170170
exchange_params.func = exchange_func;

0 commit comments

Comments
 (0)