diff --git a/host_test/main/CMakeLists.txt b/host_test/main/CMakeLists.txt index 682bc22..a6e5c7a 100644 --- a/host_test/main/CMakeLists.txt +++ b/host_test/main/CMakeLists.txt @@ -6,13 +6,14 @@ target_compile_options(${COMPONENT_LIB} PUBLIC -fsanitize=address -fconcepts) target_link_options(${COMPONENT_LIB} PUBLIC -fsanitize=address) idf_component_get_property(mqtt mqtt COMPONENT_LIB) +target_compile_definitions(${mqtt} PRIVATE SOC_WIFI_SUPPORTED=1) target_compile_options(${mqtt} PUBLIC -fsanitize=address -fconcepts) target_link_options(${mqtt} PUBLIC -fsanitize=address) if(CONFIG_GCOV_ENABLED) target_compile_options(${COMPONENT_LIB} PUBLIC --coverage -fprofile-arcs -ftest-coverage) target_link_options(${COMPONENT_LIB} PUBLIC --coverage -fprofile-arcs -ftest-coverage) - + idf_component_get_property(mqtt mqtt COMPONENT_LIB) target_compile_options(${mqtt} PUBLIC --coverage -fprofile-arcs -ftest-coverage) target_link_options(${mqtt} PUBLIC --coverage -fprofile-arcs -ftest-coverage) diff --git a/lib/platform_esp32_idf.c b/lib/platform_esp32_idf.c index 86db376..215820b 100644 --- a/lib/platform_esp32_idf.c +++ b/lib/platform_esp32_idf.c @@ -3,6 +3,7 @@ #ifdef ESP_PLATFORM #include "esp_log.h" #include "esp_mac.h" +#include "soc/soc_caps.h" #include "esp_timer.h" #include "esp_random.h" #include @@ -12,12 +13,19 @@ static const char *TAG = "platform"; #define MAX_ID_STRING (32) +#if defined SOC_WIFI_SUPPORTED +#define MAC_TYPE ESP_MAC_WIFI_STA +#elif defined SOC_EMAC_SUPPORTED +#define MAC_TYPE ESP_MAC_ETH +#elif defined SOC_IEEE802154_SUPPORTED +#define MAC_TYPE ESP_MAC_IEEE802154 +#endif char *platform_create_id_string(void) { uint8_t mac[6]; char *id_string = calloc(1, MAX_ID_STRING); ESP_MEM_CHECK(TAG, id_string, return NULL); - esp_read_mac(mac, ESP_MAC_WIFI_STA); + esp_read_mac(mac, MAC_TYPE); sprintf(id_string, "ESP32_%02x%02X%02X", mac[3], mac[4], mac[5]); return id_string; }