djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'esp32s2-common-hal-mcu-delay-us' into sleep

Browse Source
This commit is contained in:
Dan Halbert 2020-11-22 21:01:49 -05:00
commit 25591a3f8a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/esp32s2/common-hal/microcontroller/__init__.c
View File

@ -44,7 +44,7 @@
#include "esp_sleep.h" #include "esp_sleep.h"
void common_hal_mcu_delay_us(uint32_t delay) { void common_hal_mcu_delay_us(uint32_t delay) {
mp_hal_delay_us(delay);
} }
volatile uint32_t nesting_count = 0; volatile uint32_t nesting_count = 0;

10
ports/esp32s2/common-hal/wifi/__init__.c
View File

@ -88,14 +88,17 @@ static void event_handler(void* arg, esp_event_base_t event_base,
} }
} }
static bool wifi_inited; static bool wifi_inited, wifi_ever_inited;
void common_hal_wifi_init(void) { void common_hal_wifi_init(void) {
wifi_inited = true; wifi_inited = true;
common_hal_wifi_radio_obj.base.type = &wifi_radio_type; common_hal_wifi_radio_obj.base.type = &wifi_radio_type;
ESP_ERROR_CHECK(esp_netif_init()); if (!wifi_ever_inited) {
ESP_ERROR_CHECK(esp_event_loop_create_default()); ESP_ERROR_CHECK(esp_netif_init());
ESP_ERROR_CHECK(esp_event_loop_create_default());
}
wifi_ever_inited = true;
wifi_radio_obj_t* self = &common_hal_wifi_radio_obj; wifi_radio_obj_t* self = &common_hal_wifi_radio_obj;
self->netif = esp_netif_create_default_wifi_sta(); self->netif = esp_netif_create_default_wifi_sta();
@ -143,7 +146,6 @@ void wifi_reset(void) {
radio->handler_instance_got_ip)); radio->handler_instance_got_ip));
ESP_ERROR_CHECK(esp_wifi_deinit()); ESP_ERROR_CHECK(esp_wifi_deinit());
esp_netif_destroy(radio->netif); esp_netif_destroy(radio->netif);
ESP_ERROR_CHECK(esp_event_loop_delete_default());
radio->netif = NULL; radio->netif = NULL;
} }