From a05868f0a8ee8e1180c8edd2d825595ca0230b4c Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Tue, 4 Sep 2018 19:31:34 +0800 Subject: [PATCH 1/2] fix TX power value in ble adv data is incorrect refence to https://github.com/espressif/esp-idf/issues/2284 Before fixing, the tx power in adv data is always 0xeb(-21dbm). restriction: If change BLE advertising TX power, please call esp_ble_gap_config_adv_data() after BLE adv TX power changed. Later, will implement set BLE advertising TX power via HCI, then the TX power value in adv data can be update automatically after BLE adv TX power changed. --- components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c | 2 ++ components/bt/bluedroid/common/include/common/bt_target.h | 2 +- components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c | 4 ++-- components/bt/bluedroid/stack/include/stack/btm_ble_api.h | 5 +---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c index c8951db4c..7200be90f 100644 --- a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c +++ b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c @@ -29,6 +29,7 @@ #include "btc/btc_dm.h" #include "btc/btc_util.h" #include "osi/mutex.h" +#include "esp_bt.h" static tBTA_BLE_ADV_DATA gl_bta_adv_data; static tBTA_BLE_ADV_DATA gl_bta_scan_rsp_data; @@ -142,6 +143,7 @@ static void btc_to_bta_adv_data(esp_ble_adv_data_t *p_adv_data, tBTA_BLE_ADV_DAT if (p_adv_data->include_txpower) { mask |= BTM_BLE_AD_BIT_TX_PWR; + bta_adv_data->tx_power = esp_ble_tx_power_get(ESP_BLE_PWR_TYPE_ADV); } if (p_adv_data->min_interval > 0 && p_adv_data->max_interval > 0 && diff --git a/components/bt/bluedroid/common/include/common/bt_target.h b/components/bt/bluedroid/common/include/common/bt_target.h index 87d2a7a0d..67abfd420 100644 --- a/components/bt/bluedroid/common/include/common/bt_target.h +++ b/components/bt/bluedroid/common/include/common/bt_target.h @@ -991,7 +991,7 @@ #endif #ifndef BTM_BLE_ADV_TX_POWER -#define BTM_BLE_ADV_TX_POWER {-21, -15, -7, 1, 9} +#define BTM_BLE_ADV_TX_POWER {-12, -9, -6, -3, 0, 3, 6, 9} #endif diff --git a/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c b/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c index dba7d56b2..545732413 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c +++ b/components/bt/bluedroid/stack/btm/btm_ble_multi_adv.c @@ -222,10 +222,10 @@ tBTM_STATUS btm_ble_enable_multi_adv (BOOLEAN enable, UINT8 inst_id, UINT8 cb_ev ** Returns tx power in dBm ** *******************************************************************************/ -int btm_ble_tx_power[BTM_BLE_ADV_TX_POWER_MAX + 1] = BTM_BLE_ADV_TX_POWER; +static const int btm_ble_tx_power[BTM_BLE_ADV_TX_POWER_MAX + 1] = BTM_BLE_ADV_TX_POWER; char btm_ble_map_adv_tx_power(int tx_power_index) { - if (0 <= tx_power_index && tx_power_index < BTM_BLE_ADV_TX_POWER_MAX) { + if (0 <= tx_power_index && tx_power_index <= BTM_BLE_ADV_TX_POWER_MAX) { return (char)btm_ble_tx_power[tx_power_index]; } return 0; diff --git a/components/bt/bluedroid/stack/include/stack/btm_ble_api.h b/components/bt/bluedroid/stack/include/stack/btm_ble_api.h index 0c96eaa5e..b470bd0d0 100644 --- a/components/bt/bluedroid/stack/include/stack/btm_ble_api.h +++ b/components/bt/bluedroid/stack/include/stack/btm_ble_api.h @@ -375,10 +375,7 @@ typedef UINT8 tBTM_BLE_AD_TYPE; /* adv tx power level */ #define BTM_BLE_ADV_TX_POWER_MIN 0 /* minimum tx power */ -#define BTM_BLE_ADV_TX_POWER_LOW 1 /* low tx power */ -#define BTM_BLE_ADV_TX_POWER_MID 2 /* middle tx power */ -#define BTM_BLE_ADV_TX_POWER_UPPER 3 /* upper tx power */ -#define BTM_BLE_ADV_TX_POWER_MAX 4 /* maximum tx power */ +#define BTM_BLE_ADV_TX_POWER_MAX 7 /* maximum tx power */ typedef UINT8 tBTM_BLE_ADV_TX_POWER; /* adv tx power in dBm */ From 0e1f561a327d3cebab57cc039bdfeea012130ed8 Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Wed, 12 Sep 2018 18:15:06 +0800 Subject: [PATCH 2/2] test: fix incorrect tx power value in adv --- components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml b/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml index 576598d16..52f508c42 100644 --- a/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml +++ b/components/idf_test/integration_test/TC_IT_BTSTK_GAP.yml @@ -2232,14 +2232,14 @@ test cases: - ["R SSC1 C +BLEADV:SetAdv,OK"] - *dut1_start_adv - - "SSC SSC2 blescan -D -z start -t 1 -e 1" - - - 'P SSC2 RE "\+BTSCANEXT:%%s,txp,0xEB"%%()' + - - 'P SSC2 RE "\+BTSCANEXT:%%s,txp,0x03"%%()' - 'R SSC2 C Complete' - *dut1_stop_adv - - "SSC SSC1 bleadv -L -c 0 -x 0 -t 3" - ["R SSC1 C +BLEADV:SetAdv,OK"] - *dut1_start_adv - - "SSC SSC2 blescan -D -z start -t 1 -e 1" - - - 'R SSC2 NRE "\+BTSCANEXT:%%s,txp,0xEB"%%()' + - - 'R SSC2 NRE "\+BTSCANEXT:%%s,txp,0x03"%%()' - 'R SSC2 C Complete' - ID: BTSTK_GAP_09007 <<: *GAP_CASE