From 370f791151892e51f00a2a26afa81dd018b79b34 Mon Sep 17 00:00:00 2001 From: bogd Date: Sun, 11 May 2025 12:49:02 +0200 Subject: [PATCH] fixed minor incompatibilities with idf 5.4 version --- include/CommandProcSys.h | 4 ++-- src/CommandProcSys.c | 6 +++--- src/MQTT.c | 6 ++++++ src/NetTransport.c | 2 +- src/WiFiTransport.c | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/CommandProcSys.h b/include/CommandProcSys.h index d06fc31..6f3529c 100644 --- a/include/CommandProcSys.h +++ b/include/CommandProcSys.h @@ -39,8 +39,8 @@ int ExecCommand(char *cmd); void GetObjectsInfo(char *data); void SetCustomObjects(obj_struct_t *obj); -obj_struct_t* GetSystemObjects(); -obj_struct_t* GetCustomObjects(); +const obj_struct_t* GetSystemObjects(); +const obj_struct_t* GetCustomObjects(); diff --git a/src/CommandProcSys.c b/src/CommandProcSys.c index 4b0adde..7cd6cce 100644 --- a/src/CommandProcSys.c +++ b/src/CommandProcSys.c @@ -94,12 +94,12 @@ const obj_struct_t com_obj_arr[] = { { 0 } }; -obj_struct_t* GetSystemObjects() +const obj_struct_t* GetSystemObjects() { - return &com_obj_arr; + return (obj_struct_t*)&com_obj_arr; } -obj_struct_t* GetCustomObjects() +const obj_struct_t* GetCustomObjects() { return custom_com_obj_arr; } diff --git a/src/MQTT.c b/src/MQTT.c index 146ee1d..1e0b550 100644 --- a/src/MQTT.c +++ b/src/MQTT.c @@ -27,6 +27,9 @@ #include "NetTransport.h" #include "MQTT.h" #include "UserCallbacks.h" +#if (ESP_IDF_VERSION_MAJOR == 5 && ESP_IDF_VERSION_MINOR > 1) +#include "esp_log_level.h" +#endif #define TAG "MQTT" #define SERVICE_NAME "SYSTEM" // Dedicated service name @@ -630,6 +633,9 @@ esp_err_t ExtendedLog(esp_log_level_t level, char *format, ...) case ESP_LOG_ERROR: ESP_LOGE(SPIRAL_LOG_TAG, "%s", data); break; +#if (ESP_IDF_VERSION_MAJOR == 5 && ESP_IDF_VERSION_MINOR > 1) + case ESP_LOG_MAX: +#endif } for (int idx = 0; idx < 2; idx++) diff --git a/src/NetTransport.c b/src/NetTransport.c index fdf0d51..0bb7c47 100644 --- a/src/NetTransport.c +++ b/src/NetTransport.c @@ -30,7 +30,7 @@ extern struct netif *netif_default; esp_netif_t* GetNetifCurrentDefault() { - return netif_default; + return (esp_netif_t*)netif_default; } esp_netif_t* GetNetifByName(char *name) diff --git a/src/WiFiTransport.c b/src/WiFiTransport.c index b585e16..f81d733 100644 --- a/src/WiFiTransport.c +++ b/src/WiFiTransport.c @@ -418,7 +418,7 @@ static void wifi_init_apsta(void *pvParameter) ESP_ERROR_CHECK(esp_netif_set_hostname(sta_netif, "test_TEST")); ESP_ERROR_CHECK(esp_netif_set_hostname(ap_netif, GetSysConf()->NetBIOSName)); char name[32]; - esp_netif_get_hostname(sta_netif, &name); + esp_netif_get_hostname(sta_netif, (const char**)(&name)); ESP_LOGW(TAG, "Net bios name set to %s", name); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_APSTA));