diff --git a/include/MQTT.h b/include/MQTT.h index 949b51c..11dea00 100644 --- a/include/MQTT.h +++ b/include/MQTT.h @@ -72,7 +72,7 @@ typedef struct mqtt_client_t* GetMQTTHandlesPool(int idx); QueueHandle_t GetMQTTSendQueue(int idx); void ComposeTopic(char *topic, int idx, char *service_name, char *direct); -void regUserEventHandler(void (*event_handler)(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)); +void regUserEventHandler(void (*event_handler)(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)); void SystemDataHandler(char *data, uint32_t len, int idx); #endif /* MAIN_INCLUDE_MQTT_H_ */ diff --git a/src/MQTT.c b/src/MQTT.c index 0746dea..334a39c 100644 --- a/src/MQTT.c +++ b/src/MQTT.c @@ -48,9 +48,9 @@ static void mqtt2_system_event_handler(void *handler_args, esp_event_base_t base static void mqtt1_user_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); static void mqtt2_user_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); -void (*UserEventHandler)(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); +void (*UserEventHandler)(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data); void regUserEventHandler( - void (*event_handler)(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)) + void (*event_handler)(int idx, void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)) { UserEventHandler = event_handler; } @@ -321,11 +321,11 @@ static void mqtt2_system_event_handler(void *handler_args, esp_event_base_t base } static void mqtt1_user_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) { - UserEventHandler(handler_args, base, event_id, event_data); + UserEventHandler(0, handler_args, base, event_id, event_data); } static void mqtt2_user_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) { - UserEventHandler(handler_args, base, event_id, event_data); + UserEventHandler(1, handler_args, base, event_id, event_data); } #endif