Merge branch 'bugfix/bt_universal_calculation' into 'master'
bugfix/correct_bt_mac_calculation Closes IDFGH-3343 See merge request espressif/esp-idf!8825
This commit is contained in:
commit
5bb656bd5e
2 changed files with 7 additions and 4 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue