Fix interval update, add PHY update

This commit is contained in:
Nick 2020-08-02 14:51:42 -05:00
parent 24ec83c234
commit f26bd495ea
3 changed files with 26 additions and 2 deletions

View file

@ -88,6 +88,7 @@ config ZMK_SPLIT_BLE
bool "Split keyboard support via BLE transport" bool "Split keyboard support via BLE transport"
depends on ZMK_BLE depends on ZMK_BLE
default y default y
select BT_USER_PHY_UPDATE
if ZMK_SPLIT_BLE if ZMK_SPLIT_BLE

View file

@ -37,7 +37,11 @@ static void connected(struct bt_conn *conn, u8_t err)
printk("Connected %s\n", addr); printk("Connected %s\n", addr);
bt_conn_le_param_update(conn, BT_LE_CONN_PARAM(0x0006, 0x000c, 5, 400)); bt_conn_le_param_update(conn, BT_LE_CONN_PARAM(0x0006, 0x000c, 30, 400));
#if IS_ENABLED(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL)
bt_conn_le_phy_update(default_conn, BT_CONN_LE_PHY_PARAM_2M);
#endif
if (bt_conn_set_security(conn, BT_SECURITY_L2)) if (bt_conn_set_security(conn, BT_SECURITY_L2))
{ {

View file

@ -67,6 +67,13 @@ static u8_t split_central_notify_func(struct bt_conn *conn,
} }
} }
bt_conn_le_param_update(conn, BT_LE_CONN_PARAM(0x0006, 0x0006, 30, 400));
struct bt_conn_info info;
bt_conn_get_info(conn, &info);
LOG_DBG("Interval: %d, Latency: %d, PHY: %d", info.le.interval, info.le.latency, info.le.phy->rx_phy);
return BT_GATT_ITER_CONTINUE; return BT_GATT_ITER_CONTINUE;
} }
@ -149,6 +156,12 @@ static void split_central_process_connection(struct bt_conn *conn) {
return; return;
} }
} }
struct bt_conn_info info;
bt_conn_get_info(conn, &info);
LOG_DBG("New connection params: Interval: %d, Latency: %d, PHY: %d", info.le.interval, info.le.latency, info.le.phy->rx_phy);
} }
static bool split_central_eir_found(struct bt_data *data, void *user_data) static bool split_central_eir_found(struct bt_data *data, void *user_data)
@ -199,13 +212,19 @@ static bool split_central_eir_found(struct bt_data *data, void *user_data)
LOG_DBG("Found existing connection"); LOG_DBG("Found existing connection");
split_central_process_connection(default_conn); split_central_process_connection(default_conn);
} else { } else {
param = BT_LE_CONN_PARAM(0x0006, 0x000c, 5, 400); param = BT_LE_CONN_PARAM(0x0006, 0x0006, 30, 400);
err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN, err = bt_conn_le_create(addr, BT_CONN_LE_CREATE_CONN,
param, &default_conn); param, &default_conn);
if (err) { if (err) {
LOG_ERR("Create conn failed (err %d)", err); LOG_ERR("Create conn failed (err %d)", err);
start_scan(); start_scan();
} }
err = bt_conn_le_phy_update(default_conn, BT_CONN_LE_PHY_PARAM_2M);
if (err) {
LOG_ERR("Update phy conn failed (err %d)", err);
start_scan();
}
} }
return false; return false;