espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 16:14:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/bt_universal_calculation' into 'master'

Browse Source 
bugfix/correct_bt_mac_calculation

Closes IDFGH-3343

See merge request espressif/esp-idf!8825
This commit is contained in:
Jiang Jiang Jian
2020-05-25 11:57:37 +08:00
parent 9050f8a741 6572959fd3
commit 5bb656bd5e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_common/Kconfig
View File

@@ -224,6 +224,11 @@ menu "Common ESP-related"
config ESP_MAC_ADDR_UNIVERSE_BT config ESP_MAC_ADDR_UNIVERSE_BT
bool bool
config ESP_MAC_ADDR_UNIVERSE_BT_OFFSET
int
default 2 if ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR
default 1 if ESP32_UNIVERSAL_MAC_ADDRESSES_TWO
config ESP_MAC_ADDR_UNIVERSE_ETH config ESP_MAC_ADDR_UNIVERSE_ETH
bool bool

6
components/esp_common/src/mac_addr.c
View File

@@ -185,11 +185,9 @@ esp_err_t esp_read_mac(uint8_t* mac, esp_mac_type_t type)
#endif #endif
break; break;
case ESP_MAC_BT: case ESP_MAC_BT:
memcpy(mac, efuse_mac, 6);
#if CONFIG_ESP_MAC_ADDR_UNIVERSE_BT #if CONFIG_ESP_MAC_ADDR_UNIVERSE_BT
mac[5] += 2; memcpy(mac, efuse_mac, 6);
#else mac[5] += CONFIG_ESP_MAC_ADDR_UNIVERSE_BT_OFFSET;
mac[5] += 1;
#endif #endif
break; break;
case ESP_MAC_ETH: case ESP_MAC_ETH: