Merge pull request #1892 from me-no-dev/lwipsrc

Update and move lwIP headers, add options to use different lwIP build for generic device

Author: igrr

.gitignore

@@ -5,3 +5,6 @@ tools/esptool/
 tools/mkspiffs/
 package/versions/
 exclude.txt
+tools/sdk/lib/liblwip_src.a
+tools/sdk/lwip/src/build
+tools/sdk/lwip/src/liblwip_src.a

boards.txt

@@ -7,6 +7,7 @@ menu.ResetMethod=Reset Method
 menu.ESPModule=Module
 menu.Debug=Debug port
 menu.DebugLevel=Debug Level
+menu.LwIPVariant=lwIP Variant
 
 ##############################################################
 generic.name=Generic ESP8266 Module
@@ -29,6 +30,8 @@ generic.build.flash_mode=qio
 generic.build.spiffs_pagesize=256
 generic.build.debug_port=
 generic.build.debug_level=
+generic.build.lwip_lib=-llwip
+generic.build.lwip_flags=
 
 generic.menu.CpuFrequency.80=80 MHz
 generic.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -247,6 +250,8 @@ espduino.build.flash_size=4M
 espduino.build.flash_freq=40
 espduino.build.debug_port=
 espduino.build.debug_level=
+espduino.build.lwip_lib=-llwip
+espduino.build.lwip_flags=
 
 espduino.menu.CpuFrequency.80=80 MHz
 espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -310,6 +315,8 @@ huzzah.build.flash_size=4M
 huzzah.build.flash_freq=40
 huzzah.build.debug_port=
 huzzah.build.debug_level=
+huzzah.build.lwip_lib=-llwip
+huzzah.build.lwip_flags=
 
 huzzah.menu.CpuFrequency.80=80 MHz
 huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -359,6 +366,8 @@ espresso_lite_v1.build.variant=espresso_lite_v1
 espresso_lite_v1.build.flash_mode=dio
 espresso_lite_v1.build.flash_size=4M
 espresso_lite_v1.build.flash_freq=40
+espresso_lite_v1.build.lwip_lib=-llwip
+espresso_lite_v1.build.lwip_flags=
 
 espresso_lite_v1.menu.CpuFrequency.80=80 MHz
 espresso_lite_v1.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -464,6 +473,8 @@ espresso_lite_v2.build.variant=espresso_lite_v2
 espresso_lite_v2.build.flash_mode=dio
 espresso_lite_v2.build.flash_size=4M
 espresso_lite_v2.build.flash_freq=40
+espresso_lite_v2.build.lwip_lib=-llwip
+espresso_lite_v2.build.lwip_flags=
 
 espresso_lite_v2.menu.CpuFrequency.80=80 MHz
 espresso_lite_v2.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -575,6 +586,8 @@ nodemcu.build.flash_size=4M
 nodemcu.build.flash_freq=40
 nodemcu.build.debug_port=
 nodemcu.build.debug_level=
+nodemcu.build.lwip_lib=-llwip
+nodemcu.build.lwip_flags=
 
 nodemcu.menu.CpuFrequency.80=80 MHz
 nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -639,6 +652,8 @@ nodemcuv2.build.flash_size=4M
 nodemcuv2.build.flash_freq=40
 nodemcuv2.build.debug_port=
 nodemcuv2.build.debug_level=
+nodemcuv2.build.lwip_lib=-llwip
+nodemcuv2.build.lwip_flags=
 
 nodemcuv2.menu.CpuFrequency.80=80 MHz
 nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -710,6 +725,8 @@ modwifi.build.spiffs_pagesize=256
 modwifi.build.spiffs_blocksize=8192
 modwifi.build.debug_port=
 modwifi.build.debug_level=
+modwifi.build.lwip_lib=-llwip
+modwifi.build.lwip_flags=
 
 modwifi.menu.CpuFrequency.80=80 MHz
 modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -764,6 +781,8 @@ thing.build.spiffs_blocksize=4096
 thing.build.spiffs_pagesize=256
 thing.build.debug_port=
 thing.build.debug_level=
+thing.build.lwip_lib=-llwip
+thing.build.lwip_flags=
 
 thing.menu.CpuFrequency.80=80 MHz
 thing.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -813,6 +832,8 @@ thingdev.build.flash_ld=eagle.flash.512k64.ld
 thingdev.build.flash_freq=40
 thingdev.build.debug_port=
 thingdev.build.debug_level=
