esp32: Update port to support IDF v5.0.2.
This commit updates the esp32 port to work exclusively with ESP-IDF v5.
IDF v5 is needed for some of the newer ESP32 SoCs to work, and it also
cleans up a lot of the inconsistencies between existing SoCs (eg S2, S3,
and C3).
Support for IDF v4 is dropped because it's a lot of effort to maintain both
versions at the same time.
The following components have been verified to work on the various SoCs:
ESP32 ESP32-S2 ESP32-S3 ESP32-C3
build pass pass pass pass
SPIRAM pass pass pass N/A
REPL (UART) pass pass pass pass
REPL (USB) N/A pass pass N/A
filesystem pass pass pass pass
GPIO pass pass pass pass
SPI pass pass pass pass
I2C pass pass pass pass
PWM pass pass pass pass
ADC pass pass pass pass
WiFi STA pass pass pass pass
WiFi AP pass pass pass pass
BLE pass N/A pass pass
ETH pass -- -- --
PPP pass pass pass --
sockets pass pass pass pass
SSL pass ENOMEM pass pass
RMT pass pass pass pass
NeoPixel pass pass pass pass
I2S pass pass pass N/A
ESPNow pass pass pass pass
ULP-FSM pass pass pass N/A
SDCard pass N/A N/A pass
WDT pass pass pass pass
Signed-off-by: Damien George <damien@micropython.org>
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Damien George
@@ -38,15 +38,10 @@
|
||||
#include "shared/netutils/netutils.h"
|
||||
#include "modnetwork.h"
|
||||
|
||||
#include "esp_wifi.h"
|
||||
#include "esp_log.h"
|
||||
#include "lwip/dns.h"
|
||||
|
||||
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
|
||||
#define DNS_MAIN TCPIP_ADAPTER_DNS_MAIN
|
||||
#else
|
||||
#define DNS_MAIN ESP_NETIF_DNS_MAIN
|
||||
#endif
|
||||
#include "esp_netif.h"
|
||||
#include "esp_wifi.h"
|
||||
// #include "lwip/dns.h"
|
||||
|
||||
NORETURN void esp_exceptions_helper(esp_err_t e) {
|
||||
switch (e) {
|
||||
@@ -80,64 +75,15 @@ NORETURN void esp_exceptions_helper(esp_err_t e) {
|
||||
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Would Block"));
|
||||
case ESP_ERR_WIFI_NOT_CONNECT:
|
||||
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Not Connected"));
|
||||
case ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS:
|
||||
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TCP/IP Invalid Parameters"));
|
||||
case ESP_ERR_TCPIP_ADAPTER_IF_NOT_READY:
|
||||
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TCP/IP IF Not Ready"));
|
||||
case ESP_ERR_TCPIP_ADAPTER_DHCPC_START_FAILED:
|
||||
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("TCP/IP DHCP Client Start Failed"));
|
||||
case ESP_ERR_TCPIP_ADAPTER_NO_MEM:
|
||||
mp_raise_OSError(MP_ENOMEM);
|
||||
default:
|
||||
mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("Wifi Unknown Error 0x%04x"), e);
|
||||
}
|
||||
}
|
||||
|
||||
// This function is called by the system-event task and so runs in a different
|
||||
// thread to the main MicroPython task. It must not raise any Python exceptions.
|
||||
static esp_err_t event_handler(void *ctx, system_event_t *event) {
|
||||
switch (event->event_id) {
|
||||
#if MICROPY_PY_NETWORK_WLAN
|
||||
case SYSTEM_EVENT_STA_START:
|
||||
case SYSTEM_EVENT_STA_CONNECTED:
|
||||
case SYSTEM_EVENT_STA_GOT_IP:
|
||||
case SYSTEM_EVENT_STA_DISCONNECTED:
|
||||
network_wlan_event_handler(event);
|
||||
break;
|
||||
#endif
|
||||
case SYSTEM_EVENT_GOT_IP6:
|
||||
ESP_LOGI("network", "Got IPv6");
|
||||
break;
|
||||
case SYSTEM_EVENT_ETH_START:
|
||||
ESP_LOGI("ethernet", "start");
|
||||
break;
|
||||
case SYSTEM_EVENT_ETH_STOP:
|
||||
ESP_LOGI("ethernet", "stop");
|
||||
break;
|
||||
case SYSTEM_EVENT_ETH_CONNECTED:
|
||||
ESP_LOGI("ethernet", "LAN cable connected");
|
||||
break;
|
||||
case SYSTEM_EVENT_ETH_DISCONNECTED:
|
||||
ESP_LOGI("ethernet", "LAN cable disconnected");
|
||||
break;
|
||||
case SYSTEM_EVENT_ETH_GOT_IP:
|
||||
ESP_LOGI("ethernet", "Got IP");
|
||||
break;
|
||||
default:
|
||||
ESP_LOGI("network", "event %d", event->event_id);
|
||||
break;
|
||||
}
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
STATIC mp_obj_t esp_initialize() {
|
||||
static int initialized = 0;
|
||||
if (!initialized) {
|
||||
ESP_LOGD("modnetwork", "Initializing TCP/IP");
|
||||
tcpip_adapter_init();
|
||||
ESP_LOGD("modnetwork", "Initializing Event Loop");
|
||||
esp_exceptions(esp_event_loop_init(event_handler, NULL));
|
||||
ESP_LOGD("modnetwork", "esp_event_loop_init done");
|
||||
esp_exceptions(esp_netif_init());
|
||||
initialized = 1;
|
||||
}
|
||||
return mp_const_none;
|
||||
@@ -145,11 +91,11 @@ STATIC mp_obj_t esp_initialize() {
|
||||
MP_DEFINE_CONST_FUN_OBJ_0(esp_network_initialize_obj, esp_initialize);
|
||||
|
||||
STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
|
||||
wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
|
||||
tcpip_adapter_ip_info_t info;
|
||||
tcpip_adapter_dns_info_t dns_info;
|
||||
tcpip_adapter_get_ip_info(self->if_id, &info);
|
||||
tcpip_adapter_get_dns_info(self->if_id, DNS_MAIN, &dns_info);
|
||||
base_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
|
||||
esp_netif_ip_info_t info;
|
||||
esp_netif_dns_info_t dns_info;
|
||||
esp_netif_get_ip_info(self->netif, &info);
|
||||
esp_netif_get_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_info);
|
||||
if (n_args == 1) {
|
||||
// get
|
||||
mp_obj_t tuple[4] = {
|
||||
@@ -171,36 +117,36 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
|
||||
// 16 -> 255.255.0.0
|
||||
// etc...
|
||||
uint32_t *m = (uint32_t *)&info.netmask;
|
||||
*m = htonl(0xffffffff << (32 - mp_obj_get_int(items[1])));
|
||||
*m = esp_netif_htonl(0xffffffff << (32 - mp_obj_get_int(items[1])));
|
||||
} else {
|
||||
netutils_parse_ipv4_addr(items[1], (void *)&info.netmask, NETUTILS_BIG);
|
||||
}
|
||||
netutils_parse_ipv4_addr(items[2], (void *)&info.gw, NETUTILS_BIG);
|
||||
netutils_parse_ipv4_addr(items[3], (void *)&dns_info.ip, NETUTILS_BIG);
|
||||
// To set a static IP we have to disable DHCP first
|
||||
if (self->if_id == WIFI_IF_STA || self->if_id == ESP_IF_ETH) {
|
||||
esp_err_t e = tcpip_adapter_dhcpc_stop(self->if_id);
|
||||
if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
|
||||
if (self->if_id == ESP_IF_WIFI_STA || self->if_id == ESP_IF_ETH) {
|
||||
esp_err_t e = esp_netif_dhcpc_stop(self->netif);
|
||||
if (e != ESP_OK && e != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
|
||||
esp_exceptions_helper(e);
|
||||
}
|
||||
esp_exceptions(tcpip_adapter_set_ip_info(self->if_id, &info));
|
||||
esp_exceptions(tcpip_adapter_set_dns_info(self->if_id, DNS_MAIN, &dns_info));
|
||||
} else if (self->if_id == WIFI_IF_AP) {
|
||||
esp_err_t e = tcpip_adapter_dhcps_stop(WIFI_IF_AP);
|
||||
if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
|
||||
esp_exceptions(esp_netif_set_ip_info(self->netif, &info));
|
||||
esp_exceptions(esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_info));
|
||||
} else if (self->if_id == ESP_IF_WIFI_AP) {
|
||||
esp_err_t e = esp_netif_dhcps_stop(self->netif);
|
||||
if (e != ESP_OK && e != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
|
||||
esp_exceptions_helper(e);
|
||||
}
|
||||
esp_exceptions(tcpip_adapter_set_ip_info(WIFI_IF_AP, &info));
|
||||
esp_exceptions(tcpip_adapter_set_dns_info(WIFI_IF_AP, DNS_MAIN, &dns_info));
|
||||
esp_exceptions(tcpip_adapter_dhcps_start(WIFI_IF_AP));
|
||||
esp_exceptions(esp_netif_set_ip_info(self->netif, &info));
|
||||
esp_exceptions(esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_info));
|
||||
esp_exceptions(esp_netif_dhcps_start(self->netif));
|
||||
}
|
||||
} else {
|
||||
// check for the correct string
|
||||
const char *mode = mp_obj_str_get_str(args[1]);
|
||||
if ((self->if_id != WIFI_IF_STA && self->if_id != ESP_IF_ETH) || strcmp("dhcp", mode)) {
|
||||
if ((self->if_id != ESP_IF_WIFI_STA && self->if_id != ESP_IF_ETH) || strcmp("dhcp", mode)) {
|
||||
mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
|
||||
}
|
||||
esp_exceptions(tcpip_adapter_dhcpc_start(self->if_id));
|
||||
esp_exceptions(esp_netif_dhcpc_start(self->netif));
|
||||
}
|
||||
return mp_const_none;
|
||||
}
|
||||
@@ -212,9 +158,4 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_network_phy_mode_obj, 0, 1, esp_phy_mode);
|
||||
|
||||
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
|
||||
#define TEST_WIFI_AUTH_MAX 9
|
||||
#else
|
||||
#define TEST_WIFI_AUTH_MAX 8
|
||||
#endif
|
||||
_Static_assert(WIFI_AUTH_MAX == TEST_WIFI_AUTH_MAX, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
|
||||
_Static_assert(WIFI_AUTH_MAX == 10, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
|
||||
|
||||
Reference in New Issue
Block a user