espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 10:48:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

used event loop only if defined in supported features (enabled by macros) for backward compatibily with older IDFs

Browse Source
This commit is contained in:
David Cermak
2019-05-29 15:12:25 +02:00
parent 5afe3e6b24
commit edd67e1c8c
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mqtt_client.h
View File

@ -19,6 +19,12 @@
extern "C" { extern "C" {
#endif #endif
#ifndef ESP_EVENT_DECLARE_BASE
// Define event loop types if macros not available
typedef void * esp_event_loop_handle_t;
typedef void * esp_event_handler_t;
#endif
typedef struct esp_mqtt_client *esp_mqtt_client_handle_t; typedef struct esp_mqtt_client *esp_mqtt_client_handle_t;
/** /**

9
include/mqtt_supported_features.h
View File

@ -27,10 +27,15 @@
*/ */
#ifdef ESP_IDF_VERSION #ifdef ESP_IDF_VERSION
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(3, 3, 0)
// Features supported from 3.3
#define MQTT_SUPPORTED_FEATURE_EVENT_LOOP
#endif
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
// Features supported in 4.0
#define MQTT_SUPPORTED_FEATURE_WS_SUBPROTOCOL #define MQTT_SUPPORTED_FEATURE_WS_SUBPROTOCOL
#endif #endif
#endif #endif

15
mqtt_client.c
View File

@ -30,11 +30,13 @@
static const char *TAG = "MQTT_CLIENT"; static const char *TAG = "MQTT_CLIENT";
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
/** /**
* @brief Define of MQTT Event base * @brief Define of MQTT Event base
* *
*/ */
ESP_EVENT_DEFINE_BASE(MQTT_EVENTS); ESP_EVENT_DEFINE_BASE(MQTT_EVENTS);
#endif
typedef struct mqtt_state typedef struct mqtt_state
{ {
@ -55,7 +57,9 @@ typedef struct mqtt_state
typedef struct { typedef struct {
mqtt_event_callback_t event_handle; mqtt_event_callback_t event_handle;
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
esp_event_loop_handle_t event_loop_handle; esp_event_loop_handle_t event_loop_handle;
#endif
int task_stack; int task_stack;
int task_prio; int task_prio;
char *uri; char *uri;
@ -226,11 +230,13 @@ esp_err_t esp_mqtt_set_config(esp_mqtt_client_handle_t client, const esp_mqtt_cl
if (config->event_handle) { if (config->event_handle) {
cfg->event_handle = config->event_handle; cfg->event_handle = config->event_handle;
} else { } else {
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
esp_event_loop_args_t no_task_loop = { esp_event_loop_args_t no_task_loop = {
.queue_size = 1, .queue_size = 1,
.task_name = NULL, .task_name = NULL,
}; };
esp_event_loop_create(&no_task_loop, &cfg->event_loop_handle); esp_event_loop_create(&no_task_loop, &cfg->event_loop_handle);
#endif
} }
if (config->refresh_connection_after_ms) { if (config->refresh_connection_after_ms) {
@ -564,8 +570,12 @@ static esp_err_t esp_mqtt_dispatch_event(esp_mqtt_client_handle_t client)
if (client->config->event_handle) { if (client->config->event_handle) {
return client->config->event_handle(&client->event); return client->config->event_handle(&client->event);
} else { } else {
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
esp_event_post_to(client->config->event_loop_handle, MQTT_EVENTS, client->event.event_id, &client->event, sizeof(client->event), portMAX_DELAY); esp_event_post_to(client->config->event_loop_handle, MQTT_EVENTS, client->event.event_id, &client->event, sizeof(client->event), portMAX_DELAY);
return esp_event_loop_run(client->config->event_loop_handle, 0); return esp_event_loop_run(client->config->event_loop_handle, 0);
#else
return ESP_FAIL;
#endif
} }
} }
@ -1319,10 +1329,15 @@ esp_err_t esp_mqtt_client_register_event(esp_mqtt_client_handle_t client, esp_mq
if (client == NULL) { if (client == NULL) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
if (client->config->event_handle) { if (client->config->event_handle) {
ESP_LOGW(TAG, "Registering event loop while event callback is not null, clearing callback"); ESP_LOGW(TAG, "Registering event loop while event callback is not null, clearing callback");
client->config->event_handle = NULL; client->config->event_handle = NULL;
} }
return esp_event_handler_register_with(client->config->event_loop_handle, MQTT_EVENTS, event, event_handler, event_handler_arg); return esp_event_handler_register_with(client->config->event_loop_handle, MQTT_EVENTS, event, event_handler, event_handler_arg);
#else
ESP_LOGE(TAG, "Registering event handler while event loop not available in IDF version %s", IDF_VER);
return ESP_FAIL;
#endif
} }