alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_bt_typos' into 'master'

Browse Source 
components/bt examples/bluetooth: Fix typographical errors

See merge request idf/esp-idf!1950
This commit is contained in:
Ivan Grokhotkov 2018-03-19 16:58:55 +08:00
commit 85c9164f50
12 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/bluedroid/bta/av/bta_av_act.c
View File

@ -1063,7 +1063,7 @@ void bta_av_stream_chg(tBTA_AV_SCB *p_scb, BOOLEAN started)
** **
** Function bta_av_conn_chg ** Function bta_av_conn_chg
** **
** Description connetion status changed. ** Description connection status changed.
** Open an AVRCP acceptor channel, if new conn. ** Open an AVRCP acceptor channel, if new conn.
** **
** Returns void ** Returns void

6
components/bt/bluedroid/bta/hh/bta_hh_le.c
View File

@ -2577,7 +2577,7 @@ void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB *p_cb)
** **
** Function bta_hh_le_add_dev_bg_conn ** Function bta_hh_le_add_dev_bg_conn
** **
** Description Remove a LE HID device from back ground connection procedure. ** Description Remove a LE HID device from background connection procedure.
** **
** Returns void ** Returns void
** **
@ -2613,7 +2613,7 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB *p_cb, BOOLEAN check_bond)
** Function bta_hh_le_add_device ** Function bta_hh_le_add_device
** **
** Description Add a LE HID device as a known device, and also add the address ** Description Add a LE HID device as a known device, and also add the address
** into back ground connection WL for incoming connection. ** into background connection WL for incoming connection.
** **
** Returns void ** Returns void
** **
@ -2648,7 +2648,7 @@ UINT8 bta_hh_le_add_device(tBTA_HH_DEV_CB *p_cb, tBTA_HH_MAINT_DEV *p_dev_info)
** **
** Function bta_hh_le_remove_dev_bg_conn ** Function bta_hh_le_remove_dev_bg_conn
** **
** Description Remove a LE HID device from back ground connection procedure. ** Description Remove a LE HID device from background connection procedure.
** **
** Returns void ** Returns void
** **

2
components/bt/bluedroid/bta/include/bta_gattc_int.h
View File

@ -326,7 +326,7 @@ typedef struct {
UINT16 reason; UINT16 reason;
} tBTA_GATTC_CLCB; } tBTA_GATTC_CLCB;
/* back ground connection tracking information */ /* background connection tracking information */
#if GATT_MAX_APPS <= 8 #if GATT_MAX_APPS <= 8
typedef UINT8 tBTA_GATTC_CIF_MASK ; typedef UINT8 tBTA_GATTC_CIF_MASK ;
#elif GATT_MAX_APPS <= 16 #elif GATT_MAX_APPS <= 16

6
components/bt/bluedroid/stack/gatt/gatt_utils.c
View File

