From 48ea4bc7f4dbbd974af4af876583e88e3f1c163e Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Thu, 8 Mar 2018 20:08:33 +0800 Subject: [PATCH] Merge branch 'bugfix/btdm_add_param_check_in_gap_set_prefer_conn_params' into 'master' Component/bt: add_params_check_in_prefer_conn_params() See merge request idf/esp-idf!1944 (cherry picked from commit db690e3f8579ad3255dbbd6046c0acfdc2a73cdd) b09d681d Component/bt: add_params_check_in_prefer_conn_params() --- components/bt/bluedroid/api/esp_gap_ble_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/bt/bluedroid/api/esp_gap_ble_api.c b/components/bt/bluedroid/api/esp_gap_ble_api.c index 5276c74caf..84df9d6131 100644 --- a/components/bt/bluedroid/api/esp_gap_ble_api.c +++ b/components/bt/bluedroid/api/esp_gap_ble_api.c @@ -240,7 +240,8 @@ esp_err_t esp_ble_gap_set_prefer_conn_params(esp_bd_addr_t bd_addr, if (ESP_BLE_IS_VALID_PARAM(min_conn_int, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) && ESP_BLE_IS_VALID_PARAM(max_conn_int, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) && ESP_BLE_IS_VALID_PARAM(supervision_tout, ESP_BLE_CONN_SUP_TOUT_MIN, ESP_BLE_CONN_SUP_TOUT_MAX) && - (slave_latency <= ESP_BLE_CONN_LATENCY_MAX || slave_latency == ESP_BLE_CONN_PARAM_UNDEF)) { + (slave_latency <= ESP_BLE_CONN_LATENCY_MAX || slave_latency == ESP_BLE_CONN_PARAM_UNDEF) && + ((supervision_tout * 10) >= ((1 + slave_latency) * ((max_conn_int * 5) >> 1))) && min_conn_int <= max_conn_int) { msg.sig = BTC_SIG_API_CALL; msg.pid = BTC_PID_GAP_BLE; -- 2.40.0