espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

change(esp_wifi): Update dpp enrollee example to use updated events

Browse Source
This commit is contained in:
Kapil Gupta
2025-05-07 16:00:21 +05:30
committed by sibeibei
parent 30c24b2f31
commit 9189406b05
1 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
examples/wifi/wifi_easy_connect/dpp-enrollee/main/dpp_enrollee_main.c
View File

@@ -54,57 +54,61 @@ static EventGroupHandle_t s_dpp_event_group;
static void event_handler(void *arg, esp_event_base_t event_base, static void event_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data) int32_t event_id, void *event_data)
{ {
if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) { if (event_base == WIFI_EVENT) {
switch (event_id) {
case WIFI_EVENT_STA_START:
ESP_ERROR_CHECK(esp_supp_dpp_start_listen()); ESP_ERROR_CHECK(esp_supp_dpp_start_listen());
ESP_LOGI(TAG, "Started listening for DPP Authentication"); ESP_LOGI(TAG, "Started listening for DPP Authentication");
} else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) { break;
case WIFI_EVENT_STA_DISCONNECTED:
if (s_retry_num < WIFI_MAX_RETRY_NUM) { if (s_retry_num < WIFI_MAX_RETRY_NUM) {
esp_wifi_connect(); esp_wifi_connect();
s_retry_num++; s_retry_num++;
ESP_LOGI(TAG, "retry to connect to the AP"); ESP_LOGI(TAG, "Disconnect event, retry to connect to the AP");
} else { } else {
xEventGroupSetBits(s_dpp_event_group, DPP_CONNECT_FAIL_BIT); xEventGroupSetBits(s_dpp_event_group, DPP_CONNECT_FAIL_BIT);
} }
ESP_LOGI(TAG, "connect to the AP fail"); break;
} else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_CONNECTED) { case WIFI_EVENT_STA_CONNECTED:
ESP_LOGI(TAG, "Successfully connected to the AP ssid : %s ", s_dpp_wifi_config.sta.ssid); ESP_LOGI(TAG, "Successfully connected to the AP ssid : %s ", s_dpp_wifi_config.sta.ssid);
} else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { break;
ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data; case WIFI_EVENT_DPP_URI_READY:
ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip)); wifi_event_dpp_uri_ready_t *uri_data = event_data;
s_retry_num = 0; if (uri_data != NULL) {
xEventGroupSetBits(s_dpp_event_group, DPP_CONNECTED_BIT);
}
}
void dpp_enrollee_event_cb(esp_supp_dpp_event_t event, void *data)
{
switch (event) {
case ESP_SUPP_DPP_URI_READY:
if (data != NULL) {
esp_qrcode_config_t cfg = ESP_QRCODE_CONFIG_DEFAULT(); esp_qrcode_config_t cfg = ESP_QRCODE_CONFIG_DEFAULT();
ESP_LOGI(TAG, "Scan below QR Code to configure the enrollee:"); ESP_LOGI(TAG, "Scan below QR Code to configure the enrollee:");
esp_qrcode_generate(&cfg, (const char *)data); esp_qrcode_generate(&cfg, (const char *)uri_data->uri);
} }
break; break;
case ESP_SUPP_DPP_CFG_RECVD: case WIFI_EVENT_DPP_CFG_RECVD:
memcpy(&s_dpp_wifi_config, data, sizeof(s_dpp_wifi_config)); wifi_event_dpp_config_received_t *config = event_data;
memcpy(&s_dpp_wifi_config, &config->wifi_cfg, sizeof(s_dpp_wifi_config));
s_retry_num = 0; s_retry_num = 0;
esp_wifi_set_config(ESP_IF_WIFI_STA, &s_dpp_wifi_config); esp_wifi_set_config(ESP_IF_WIFI_STA, &s_dpp_wifi_config);
esp_wifi_connect(); esp_wifi_connect();
break; break;
case ESP_SUPP_DPP_FAIL: case WIFI_EVENT_DPP_FAILED:
wifi_event_dpp_failed_t *dpp_failure = event_data;
if (s_retry_num < 5) { if (s_retry_num < 5) {
ESP_LOGI(TAG, "DPP Auth failed (Reason: %s), retry...", esp_err_to_name((int)data)); ESP_LOGI(TAG, "DPP Auth failed (Reason: %s), retry...", esp_err_to_name((int)dpp_failure->failure_reason));
ESP_ERROR_CHECK(esp_supp_dpp_start_listen()); ESP_ERROR_CHECK(esp_supp_dpp_start_listen());
s_retry_num++; s_retry_num++;
} else { } else {
xEventGroupSetBits(s_dpp_event_group, DPP_AUTH_FAIL_BIT); xEventGroupSetBits(s_dpp_event_group, DPP_AUTH_FAIL_BIT);
} }
break; break;
default: default:
break; break;
} }
}
if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
s_retry_num = 0;
xEventGroupSetBits(s_dpp_event_group, DPP_CONNECTED_BIT);
}
} }
esp_err_t dpp_enrollee_bootstrap(void) esp_err_t dpp_enrollee_bootstrap(void)
@@ -157,7 +161,7 @@ void dpp_enrollee_init(void)
ESP_ERROR_CHECK(esp_wifi_init(&cfg)); ESP_ERROR_CHECK(esp_wifi_init(&cfg));
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_supp_dpp_init(dpp_enrollee_event_cb)); ESP_ERROR_CHECK(esp_supp_dpp_init(NULL));
ESP_ERROR_CHECK(dpp_enrollee_bootstrap()); ESP_ERROR_CHECK(dpp_enrollee_bootstrap());
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
@@ -171,10 +175,7 @@ void dpp_enrollee_init(void)
/* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
* happened. */ * happened. */
if (bits & DPP_CONNECTED_BIT) { if (bits & DPP_CONNECT_FAIL_BIT) {
ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
s_dpp_wifi_config.sta.ssid, s_dpp_wifi_config.sta.password);
} else if (bits & DPP_CONNECT_FAIL_BIT) {
ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s", ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
s_dpp_wifi_config.sta.ssid, s_dpp_wifi_config.sta.password); s_dpp_wifi_config.sta.ssid, s_dpp_wifi_config.sta.password);
} else if (bits & DPP_AUTH_FAIL_BIT) { } else if (bits & DPP_AUTH_FAIL_BIT) {