From 6e4e4fab1d2c6c63c796a81b5dce33d4d33892e4 Mon Sep 17 00:00:00 2001 From: gabsuren Date: Wed, 27 Jul 2022 17:21:43 +0400 Subject: [PATCH] CI: Fix build issues --- .../protocol_examples_common/CMakeLists.txt | 2 +- components/esp_modem/CMakeLists.txt | 2 +- .../pppos_client/main/pppos_client_main.c | 15 +++++++++++---- .../main/simple_mqtt_client.cpp | 4 ++++ components/esp_websocket_client/CMakeLists.txt | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/common_components/protocol_examples_common/CMakeLists.txt b/common_components/protocol_examples_common/CMakeLists.txt index 5f903a75d..66ffbf8b4 100644 --- a/common_components/protocol_examples_common/CMakeLists.txt +++ b/common_components/protocol_examples_common/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRCS "connect.c" "stdin_out.c" "addr_from_stdin.c" INCLUDE_DIRS "include" - PRIV_REQUIRES esp_netif driver esp_eth + PRIV_REQUIRES esp_netif driver esp_eth esp_wifi vfs ) diff --git a/components/esp_modem/CMakeLists.txt b/components/esp_modem/CMakeLists.txt index ff54cae88..abe1d0eb2 100644 --- a/components/esp_modem/CMakeLists.txt +++ b/components/esp_modem/CMakeLists.txt @@ -11,7 +11,7 @@ else() src/esp_modem_uart.cpp src/esp_modem_term_uart.cpp src/esp_modem_netif.cpp) - set(dependencies driver) + set(dependencies driver esp_event esp_netif) endif() set(srcs ${platform_srcs} diff --git a/components/esp_modem/examples/pppos_client/main/pppos_client_main.c b/components/esp_modem/examples/pppos_client/main/pppos_client_main.c index e36225576..5a0c845d8 100644 --- a/components/esp_modem/examples/pppos_client/main/pppos_client_main.c +++ b/components/esp_modem/examples/pppos_client/main/pppos_client_main.c @@ -22,11 +22,13 @@ static EventGroupHandle_t event_group = NULL; static const int CONNECT_BIT = BIT0; static const int GOT_DATA_BIT = BIT2; -static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event) +static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) { + ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, event_id); + esp_mqtt_event_handle_t event = event_data; esp_mqtt_client_handle_t client = event->client; int msg_id; - switch (event->event_id) { + switch ((esp_mqtt_event_id_t)event_id) { case MQTT_EVENT_CONNECTED: ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED"); msg_id = esp_mqtt_client_subscribe(client, "/topic/esp-pppos", 0); @@ -59,7 +61,6 @@ static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event) ESP_LOGI(TAG, "MQTT other event id: %d", event->event_id); break; } - return ESP_OK; } static void on_ppp_changed(void *arg, esp_event_base_t event_base, @@ -200,11 +201,17 @@ void app_main(void) /* Wait for IP address */ xEventGroupWaitBits(event_group, CONNECT_BIT, pdTRUE, pdTRUE, portMAX_DELAY); /* Config MQTT */ +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) + esp_mqtt_client_config_t mqtt_config = { + .broker.address.uri = BROKER_URL, + }; +#else esp_mqtt_client_config_t mqtt_config = { .uri = BROKER_URL, - .event_handle = mqtt_event_handler, }; +#endif esp_mqtt_client_handle_t mqtt_client = esp_mqtt_client_init(&mqtt_config); + esp_mqtt_client_register_event(mqtt_client, ESP_EVENT_ANY_ID, mqtt_event_handler, NULL); esp_mqtt_client_start(mqtt_client); xEventGroupWaitBits(event_group, GOT_DATA_BIT, pdTRUE, pdTRUE, portMAX_DELAY); esp_mqtt_client_destroy(mqtt_client); diff --git a/components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp b/components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp index a63ffcb02..571ce4af0 100644 --- a/components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp +++ b/components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp @@ -26,7 +26,11 @@ struct MqttClientHandle { explicit MqttClientHandle(const std::string &uri) { esp_mqtt_client_config_t config = { }; +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) + config.broker.address.uri = uri.c_str(); +#else config.uri = uri.c_str(); +#endif client = esp_mqtt_client_init(&config); esp_mqtt_client_register_event(client, MQTT_EVENT_ANY, mqtt_event_handler, this); } diff --git a/components/esp_websocket_client/CMakeLists.txt b/components/esp_websocket_client/CMakeLists.txt index f013ad41d..bf8c02d65 100644 --- a/components/esp_websocket_client/CMakeLists.txt +++ b/components/esp_websocket_client/CMakeLists.txt @@ -9,5 +9,5 @@ endif() idf_component_register(SRCS "esp_websocket_client.c" INCLUDE_DIRS "include" REQUIRES lwip esp-tls tcp_transport http_parser - PRIV_REQUIRES esp_timer) + PRIV_REQUIRES esp_timer esp_event) target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")