+thingdev.build.lwip_lib=-llwip
+thingdev.build.lwip_flags=
 
 thingdev.menu.CpuFrequency.80=80 MHz
 thingdev.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -860,6 +881,8 @@ esp210.build.flash_size=4M
 esp210.build.flash_freq=40
 esp210.build.debug_port=
 esp210.build.debug_level=
+esp210.build.lwip_lib=-llwip
+esp210.build.lwip_flags=
 
 esp210.menu.CpuFrequency.80=80 MHz
 esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -951,6 +974,8 @@ d1_mini.build.flash_size=4M
 d1_mini.build.flash_freq=40
 d1_mini.build.debug_port=
 d1_mini.build.debug_level=
+d1_mini.build.lwip_lib=-llwip
+d1_mini.build.lwip_flags=
 
 d1_mini.menu.CpuFrequency.80=80 MHz
 d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -1017,6 +1042,8 @@ d1.build.flash_size=4M
 d1.build.flash_freq=40
 d1.build.debug_port=
 d1.build.debug_level=
+d1.build.lwip_lib=-llwip
+d1.build.lwip_flags=
 
 d1.menu.CpuFrequency.80=80 MHz
 d1.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -1085,6 +1112,8 @@ espino.build.flash_freq=40
 espino.build.spiffs_pagesize=256
 espino.build.debug_port=
 espino.build.debug_level=
+espino.build.lwip_lib=-llwip
+espino.build.lwip_flags=
 
 espino.menu.CpuFrequency.80=80 MHz
 espino.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -1159,6 +1188,8 @@ espinotee.build.flash_size=4M
 espinotee.build.flash_freq=40
 espinotee.build.debug_port=
 espinotee.build.debug_level=
+espinotee.build.lwip_lib=-llwip
+espinotee.build.lwip_flags=
 
 espinotee.menu.CpuFrequency.80=80 MHz
 espinotee.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -1222,6 +1253,8 @@ wifinfo.build.board=ESP8266_ESP12
 wifinfo.build.spiffs_pagesize=256
 wifinfo.build.debug_port=Serial1
 wifinfo.build.debug_level=Wifinfo
+wifinfo.build.lwip_lib=-llwip
+wifinfo.build.lwip_flags=
 
 wifinfo.menu.Debug.Disabled=Disabled
 wifinfo.menu.Debug.Disabled.build.debug_port=
@@ -1332,3 +1365,221 @@ wifinfo.menu.UploadSpeed.512000.windows=512000
 wifinfo.menu.UploadSpeed.512000.upload.speed=512000
 wifinfo.menu.UploadSpeed.921600=921600
 wifinfo.menu.UploadSpeed.921600.upload.speed=921600
