RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

cpu/esp32: move wifi_connect to event handler

Browse Source 
Before function wifi_connect is executed, starting the WiFi driver should have been finished. This is indicated by the WiFi driver by sending event SYSTEM_EVENT_STA_START. Function wifi_connect is moved therefore to the event handler for SYSTEM_EVENT_STA_START.
This commit is contained in:
Gunar Schorcht 2019-01-13 17:25:51 +01:00 committed by Schorcht
parent 8a1da21b1a
commit 2c3ac91cf3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cpu/esp32/esp-wifi/esp_wifi_netdev.c
View File

@ -104,25 +104,36 @@ esp_err_t _esp_wifi_rx_cb(void *buffer, uint16_t len, void *eb)
*/ */
static esp_err_t IRAM_ATTR _esp_system_event_handler(void *ctx, system_event_t *event) static esp_err_t IRAM_ATTR _esp_system_event_handler(void *ctx, system_event_t *event)
{ {
esp_err_t result;
switch(event->event_id) { switch(event->event_id) {
case SYSTEM_EVENT_STA_START: case SYSTEM_EVENT_STA_START:
DEBUG("%s WiFi started\n", __func__); DEBUG("%s WiFi started\n", __func__);
result = esp_wifi_connect();
if (result != ESP_OK) {
LOG_TAG_ERROR("esp_wifi", "esp_wifi_connect failed with return "
"value %d\n", result);
}
break; break;
case SYSTEM_EVENT_SCAN_DONE: case SYSTEM_EVENT_SCAN_DONE:
DEBUG("%s WiFi scan done\n", __func__); DEBUG("%s WiFi scan done\n", __func__);
break; break;
case SYSTEM_EVENT_STA_CONNECTED: case SYSTEM_EVENT_STA_CONNECTED:
DEBUG("%s WiFi connected\n", __func__); DEBUG("%s WiFi connected\n", __func__);
_esp_wifi_dev.connected = true; _esp_wifi_dev.connected = true;
_esp_wifi_dev.event = SYSTEM_EVENT_ETH_CONNECTED; _esp_wifi_dev.event = SYSTEM_EVENT_ETH_CONNECTED;
_esp_wifi_dev.netdev.event_callback(&_esp_wifi_dev.netdev, NETDEV_EVENT_ISR); _esp_wifi_dev.netdev.event_callback(&_esp_wifi_dev.netdev, NETDEV_EVENT_ISR);
break; break;
case SYSTEM_EVENT_STA_DISCONNECTED: case SYSTEM_EVENT_STA_DISCONNECTED:
DEBUG("%s WiFi disconnected\n", __func__); DEBUG("%s WiFi disconnected\n", __func__);
_esp_wifi_dev.connected = false; _esp_wifi_dev.connected = false;
_esp_wifi_dev.event = SYSTEM_EVENT_ETH_DISCONNECTED; _esp_wifi_dev.event = SYSTEM_EVENT_ETH_DISCONNECTED;
_esp_wifi_dev.netdev.event_callback(&_esp_wifi_dev.netdev, NETDEV_EVENT_ISR); _esp_wifi_dev.netdev.event_callback(&_esp_wifi_dev.netdev, NETDEV_EVENT_ISR);
break; break;
default: default:
break; break;
} }
@ -224,12 +235,6 @@ static void esp_wifi_setup (esp_wifi_netdev_t* dev)
dev->connected = false; dev->connected = false;
mutex_init(&dev->dev_lock); mutex_init(&dev->dev_lock);
result = esp_wifi_connect();
if (result != ESP_OK) {
LOG_TAG_ERROR("esp_wifi", "esp_wifi_connect failed with return value %d\n", result);
return;
}
} }
static int _esp_wifi_init(netdev_t *netdev) static int _esp_wifi_init(netdev_t *netdev)