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

MQTT examples use new event

Browse Source
This commit is contained in:
liu zhifu
2019-07-07 14:14:55 +08:00
parent 92aa01deb8
commit fb3d2107cd
3 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
examples/emitter-client/main/app_main.c
View File

@ -5,7 +5,6 @@
#include "esp_wifi.h" #include "esp_wifi.h"
#include "esp_system.h" #include "esp_system.h"
#include "nvs_flash.h" #include "nvs_flash.h"
#include "esp_event_loop.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
@ -25,33 +24,45 @@ static const char *TAG = "MQTTS_SAMPLE";
static EventGroupHandle_t wifi_event_group; static EventGroupHandle_t wifi_event_group;
const static int CONNECTED_BIT = BIT0; const static int CONNECTED_BIT = BIT0;
static void wifi_event_handler(void* arg, esp_event_base_t event_base,
int32_t event_id, void* event_data)
static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
{ {
switch (event->event_id) { switch (event_id) {
case SYSTEM_EVENT_STA_START: case WIFI_EVENT_STA_START:
esp_wifi_connect(); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case WIFI_EVENT_STA_DISCONNECTED:
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
break;
case SYSTEM_EVENT_STA_DISCONNECTED:
esp_wifi_connect(); esp_wifi_connect();
xEventGroupClearBits(wifi_event_group, CONNECTED_BIT); xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
break; break;
default: default:
break; break;
} }
return ESP_OK; return;
}
static void ip_event_handler(void* arg, esp_event_base_t event_base,
int32_t event_id, void* event_data)
{
switch (event_id) {
case IP_EVENT_STA_GOT_IP:
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
break;
default:
break;
}
return;
} }
static void wifi_init(void) static void wifi_init(void)
{ {
tcpip_adapter_init(); tcpip_adapter_init();
wifi_event_group = xEventGroupCreate(); wifi_event_group = xEventGroupCreate();
ESP_ERROR_CHECK(esp_event_loop_init(wifi_event_handler, NULL)); ESP_ERROR_CHECK(esp_event_loop_create_default());
ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &wifi_event_handler, NULL));
ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &ip_event_handler, NULL));
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_wifi_init(&cfg)); ESP_ERROR_CHECK(esp_wifi_init(&cfg));
ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM)); ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
@ -104,6 +115,8 @@ static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event)
case MQTT_EVENT_ERROR: case MQTT_EVENT_ERROR:
ESP_LOGI(TAG, "MQTT_EVENT_ERROR"); ESP_LOGI(TAG, "MQTT_EVENT_ERROR");
break; break;
default:
break;
} }
return ESP_OK; return ESP_OK;
} }

41
examples/mqtt_ssl_mutual_auth/main/app_main.c
View File

@ -5,7 +5,6 @@
#include "esp_wifi.h" #include "esp_wifi.h"
#include "esp_system.h" #include "esp_system.h"
#include "nvs_flash.h" #include "nvs_flash.h"
#include "esp_event_loop.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
@ -18,6 +17,8 @@
#include "lwip/netdb.h" #include "lwip/netdb.h"
#include "esp_log.h" #include "esp_log.h"
#include "esp_event.h"
#include "tcpip_adapter.h"
#include "mqtt_client.h" #include "mqtt_client.h"
static const char *TAG = "MQTTS_SAMPLE"; static const char *TAG = "MQTTS_SAMPLE";
@ -25,33 +26,45 @@ static const char *TAG = "MQTTS_SAMPLE";
static EventGroupHandle_t wifi_event_group; static EventGroupHandle_t wifi_event_group;
const static int CONNECTED_BIT = BIT0; const static int CONNECTED_BIT = BIT0;
static void wifi_event_handler(void* arg, esp_event_base_t event_base,
int32_t event_id, void* event_data)
static esp_err_t wifi_event_handler(void *ctx, system_event_t *event)
{ {
switch (event->event_id) { switch (event_id) {
case SYSTEM_EVENT_STA_START: case WIFI_EVENT_STA_START:
esp_wifi_connect(); esp_wifi_connect();
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case WIFI_EVENT_STA_DISCONNECTED:
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
break;
case SYSTEM_EVENT_STA_DISCONNECTED:
esp_wifi_connect(); esp_wifi_connect();
xEventGroupClearBits(wifi_event_group, CONNECTED_BIT); xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
break; break;
default: default:
break; break;
} }
return ESP_OK; return;
}
static void ip_event_handler(void* arg, esp_event_base_t event_base,
int32_t event_id, void* event_data)
{
switch (event_id) {
case IP_EVENT_STA_GOT_IP:
xEventGroupSetBits(wifi_event_group, CONNECTED_BIT);
break;
default:
break;
}
return;
} }
static void wifi_init(void) static void wifi_init(void)
{ {
tcpip_adapter_init(); tcpip_adapter_init();
wifi_event_group = xEventGroupCreate(); wifi_event_group = xEventGroupCreate();
ESP_ERROR_CHECK(esp_event_loop_init(wifi_event_handler, NULL)); ESP_ERROR_CHECK(esp_event_loop_create_default());
ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &wifi_event_handler, NULL));
ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &ip_event_handler, NULL));
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_wifi_init(&cfg)); ESP_ERROR_CHECK(esp_wifi_init(&cfg));
ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM)); ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
@ -114,6 +127,8 @@ static esp_err_t mqtt_event_handler(esp_mqtt_event_handle_t event)
case MQTT_EVENT_ERROR: case MQTT_EVENT_ERROR:
ESP_LOGI(TAG, "MQTT_EVENT_ERROR"); ESP_LOGI(TAG, "MQTT_EVENT_ERROR");
break; break;
default:
break;
} }
return ESP_OK; return ESP_OK;
} }

1
mqtt_client.c
View File

@ -13,7 +13,6 @@
/* using uri parser */ /* using uri parser */
#include "http_parser.h" #include "http_parser.h"
#include "esp_event_loop.h"
#ifdef MQTT_DISABLE_API_LOCKS #ifdef MQTT_DISABLE_API_LOCKS
# define MQTT_API_LOCK(c) # define MQTT_API_LOCK(c)