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

Merge branch 'bugfix/btdm_string_to_bdaddr_error_when_opening_nano' into 'master'

Browse source 
component/bt: Fix bug: string_to_bdaddr() error when opening nano

See merge request idf/esp-idf!1981
This commit is contained in:
Jiang Jiang Jian 2018-03-15 14:14:47 +08:00
parent 55e5f8e349 54320d5f7b
commit 047870fd80
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/bt/bluedroid/btcore/bdaddr.c
View file

@ -102,10 +102,13 @@ bool string_to_bdaddr(const char *string, bt_bdaddr_t *addr)
bt_bdaddr_t new_addr;
uint8_t *ptr = new_addr.address;
bool ret = sscanf(string, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
&ptr[0], &ptr[1], &ptr[2], &ptr[3], &ptr[4], &ptr[5]) == 6;
uint32_t ptr_32[6];
bool ret = sscanf(string, "%02x:%02x:%02x:%02x:%02x:%02x",
&ptr_32[0], &ptr_32[1], &ptr_32[2], &ptr_32[3], &ptr_32[4], &ptr_32[5]) == 6;
if (ret) {
for (uint8_t i = 0; i < 6; i++){
ptr[i] = (uint8_t) ptr_32[i];
}
memcpy(addr, &new_addr, sizeof(bt_bdaddr_t));
}