Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_merge

Browse Source
This commit is contained in:
Angus Gratton
2019-09-16 16:18:48 +10:00
committed by Angus Gratton
parent 0efdeb202e c27fd32fbe
commit 438d513a95
361 changed files with 10271 additions and 7062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/lwip/Kconfig
+7
View File
@@ -90,6 +90,13 @@ menu "LWIP"
help
Enabling this option allows checking for available data on a netconn.
config LWIP_NETBUF_RECVINFO
bool "Enable IP_PKTINFO option"
default n
help
Enabling this option allows checking for the destination address
of a received IPv4 Packet.
config LWIP_IP_FRAG
bool "Enable fragment outgoing IP packets"
default n
components/lwip/include/apps/esp_ping.h
+1 -1
View File
@@ -24,7 +24,7 @@ extern "C" {
// gen_esp_err_to_name.py: include this as "esp_ping.h" because "components/lwip/include/apps/" is in the compiler path
// and not "components/lwip/include"
#define ESP_ERR_PING_BASE 0x6000
#define ESP_ERR_PING_BASE 0xa000
#define ESP_ERR_PING_INVALID_PARAMS ESP_ERR_PING_BASE + 0x01
#define ESP_ERR_PING_NO_MEM ESP_ERR_PING_BASE + 0x02
components/lwip/linker.lf
+3
View File
@@ -7,6 +7,7 @@ entries:
sockets:tryget_socket_unconn (noflash_text)
sockets:sock_inc_used (noflash_text)
sockets:tryget_socket_unconn_nouse (noflash_text)
sockets:tryget_socket_unconn_locked (noflash_text)
sockets:done_socket (noflash_text)
sockets:lwip_recvfrom (noflash_text)
sockets:lwip_recv_tcp (noflash_text)
@@ -15,6 +16,8 @@ entries:
sockets:lwip_send (noflash_text)
sockets:lwip_sendto (noflash_text)
sockets:event_callback (noflash_text)
sockets:lwip_select (noflash_text)
sockets:select_check_waiters (noflash_text)
api_lib:netconn_apimsg (noflash_text)
api_lib:netconn_recv_data (noflash_text)
api_lib:netconn_tcp_recvd_msg (noflash_text)
components/lwip/lwip
+1 -1
Submodule components/lwip/lwip updated: 663b2fdb41...8c801667e8
components/lwip/port/esp32/include/lwipopts.h
+7
View File
@@ -556,6 +556,12 @@
*/
#define SO_REUSE_RXTOALL CONFIG_LWIP_SO_REUSE_RXTOALL
/**
* LWIP_NETBUF_RECVINFO==1: Enable IP_PKTINFO option.
* This option is set via menuconfig.
*/
#define LWIP_NETBUF_RECVINFO CONFIG_LWIP_NETBUF_RECVINFO
/*
----------------------------------------
---------- Statistics options ----------
@@ -778,6 +784,7 @@
#define ESP_PPP 1
#define ESP_IPV6 1
#define ESP_SOCKET 1
#define ESP_LWIP_SELECT 1
#ifdef ESP_IRAM_ATTR
#undef ESP_IRAM_ATTR