@ -2396,7 +2396,7 @@ tGATT_BG_CONN_DEV *gatt_alloc_bg_dev(BD_ADDR remote_bda)
** **
** Function gatt_add_bg_dev_list ** Function gatt_add_bg_dev_list
** **
** Description add/remove device from the back ground connection device list ** Description add/remove device from the background connection device list
** **
** Returns TRUE if device added to the list; FALSE failed ** Returns TRUE if device added to the list; FALSE failed
** **
@ -2536,7 +2536,7 @@ BOOLEAN gatt_find_app_for_bg_dev(BD_ADDR bd_addr, tGATT_IF *p_gatt_if)
** **
** Function gatt_remove_bg_dev_from_list ** Function gatt_remove_bg_dev_from_list
** **
** Description add/remove device from the back ground connection device list or ** Description add/remove device from the background connection device list or
** listening to advertising list. ** listening to advertising list.
** **
** Returns pointer to the device record ** Returns pointer to the device record
@ -2599,7 +2599,7 @@ BOOLEAN gatt_remove_bg_dev_from_list(tGATT_REG *p_reg, BD_ADDR bd_addr, BOOLEAN
** **
** Function gatt_deregister_bgdev_list ** Function gatt_deregister_bgdev_list
** **
** Description deregister all related back ground connetion device. ** Description deregister all related background connection device.
** **
** Returns pointer to the device record ** Returns pointer to the device record
** **

4
components/bt/bt.c
View File

@ -97,7 +97,7 @@ typedef struct {
intptr_t end; intptr_t end;
} btdm_dram_available_region_t; } btdm_dram_available_region_t;
/* the mode column will be modifid by release function to indicate the available region */ /* the mode column will be modified by release function to indicate the available region */
static btdm_dram_available_region_t btdm_dram_available_region[] = { static btdm_dram_available_region_t btdm_dram_available_region[] = {
//following is .data //following is .data
{ESP_BT_MODE_BTDM, 0x3ffae6e0, 0x3ffaff10}, {ESP_BT_MODE_BTDM, 0x3ffae6e0, 0x3ffaff10},
@ -402,7 +402,7 @@ esp_err_t esp_bt_controller_mem_release(esp_bt_mode_t mode)
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }
//already relesed //already released
if (!(mode & btdm_dram_available_region[0].mode)) { if (!(mode & btdm_dram_available_region[0].mode)) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }

2
components/bt/include/esp_bt.h
View File

@ -84,7 +84,7 @@ typedef enum {
/** /**
* @brief BLE tx power type * @brief BLE tx power type
* ESP_BLE_PWR_TYPE_CONN_HDL0-8: for each connection, and only be set after connetion completed. * ESP_BLE_PWR_TYPE_CONN_HDL0-8: for each connection, and only be set after connection completed.
* when disconnect, the correspond TX power is not effected. * when disconnect, the correspond TX power is not effected.
* ESP_BLE_PWR_TYPE_ADV : for advertising/scan response. * ESP_BLE_PWR_TYPE_ADV : for advertising/scan response.
* ESP_BLE_PWR_TYPE_SCAN : for scan. * ESP_BLE_PWR_TYPE_SCAN : for scan.

4
examples/bluetooth/gatt_client/main/gattc_demo.c
View File

@ -223,7 +223,7 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error"); ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error");
} }
/* Erery char have only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */ /* Every char has only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */
if (count > 0 && descr_elem_result[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){ if (count > 0 && descr_elem_result[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){
ret_status = esp_ble_gattc_write_char_descr( gattc_if, ret_status = esp_ble_gattc_write_char_descr( gattc_if,
gl_profile_tab[PROFILE_A_APP_ID].conn_id, gl_profile_tab[PROFILE_A_APP_ID].conn_id,
@ -367,7 +367,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par
ESP_LOGI(GATTC_TAG, "stop adv successfully"); ESP_LOGI(GATTC_TAG, "stop adv successfully");
break; break;
case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
ESP_LOGI(GATTC_TAG, "update connetion params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d", ESP_LOGI(GATTC_TAG, "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d",
param->update_conn_params.status, param->update_conn_params.status,
param->update_conn_params.min_int, param->update_conn_params.min_int,
param->update_conn_params.max_int, param->update_conn_params.max_int,

2
examples/bluetooth/gatt_client/tutorial/Gatt_Client_Example_Walkthrough.md
View File

@ -650,7 +650,7 @@ This procedure registers notifications to the BLE stack, and triggers an `ESP_GA
error"); error");
} }
/* Erery char have only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */ /* Every char has only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */
if (count > 0 && descr_elem_result[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){ if (count > 0 && descr_elem_result[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){
ret_status = esp_ble_gattc_write_char_descr( gattc_if, ret_status = esp_ble_gattc_write_char_descr( gattc_if,
gl_profile_tab[PROFILE_A_APP_ID].conn_id, gl_profile_tab[PROFILE_A_APP_ID].conn_id,

2
examples/bluetooth/gatt_server/main/gatts_demo.c
View File

@ -228,7 +228,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param
} }
break; break;
case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
ESP_LOGI(GATTS_TAG, "update connetion params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d", ESP_LOGI(GATTS_TAG, "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d",
param->update_conn_params.status, param->update_conn_params.status,
param->update_conn_params.min_int, param->update_conn_params.min_int,
param->update_conn_params.max_int, param->update_conn_params.max_int,

2
examples/bluetooth/gatt_server/tutorial/Gatt_Server_Example_Walkthrough.md
View File

@ -646,7 +646,7 @@ The `esp_ble_gap_update_conn_params()` function triggers a GAP event `ESP_GAP_BL
```c ```c
case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
ESP_LOGI(GATTS_TAG, "update connetion params status = %d, min_int = %d, max_int = %d, ESP_LOGI(GATTS_TAG, "update connection params status = %d, min_int = %d, max_int = %d,
conn_int = %d,latency = %d, timeout = %d", conn_int = %d,latency = %d, timeout = %d",
param->update_conn_params.status, param->update_conn_params.status,
param->update_conn_params.min_int, param->update_conn_params.min_int,

2
examples/bluetooth/gatt_server_service_table/main/gatts_table_creat_demo.c
View File

@ -262,7 +262,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param
} }
break; break;
case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
ESP_LOGI(GATTS_TABLE_TAG, "update connetion params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d", ESP_LOGI(GATTS_TABLE_TAG, "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d",
param->update_conn_params.status, param->update_conn_params.status,
param->update_conn_params.min_int, param->update_conn_params.min_int,
param->update_conn_params.max_int, param->update_conn_params.max_int,

8
examples/bluetooth/gattc_multi_connect/main/gattc_multi_connect.c
View File

@ -263,7 +263,7 @@ static void gattc_profile_a_event_handler(esp_gattc_cb_event_t event, esp_gatt_i
ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error"); ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error");
} }
/* Erery char have only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */ /* Every char has only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */
if (count > 0 && descr_elem_result_a[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result_a[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){ if (count > 0 && descr_elem_result_a[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result_a[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){
ret_status = esp_ble_gattc_write_char_descr( gattc_if, ret_status = esp_ble_gattc_write_char_descr( gattc_if,
gl_profile_tab[PROFILE_A_APP_ID].conn_id, gl_profile_tab[PROFILE_A_APP_ID].conn_id,
@ -465,7 +465,7 @@ static void gattc_profile_b_event_handler(esp_gattc_cb_event_t event, esp_gatt_i
ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error"); ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error");
} }
/* Erery char have only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */ /* Every char has only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */
if (count > 0 && descr_elem_result_b[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result_b[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){ if (count > 0 && descr_elem_result_b[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result_b[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){
ret_status = esp_ble_gattc_write_char_descr( gattc_if, ret_status = esp_ble_gattc_write_char_descr( gattc_if,
gl_profile_tab[PROFILE_B_APP_ID].conn_id, gl_profile_tab[PROFILE_B_APP_ID].conn_id,
@ -663,7 +663,7 @@ static void gattc_profile_c_event_handler(esp_gattc_cb_event_t event, esp_gatt_i
ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error"); ESP_LOGE(GATTC_TAG, "esp_ble_gattc_get_descr_by_char_handle error");
} }
/* Erery char have only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */ /* Every char has only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */
if (count > 0 && descr_elem_result_c[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result_c[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){ if (count > 0 && descr_elem_result_c[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result_c[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG){
ret_status = esp_ble_gattc_write_char_descr( gattc_if, ret_status = esp_ble_gattc_write_char_descr( gattc_if,
gl_profile_tab[PROFILE_C_APP_ID].conn_id, gl_profile_tab[PROFILE_C_APP_ID].conn_id,
@ -743,7 +743,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par
uint8_t adv_name_len = 0; uint8_t adv_name_len = 0;
switch (event) { switch (event) {
case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
ESP_LOGI(GATTC_TAG, "update connetion params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d", ESP_LOGI(GATTC_TAG, "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d",
param->update_conn_params.status, param->update_conn_params.status,
param->update_conn_params.min_int, param->update_conn_params.min_int,
param->update_conn_params.max_int, param->update_conn_params.max_int,