+
+
+##############################################################
+coredev.name=Core Development Module
+
+coredev.upload.tool=esptool
+coredev.upload.speed=115200
+coredev.upload.resetmethod=ck
+coredev.upload.maximum_size=434160
+coredev.upload.maximum_data_size=81920
+coredev.upload.wait_for_upload_port=true
+coredev.serial.disableDTR=true
+coredev.serial.disableRTS=true
+
+coredev.build.mcu=esp8266
+coredev.build.f_cpu=80000000L
+coredev.build.board=ESP8266_ESP01
+coredev.build.core=esp8266
+coredev.build.variant=generic
+coredev.build.flash_mode=qio
+coredev.build.spiffs_pagesize=256
+coredev.build.debug_port=
+coredev.build.debug_level=
+coredev.build.lwip_lib=-llwip
+coredev.build.lwip_flags=
+
+
+coredev.menu.LwIPVariant.Espressif=Espressif (xcc)
+coredev.menu.LwIPVariant.Espressif.build.lwip_lib=-llwip
+coredev.menu.LwIPVariant.Espressif.build.lwip_flags=
+coredev.menu.LwIPVariant.Prebuilt=Prebuilt Source (gcc)
+coredev.menu.LwIPVariant.Prebuilt.build.lwip_lib=-llwip_gcc
+coredev.menu.LwIPVariant.Prebuilt.build.lwip_flags=-DLWIP_OPEN_SRC
+coredev.menu.LwIPVariant.OpenSource=Open Source (gcc)
+coredev.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src
+coredev.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC
+coredev.menu.LwIPVariant.OpenSource.recipe.hooks.sketch.prebuild.1.pattern=make -C "{runtime.platform.path}/tools/sdk/lwip/src" install TOOLS_PATH="{runtime.tools.xtensa-lx106-elf-gcc.path}/bin/xtensa-lx106-elf-"
+
+coredev.menu.CpuFrequency.80=80 MHz
+coredev.menu.CpuFrequency.80.build.f_cpu=80000000L
+coredev.menu.CpuFrequency.160=160 MHz
+coredev.menu.CpuFrequency.160.build.f_cpu=160000000L
+
+coredev.menu.FlashFreq.40=40MHz
+coredev.menu.FlashFreq.40.build.flash_freq=40
+coredev.menu.FlashFreq.80=80MHz
+coredev.menu.FlashFreq.80.build.flash_freq=80
+
+coredev.menu.FlashMode.dio=DIO
+coredev.menu.FlashMode.dio.build.flash_mode=dio
+coredev.menu.FlashMode.qio=QIO
+coredev.menu.FlashMode.qio.build.flash_mode=qio
+
+coredev.menu.UploadSpeed.115200=115200
+coredev.menu.UploadSpeed.115200.upload.speed=115200
+coredev.menu.UploadSpeed.9600=9600
+coredev.menu.UploadSpeed.9600.upload.speed=9600
+coredev.menu.UploadSpeed.57600=57600
+coredev.menu.UploadSpeed.57600.upload.speed=57600
+coredev.menu.UploadSpeed.256000.windows=256000
+coredev.menu.UploadSpeed.256000.upload.speed=256000
+coredev.menu.UploadSpeed.230400.linux=230400
+coredev.menu.UploadSpeed.230400.macosx=230400
+coredev.menu.UploadSpeed.230400.upload.speed=230400
+coredev.menu.UploadSpeed.460800.linux=460800
+coredev.menu.UploadSpeed.460800.macosx=460800
+coredev.menu.UploadSpeed.460800.upload.speed=460800
+coredev.menu.UploadSpeed.512000.windows=512000
+coredev.menu.UploadSpeed.512000.upload.speed=512000
+coredev.menu.UploadSpeed.921600=921600
+coredev.menu.UploadSpeed.921600.upload.speed=921600
+
+coredev.menu.FlashSize.512K64=512K (64K SPIFFS)
+coredev.menu.FlashSize.512K64.build.flash_size=512K
+coredev.menu.FlashSize.512K64.build.flash_ld=eagle.flash.512k64.ld
+coredev.menu.FlashSize.512K64.build.spiffs_start=0x6B000
+coredev.menu.FlashSize.512K64.build.spiffs_end=0x7B000
+coredev.menu.FlashSize.512K64.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.512K64.upload.maximum_size=434160
+
+coredev.menu.FlashSize.512K128=512K (128K SPIFFS)
+coredev.menu.FlashSize.512K128.build.flash_size=512K
+coredev.menu.FlashSize.512K128.build.flash_ld=eagle.flash.512k128.ld
+coredev.menu.FlashSize.512K128.build.spiffs_start=0x5B000
+coredev.menu.FlashSize.512K128.build.spiffs_end=0x7B000
+coredev.menu.FlashSize.512K128.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.512K128.upload.maximum_size=368624
+
+coredev.menu.FlashSize.512K0=512K (no SPIFFS)
+coredev.menu.FlashSize.512K0.build.flash_size=512K
+coredev.menu.FlashSize.512K0.build.flash_ld=eagle.flash.512k0.ld
+coredev.menu.FlashSize.512K0.upload.maximum_size=499696
+
+coredev.menu.FlashSize.1M512=1M (512K SPIFFS)
+coredev.menu.FlashSize.1M512.build.flash_size=1M
+coredev.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
+coredev.menu.FlashSize.1M512.build.spiffs_start=0x7B000
+coredev.menu.FlashSize.1M512.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M512.build.spiffs_blocksize=8192
+coredev.menu.FlashSize.1M512.upload.maximum_size=499696
+
+coredev.menu.FlashSize.1M256=1M (256K SPIFFS)
+coredev.menu.FlashSize.1M256.build.flash_size=1M
+coredev.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
+coredev.menu.FlashSize.1M256.build.spiffs_start=0xBB000
+coredev.menu.FlashSize.1M256.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M256.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.1M256.upload.maximum_size=761840
+
+coredev.menu.FlashSize.1M192=1M (192K SPIFFS)
+coredev.menu.FlashSize.1M192.build.flash_size=1M
+coredev.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
+coredev.menu.FlashSize.1M192.build.spiffs_start=0xCB000
+coredev.menu.FlashSize.1M192.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M192.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.1M192.upload.maximum_size=827376
+
+coredev.menu.FlashSize.1M160=1M (160K SPIFFS)
+coredev.menu.FlashSize.1M160.build.flash_size=1M
+coredev.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
+coredev.menu.FlashSize.1M160.build.spiffs_start=0xD3000
+coredev.menu.FlashSize.1M160.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M160.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.1M160.upload.maximum_size=860144
+
+coredev.menu.FlashSize.1M144=1M (144K SPIFFS)
+coredev.menu.FlashSize.1M144.build.flash_size=1M
+coredev.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
+coredev.menu.FlashSize.1M144.build.spiffs_start=0xD7000
+coredev.menu.FlashSize.1M144.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M144.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.1M144.upload.maximum_size=876528
+
+coredev.menu.FlashSize.1M128=1M (128K SPIFFS)
+coredev.menu.FlashSize.1M128.build.flash_size=1M
+coredev.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
+coredev.menu.FlashSize.1M128.build.spiffs_start=0xDB000
+coredev.menu.FlashSize.1M128.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M128.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.1M128.upload.maximum_size=892912
+
+coredev.menu.FlashSize.1M64=1M (64K SPIFFS)
+coredev.menu.FlashSize.1M64.build.flash_size=1M
+coredev.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
+coredev.menu.FlashSize.1M64.build.spiffs_start=0xEB000
+coredev.menu.FlashSize.1M64.build.spiffs_end=0xFB000
+coredev.menu.FlashSize.1M64.build.spiffs_blocksize=4096
+coredev.menu.FlashSize.1M64.upload.maximum_size=958448
+
+coredev.menu.FlashSize.2M=2M (1M SPIFFS)
+coredev.menu.FlashSize.2M.build.flash_size=2M
+coredev.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
+coredev.menu.FlashSize.2M.build.spiffs_start=0x100000
+coredev.menu.FlashSize.2M.build.spiffs_end=0x1FB000
+coredev.menu.FlashSize.2M.build.spiffs_blocksize=8192
+coredev.menu.FlashSize.2M.upload.maximum_size=1044464
+
+coredev.menu.FlashSize.4M1M=4M (1M SPIFFS)
+coredev.menu.FlashSize.4M1M.build.flash_size=4M
+coredev.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+coredev.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+coredev.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+coredev.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+coredev.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+coredev.menu.FlashSize.4M1M.upload.maximum_size=1044464
+
+coredev.menu.FlashSize.4M3M=4M (3M SPIFFS)
+coredev.menu.FlashSize.4M3M.build.flash_size=4M
+coredev.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+coredev.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+coredev.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+coredev.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+coredev.menu.FlashSize.4M3M.upload.maximum_size=1044464
+
+coredev.menu.ResetMethod.ck=ck
+coredev.menu.ResetMethod.ck.upload.resetmethod=ck
+coredev.menu.ResetMethod.nodemcu=nodemcu
+coredev.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
+
+coredev.menu.Debug.Disabled=Disabled
+coredev.menu.Debug.Disabled.build.debug_port=
+coredev.menu.Debug.Serial=Serial
+coredev.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+coredev.menu.Debug.Serial1=Serial1
+coredev.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+
+coredev.menu.DebugLevel.None____=None
+coredev.menu.DebugLevel.None____.build.debug_level=
+coredev.menu.DebugLevel.Core____=Core
+coredev.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
+coredev.menu.DebugLevel.SSL_____=Core + SSL
+coredev.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
+coredev.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
+coredev.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
+coredev.menu.DebugLevel.WiFic___=Core + WiFi
+coredev.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
+coredev.menu.DebugLevel.WiFi____=WiFi
+coredev.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
+coredev.menu.DebugLevel.HTTPClient=HTTPClient
+coredev.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
+coredev.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
+coredev.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
+coredev.menu.DebugLevel.HTTPUpdate=HTTPUpdate
+coredev.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
+coredev.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
+coredev.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
+coredev.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
+coredev.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
+coredev.menu.DebugLevel.HTTPServer=HTTPServer
+coredev.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
+coredev.menu.DebugLevel.UPDATER=Updater
+coredev.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
+coredev.menu.DebugLevel.OTA_____=OTA
+coredev.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
+coredev.menu.DebugLevel.OTA2____=OTA + Updater
+coredev.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
+coredev.menu.DebugLevel.all_____=All
+coredev.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM

libraries/ArduinoOTA/ArduinoOTA.cpp

@@ -1,4 +1,6 @@
+#ifndef LWIP_OPEN_SRC
 #define LWIP_OPEN_SRC
+#endif
 #include <functional>
 #include <WiFiUdp.h>
 #include "ArduinoOTA.h"