kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update active_profile before disconnecting inactive ones

Browse source
This commit is contained in:
Justin Ridgewell 2023-12-21 17:44:36 -05:00
parent 95c911e13a
commit 9a8ca231a9
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/ble.c
View file

@ -254,9 +254,9 @@ static int ble_save_profile() {
} }
#if !IS_ENABLED(CONFIG_ZMK_BLE_FAST_SWITCHING) #if !IS_ENABLED(CONFIG_ZMK_BLE_FAST_SWITCHING)
static void zmk_ble_disconnect_other_profiles(int keep_index) { static void zmk_ble_disconnect_inactive_profiles() {
for (int i = 0; i < ZMK_BLE_PROFILE_COUNT; i++) { for (int i = 0; i < ZMK_BLE_PROFILE_COUNT; i++) {
if (i != keep_index && bt_addr_le_cmp(&profiles[i].peer, BT_ADDR_LE_ANY)) { if (i != active_profile && bt_addr_le_cmp(&profiles[i].peer, BT_ADDR_LE_ANY)) {
zmk_ble_prof_disconnect(i); zmk_ble_prof_disconnect(i);
} }
} }
@ -273,14 +273,17 @@ int zmk_ble_prof_select(uint8_t index) {
return 0; return 0;
} }
#if !IS_ENABLED(CONFIG_ZMK_BLE_FAST_SWITCHING) #if IS_ENABLED(CONFIG_ZMK_BLE_FAST_SWITCHING)
if (zmk_ble_active_profile_is_open()) { active_profile = index;
#else
bool was_active_profile_open = zmk_ble_active_profile_is_open();
active_profile = index;
if (was_active_profile_open) {
// We may have connected to multiple hosts while the active profile was open. // We may have connected to multiple hosts while the active profile was open.
zmk_ble_disconnect_other_profiles(index); zmk_ble_disconnect_inactive_profiles();
} }
#endif #endif
active_profile = index;
ble_save_profile(); ble_save_profile();
update_advertising(); update_advertising();
@ -632,7 +635,7 @@ static void auth_pairing_complete(struct bt_conn *conn, bool bonded) {
#if !IS_ENABLED(CONFIG_ZMK_BLE_FAST_SWITCHING) #if !IS_ENABLED(CONFIG_ZMK_BLE_FAST_SWITCHING)
// We may have connected to multiple hosts while the active profile was open. // We may have connected to multiple hosts while the active profile was open.
zmk_ble_disconnect_other_profiles(active_profile); zmk_ble_disconnect_inactive_profiles();
#endif #endif
update_advertising(); update_advertising();