Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/fix_param_name_comments_bt' into 'master'

Browse source 
components/bt: Fix parameter name and print statements

See merge request idf/esp-idf!2032
This commit is contained in:
Ivan Grokhotkov 2018-03-19 16:59:09 +08:00
commit e784df60cc
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/bt/bluedroid/btc/core/btc_config.c
View file

@ -32,7 +32,7 @@
static const char *CONFIG_FILE_PATH = "bt_config.conf"; static const char *CONFIG_FILE_PATH = "bt_config.conf";
static const period_ms_t CONFIG_SETTLE_PERIOD_MS = 3000; static const period_ms_t CONFIG_SETTLE_PERIOD_MS = 3000;
static void btc_key_value_to_string(uint8_t *key_vaule, char *value_str, int key_length); static void btc_key_value_to_string(uint8_t *key_value, char *value_str, int key_length);
static osi_mutex_t lock; // protects operations on |config|. static osi_mutex_t lock; // protects operations on |config|.
static config_t *config; static config_t *config;
@ -51,16 +51,16 @@ bool btc_compare_address_key_value(const char *section, char *key_type, void *ke
return status; return status;
} }
static void btc_key_value_to_string(uint8_t *key_vaule, char *value_str, int key_length) static void btc_key_value_to_string(uint8_t *key_value, char *value_str, int key_length)
{ {
const char *lookup = "0123456789abcdef"; const char *lookup = "0123456789abcdef";
assert(key_vaule != NULL); assert(key_value != NULL);
assert(value_str != NULL); assert(value_str != NULL);
for (size_t i = 0; i < key_length; ++i) { for (size_t i = 0; i < key_length; ++i) {
value_str[(i * 2) + 0] = lookup[(key_vaule[i] >> 4) & 0x0F]; value_str[(i * 2) + 0] = lookup[(key_value[i] >> 4) & 0x0F];
value_str[(i * 2) + 1] = lookup[key_vaule[i] & 0x0F]; value_str[(i * 2) + 1] = lookup[key_value[i] & 0x0F];
} }
return; return;

2
components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c
View file

@ -404,7 +404,7 @@ static void btc_gatts_act_create_attr_tab(esp_gatts_attr_db_t *gatts_attr_db,
//reset the env after sent the data to app //reset the env after sent the data to app
memset(&btc_creat_tab_env, 0, sizeof(esp_btc_creat_tab_t)); memset(&btc_creat_tab_env, 0, sizeof(esp_btc_creat_tab_t));
//release the flag vaule to false after finish the service created. //set the flag value to false after the service is created.
btc_creat_tab_env.is_tab_creat_svc = false; btc_creat_tab_env.is_tab_creat_svc = false;
} }

4
components/bt/bluedroid/stack/gatt/gatt_db.c
View file

@ -794,7 +794,7 @@ tGATT_STATUS gatts_get_attribute_value(tGATT_SVC_DB *p_db, UINT16 attr_handle,
*value = p_cur->p_value->attr_val.attr_val; *value = p_cur->p_value->attr_val.attr_val;
return GATT_SUCCESS; return GATT_SUCCESS;
} else { } else {
GATT_TRACE_ERROR("gatts_get_attribute_vaule failt:the value length is 0"); GATT_TRACE_ERROR("gatts_get_attribute_value failed:the value length is 0");
return GATT_INVALID_ATTR_LEN; return GATT_INVALID_ATTR_LEN;
} }
break; break;
@ -805,7 +805,7 @@ tGATT_STATUS gatts_get_attribute_value(tGATT_SVC_DB *p_db, UINT16 attr_handle,
*value = p_cur->p_value->attr_val.attr_val; *value = p_cur->p_value->attr_val.attr_val;
return GATT_SUCCESS; return GATT_SUCCESS;
} else { } else {
GATT_TRACE_ERROR("gatts_get_attribute_vaule failed:the value length is 0"); GATT_TRACE_ERROR("gatts_get_attribute_value failed:the value length is 0");
return GATT_INVALID_ATTR_LEN; return GATT_INVALID_ATTR_LEN;
} }