alexey.zholtikov/zh_network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Added support of ESP-IDF v4.x.x

Browse Source
This commit is contained in:
Alexey Zholtikov
2024-06-04 17:39:20 +03:00
parent a8acea4ca9
commit 0e4d03c767
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zh_network.c
View File

@ -12,7 +12,7 @@
/// \endcond /// \endcond
static void _send_cb(const uint8_t *mac_addr, esp_now_send_status_t status); static void _send_cb(const uint8_t *mac_addr, esp_now_send_status_t status);
#ifdef CONFIG_IDF_TARGET_ESP8266 #if defined CONFIG_IDF_TARGET_ESP8266 || ESP_IDF_VERSION_MAJOR == 4
static void _recv_cb(const uint8_t *mac_addr, const uint8_t *data, int data_len); static void _recv_cb(const uint8_t *mac_addr, const uint8_t *data, int data_len);
#else #else
static void _recv_cb(const esp_now_recv_info_t *esp_now_info, const uint8_t *data, int data_len); static void _recv_cb(const esp_now_recv_info_t *esp_now_info, const uint8_t *data, int data_len);
@ -227,13 +227,13 @@ static void _send_cb(const uint8_t *mac_addr, esp_now_send_status_t status)
} }
} }
#ifdef CONFIG_IDF_TARGET_ESP8266 #if defined CONFIG_IDF_TARGET_ESP8266 || ESP_IDF_VERSION_MAJOR == 4
static void _recv_cb(const uint8_t *mac_addr, const uint8_t *data, int data_len) static void _recv_cb(const uint8_t *mac_addr, const uint8_t *data, int data_len)
#else #else
static void _recv_cb(const esp_now_recv_info_t *esp_now_info, const uint8_t *data, int data_len) static void _recv_cb(const esp_now_recv_info_t *esp_now_info, const uint8_t *data, int data_len)
#endif #endif
{ {
#ifdef CONFIG_IDF_TARGET_ESP8266 #if defined CONFIG_IDF_TARGET_ESP8266 || ESP_IDF_VERSION_MAJOR == 4
ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue begin.", MAC2STR(mac_addr)); ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue begin.", MAC2STR(mac_addr));
#else #else
ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue begin.", MAC2STR(esp_now_info->src_addr)); ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue begin.", MAC2STR(esp_now_info->src_addr));
@ -271,12 +271,12 @@ static void _recv_cb(const esp_now_recv_info_t *esp_now_info, const uint8_t *dat
} }
xSemaphoreGive(_id_vector_mutex); xSemaphoreGive(_id_vector_mutex);
} }
#ifdef CONFIG_IDF_TARGET_ESP8266 #if defined CONFIG_IDF_TARGET_ESP8266 || ESP_IDF_VERSION_MAJOR == 4
memcpy(queue.data.sender_mac, mac_addr, 6); memcpy(queue.data.sender_mac, mac_addr, 6);
#else #else
memcpy(queue.data.sender_mac, esp_now_info->src_addr, 6); memcpy(queue.data.sender_mac, esp_now_info->src_addr, 6);
#endif #endif
#ifdef CONFIG_IDF_TARGET_ESP8266 #if defined CONFIG_IDF_TARGET_ESP8266 || ESP_IDF_VERSION_MAJOR == 4
ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue success.", MAC2STR(mac_addr)); ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue success.", MAC2STR(mac_addr));
#else #else
ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue success.", MAC2STR(esp_now_info->src_addr)); ESP_LOGI(TAG, "Adding incoming ESP-NOW data from MAC %02X:%02X:%02X:%02X:%02X:%02X to queue success.", MAC2STR(esp_now_info->src_addr));