From 0e4d03c76792a2faff33561eb32ba9e5c2e76aaf Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Tue, 4 Jun 2024 17:39:20 +0300 Subject: [PATCH] Added support of ESP-IDF v4.x.x --- zh_network.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_network.c b/zh_network.c index 685eb33..c12033b 100644 --- a/zh_network.c +++ b/zh_network.c @@ -12,7 +12,7 @@ /// \endcond 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); #else 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) #else static void _recv_cb(const esp_now_recv_info_t *esp_now_info, const uint8_t *data, int data_len) #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)); #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)); @@ -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); } -#ifdef CONFIG_IDF_TARGET_ESP8266 +#if defined CONFIG_IDF_TARGET_ESP8266 || ESP_IDF_VERSION_MAJOR == 4 memcpy(queue.data.sender_mac, mac_addr, 6); #else memcpy(queue.data.sender_mac, esp_now_info->src_addr, 6); #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)); #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));