Skip to content

multi-mss menus for lwip2, remove lwip xcc variant, lwip2 readme, updates and fixes #4039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2017
Merged

multi-mss menus for lwip2, remove lwip xcc variant, lwip2 readme, updates and fixes #4039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
432 changes: 240 additions & 192 deletions boards.txt
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tools/sdk/ld/eagle.app.v6.common.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ SECTIONS
*liblwip_gcc.a:(.literal .text .literal.* .text.*)
*liblwip_src.a:(.literal .text .literal.* .text.*)
*liblwip2.a:(.literal .text .literal.* .text.*)
*liblwip2_1460.a:(.literal .text .literal.* .text.*)
*libaxtls.a:(.literal .text .literal.* .text.*)
*libat.a:(.literal.* .text.*)
*libcrypto.a:(.literal.* .text.*)
Expand Down
Binary file modified tools/sdk/lib/liblwip2.a
View file
Open in desktop
Binary file not shown.
Binary file added tools/sdk/lib/liblwip2_1460.a
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions tools/sdk/lwip2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
all install clean: builder/lwip2-src/README
make -C builder -f Makefile.arduino $@

download: builder/lwip2-src/README

builder/lwip2-src/README:
git submodule update --init --recursive builder
10 changes: 10 additions & 0 deletions tools/sdk/lwip2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

make install download, compile, install lwip2
make download download lwIP-2 builder
make clean clean builder only

glue and lwIP debug options are in builder/glue/gluedebug.h
MSS values are in builder/Makefile.arduino
MSS values in boards.txt are only informative

current lwip2 submodule repository: https://github.com/d-a-v/esp82xx-nonos-linklayer/tree/arduino-2.4.0
2 changes: 1 addition & 1 deletion tools/sdk/lwip2/builder
Open in desktop
Submodule builder updated 22 files
+15 −2 Makefile.arduino
+7 −3 glue-esp/lwip-esp.c
+7 −7 glue-lwip/arduino/lwipopts.h
+0 −9 glue-lwip/esp-millis.h
+334 −0 glue-lwip/esp-ping.c
+1,374 −0 glue-lwip/espconn.c
+206 −0 glue-lwip/espconn_buf.c
+1,485 −0 glue-lwip/espconn_tcp.c
+432 −0 glue-lwip/espconn_udp.c
+29 −26 glue-lwip/lwip-git.c
+13 −0 glue-lwip/lwip-git.h
+690 −0 glue-lwip/lwip/apps-esp/espconn.h
+60 −0 glue-lwip/lwip/apps-esp/espconn_buf.h
+61 −0 glue-lwip/lwip/apps-esp/espconn_tcp.h
+64 −0 glue-lwip/lwip/apps-esp/espconn_udp.h
+85 −0 glue-lwip/lwip/apps-esp/ping.h
+1 −1 glue/glue.h
+4 −4 makefiles/Makefile.build-lwip2
+2 −2 makefiles/Makefile.defs
+4 −1 makefiles/Makefile.glue
+6 −7 makefiles/Makefile.lwip2
+4 −0 makefiles/Makefile.rules
14 changes: 7 additions & 7 deletions tools/sdk/lwip2/include/lwipopts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@

/** DNS maximum host name length supported in the name table. */
#if !defined DNS_MAX_NAME_LENGTH || defined __DOXYGEN__
#define DNS_MAX_NAME_LENGTH 48 // 256
#define DNS_MAX_NAME_LENGTH 128 // 256
#endif

/** The maximum of DNS servers
Expand Down Expand Up @@ -1214,9 +1214,9 @@
* when opening a connection. For the transmit size, this MSS sets
* an upper limit on the MSS advertised by the remote host.
*/
#if !defined TCP_MSS || defined __DOXYGEN__
#define TCP_MSS 536
#endif
//#if !defined TCP_MSS || defined __DOXYGEN__
//#define TCP_MSS 536
//#endif

/**
* TCP_CALCULATE_EFF_SEND_MSS: "The maximum size of a segment that TCP really
Expand Down Expand Up @@ -1312,7 +1312,7 @@
* TCP_MSS/4: Try to create 4 fragments or less per TCP packet.
*/
#if !defined TCP_OVERSIZE || defined __DOXYGEN__
#define TCP_OVERSIZE TCP_MSS
#define TCP_OVERSIZE TCP_MSS // TCP_MSS is STRONGLY SUGGESTED FOR ESP8266 BLOBS !!
#endif

/**
Expand Down Expand Up @@ -1506,7 +1506,7 @@
* @todo: TCP and IP-frag do not work with this, yet:
*/
#if !defined LWIP_NETIF_TX_SINGLE_PBUF || defined __DOXYGEN__
#define LWIP_NETIF_TX_SINGLE_PBUF 1 // MANDATORY FOR ESP8266 BLOBS !!
#define LWIP_NETIF_TX_SINGLE_PBUF 1 // 1 is STRONGLY SUGGESTED FOR ESP8266 BLOBS !!
#endif /* LWIP_NETIF_TX_SINGLE_PBUF */

/**
Expand Down Expand Up @@ -2990,7 +2990,7 @@
// so we do not define it. sntp server can come from dhcp server, or by
// user.
//#define SNTP_SERVER_ADDRESS "pool.ntp.org" // default
#define SNTP_GET_SERVERS_FROM_DHCP 1
#define SNTP_GET_SERVERS_FROM_DHCP 3
#define SNTP_SET_SYSTEM_TIME_US(t,us) do { struct timeval tv = { t, us }; settimeofday(&tv, NULL); } while (0)

/*
Expand Down