From 0addae0084f6c686d5ab31bca4a29b4c7945cf60 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Sun, 10 Apr 2016 23:57:26 +0300 Subject: [PATCH] move lwIP source to sdk and add a build hook instead of variant --- .gitignore | 3 + boards.txt | 9 ++- platform.txt | 2 +- tools/sdk/lwip/{ => include}/arch/cc.h | 0 tools/sdk/lwip/{ => include}/arch/perf.h | 0 tools/sdk/lwip/{ => include}/arch/sys_arch.h | 0 tools/sdk/lwip/{ => include}/lwip/api.h | 0 tools/sdk/lwip/{ => include}/lwip/api_msg.h | 0 .../lwip/{ => include}/lwip/app/dhcpserver.h | 0 .../sdk/lwip/{ => include}/lwip/app/espconn.h | 0 .../lwip/{ => include}/lwip/app/espconn_tcp.h | 0 .../lwip/{ => include}/lwip/app/espconn_udp.h | 0 tools/sdk/lwip/{ => include}/lwip/app/ping.h | 0 tools/sdk/lwip/{ => include}/lwip/arch.h | 0 tools/sdk/lwip/{ => include}/lwip/autoip.h | 0 tools/sdk/lwip/{ => include}/lwip/debug.h | 0 tools/sdk/lwip/{ => include}/lwip/def.h | 0 tools/sdk/lwip/{ => include}/lwip/dhcp.h | 0 tools/sdk/lwip/{ => include}/lwip/dns.h | 0 tools/sdk/lwip/{ => include}/lwip/err.h | 0 tools/sdk/lwip/{ => include}/lwip/icmp.h | 0 tools/sdk/lwip/{ => include}/lwip/igmp.h | 0 tools/sdk/lwip/{ => include}/lwip/inet.h | 0 .../sdk/lwip/{ => include}/lwip/inet_chksum.h | 0 tools/sdk/lwip/{ => include}/lwip/init.h | 0 tools/sdk/lwip/{ => include}/lwip/ip.h | 0 tools/sdk/lwip/{ => include}/lwip/ip_addr.h | 0 tools/sdk/lwip/{ => include}/lwip/ip_frag.h | 0 tools/sdk/lwip/{ => include}/lwip/mdns.h | 0 tools/sdk/lwip/{ => include}/lwip/mem.h | 0 tools/sdk/lwip/{ => include}/lwip/memp.h | 0 tools/sdk/lwip/{ => include}/lwip/memp_std.h | 0 tools/sdk/lwip/{ => include}/lwip/netbuf.h | 0 tools/sdk/lwip/{ => include}/lwip/netdb.h | 0 tools/sdk/lwip/{ => include}/lwip/netif.h | 0 tools/sdk/lwip/{ => include}/lwip/netifapi.h | 0 tools/sdk/lwip/{ => include}/lwip/opt.h | 0 tools/sdk/lwip/{ => include}/lwip/pbuf.h | 0 tools/sdk/lwip/{ => include}/lwip/puck_def.h | 0 tools/sdk/lwip/{ => include}/lwip/raw.h | 0 tools/sdk/lwip/{ => include}/lwip/sio.h | 0 tools/sdk/lwip/{ => include}/lwip/snmp.h | 0 tools/sdk/lwip/{ => include}/lwip/snmp_asn1.h | 0 tools/sdk/lwip/{ => include}/lwip/snmp_msg.h | 0 .../lwip/{ => include}/lwip/snmp_structs.h | 0 tools/sdk/lwip/{ => include}/lwip/sntp.h | 0 tools/sdk/lwip/{ => include}/lwip/sockets.h | 0 tools/sdk/lwip/{ => include}/lwip/stats.h | 0 tools/sdk/lwip/{ => include}/lwip/sys.h | 0 tools/sdk/lwip/{ => include}/lwip/tcp.h | 0 tools/sdk/lwip/{ => include}/lwip/tcp_impl.h | 0 tools/sdk/lwip/{ => include}/lwip/tcpip.h | 0 tools/sdk/lwip/{ => include}/lwip/timers.h | 0 tools/sdk/lwip/{ => include}/lwip/udp.h | 0 tools/sdk/lwip/{ => include}/lwipopts.h | 0 tools/sdk/lwip/{ => include}/netif/etharp.h | 0 tools/sdk/lwip/{ => include}/netif/if_llc.h | 0 tools/sdk/lwip/{ => include}/netif/ppp_oe.h | 0 .../lwip/{ => include}/netif/wlan_lwip_if.h | 0 .../lwip/lwip => tools/sdk/lwip/src}/Makefile | 28 ++++---- .../lwip => tools/sdk/lwip/src}/api/api_lib.c | 0 .../lwip => tools/sdk/lwip/src}/api/api_msg.c | 0 .../lwip => tools/sdk/lwip/src}/api/err.c | 0 .../lwip => tools/sdk/lwip/src}/api/netbuf.c | 0 .../lwip => tools/sdk/lwip/src}/api/netdb.c | 0 .../sdk/lwip/src}/api/netifapi.c | 0 .../lwip => tools/sdk/lwip/src}/api/sockets.c | 0 .../lwip => tools/sdk/lwip/src}/api/tcpip.c | 0 .../sdk/lwip/src}/app/dhcpserver.c | 0 .../lwip => tools/sdk/lwip/src}/app/espconn.c | 0 .../sdk/lwip/src}/app/espconn_mdns.c | 0 .../sdk/lwip/src}/app/espconn_tcp.c | 0 .../sdk/lwip/src}/app/espconn_udp.c | 0 .../lwip => tools/sdk/lwip/src}/app/netio.c | 0 .../lwip => tools/sdk/lwip/src}/app/ping.c | 0 .../lwip => tools/sdk/lwip/src}/core/def.c | 0 .../lwip => tools/sdk/lwip/src}/core/dhcp.c | 0 .../lwip => tools/sdk/lwip/src}/core/dns.c | 0 .../lwip => tools/sdk/lwip/src}/core/init.c | 0 .../sdk/lwip/src}/core/ipv4/autoip.c | 0 .../sdk/lwip/src}/core/ipv4/icmp.c | 0 .../sdk/lwip/src}/core/ipv4/igmp.c | 0 .../sdk/lwip/src}/core/ipv4/inet.c | 0 .../sdk/lwip/src}/core/ipv4/inet_chksum.c | 0 .../sdk/lwip/src}/core/ipv4/ip.c | 0 .../sdk/lwip/src}/core/ipv4/ip_addr.c | 0 .../sdk/lwip/src}/core/ipv4/ip_frag.c | 0 .../lwip => tools/sdk/lwip/src}/core/mdns.c | 0 .../lwip => tools/sdk/lwip/src}/core/mem.c | 0 .../lwip => tools/sdk/lwip/src}/core/memp.c | 0 .../lwip => tools/sdk/lwip/src}/core/netif.c | 0 .../lwip => tools/sdk/lwip/src}/core/pbuf.c | 0 .../lwip => tools/sdk/lwip/src}/core/raw.c | 0 .../lwip => tools/sdk/lwip/src}/core/sntp.c | 0 .../lwip => tools/sdk/lwip/src}/core/stats.c | 0 .../lwip => tools/sdk/lwip/src}/core/sys.c | 0 .../sdk/lwip/src}/core/sys_arch.c | 0 .../lwip => tools/sdk/lwip/src}/core/tcp.c | 0 .../lwip => tools/sdk/lwip/src}/core/tcp_in.c | 0 .../sdk/lwip/src}/core/tcp_out.c | 0 .../lwip => tools/sdk/lwip/src}/core/timers.c | 0 .../lwip => tools/sdk/lwip/src}/core/udp.c | 0 .../sdk/lwip/src}/netif/etharp.c | 0 variants/lwip/common.h | 67 ------------------- variants/lwip/pins_arduino.h | 37 ---------- 105 files changed, 20 insertions(+), 126 deletions(-) rename tools/sdk/lwip/{ => include}/arch/cc.h (100%) rename tools/sdk/lwip/{ => include}/arch/perf.h (100%) rename tools/sdk/lwip/{ => include}/arch/sys_arch.h (100%) rename tools/sdk/lwip/{ => include}/lwip/api.h (100%) rename tools/sdk/lwip/{ => include}/lwip/api_msg.h (100%) rename tools/sdk/lwip/{ => include}/lwip/app/dhcpserver.h (100%) rename tools/sdk/lwip/{ => include}/lwip/app/espconn.h (100%) rename tools/sdk/lwip/{ => include}/lwip/app/espconn_tcp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/app/espconn_udp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/app/ping.h (100%) rename tools/sdk/lwip/{ => include}/lwip/arch.h (100%) rename tools/sdk/lwip/{ => include}/lwip/autoip.h (100%) rename tools/sdk/lwip/{ => include}/lwip/debug.h (100%) rename tools/sdk/lwip/{ => include}/lwip/def.h (100%) rename tools/sdk/lwip/{ => include}/lwip/dhcp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/dns.h (100%) rename tools/sdk/lwip/{ => include}/lwip/err.h (100%) rename tools/sdk/lwip/{ => include}/lwip/icmp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/igmp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/inet.h (100%) rename tools/sdk/lwip/{ => include}/lwip/inet_chksum.h (100%) rename tools/sdk/lwip/{ => include}/lwip/init.h (100%) rename tools/sdk/lwip/{ => include}/lwip/ip.h (100%) rename tools/sdk/lwip/{ => include}/lwip/ip_addr.h (100%) rename tools/sdk/lwip/{ => include}/lwip/ip_frag.h (100%) rename tools/sdk/lwip/{ => include}/lwip/mdns.h (100%) rename tools/sdk/lwip/{ => include}/lwip/mem.h (100%) rename tools/sdk/lwip/{ => include}/lwip/memp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/memp_std.h (100%) rename tools/sdk/lwip/{ => include}/lwip/netbuf.h (100%) rename tools/sdk/lwip/{ => include}/lwip/netdb.h (100%) rename tools/sdk/lwip/{ => include}/lwip/netif.h (100%) rename tools/sdk/lwip/{ => include}/lwip/netifapi.h (100%) rename tools/sdk/lwip/{ => include}/lwip/opt.h (100%) rename tools/sdk/lwip/{ => include}/lwip/pbuf.h (100%) rename tools/sdk/lwip/{ => include}/lwip/puck_def.h (100%) rename tools/sdk/lwip/{ => include}/lwip/raw.h (100%) rename tools/sdk/lwip/{ => include}/lwip/sio.h (100%) rename tools/sdk/lwip/{ => include}/lwip/snmp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/snmp_asn1.h (100%) rename tools/sdk/lwip/{ => include}/lwip/snmp_msg.h (100%) rename tools/sdk/lwip/{ => include}/lwip/snmp_structs.h (100%) rename tools/sdk/lwip/{ => include}/lwip/sntp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/sockets.h (100%) rename tools/sdk/lwip/{ => include}/lwip/stats.h (100%) rename tools/sdk/lwip/{ => include}/lwip/sys.h (100%) rename tools/sdk/lwip/{ => include}/lwip/tcp.h (100%) rename tools/sdk/lwip/{ => include}/lwip/tcp_impl.h (100%) rename tools/sdk/lwip/{ => include}/lwip/tcpip.h (100%) rename tools/sdk/lwip/{ => include}/lwip/timers.h (100%) rename tools/sdk/lwip/{ => include}/lwip/udp.h (100%) rename tools/sdk/lwip/{ => include}/lwipopts.h (100%) rename tools/sdk/lwip/{ => include}/netif/etharp.h (100%) rename tools/sdk/lwip/{ => include}/netif/if_llc.h (100%) rename tools/sdk/lwip/{ => include}/netif/ppp_oe.h (100%) rename tools/sdk/lwip/{ => include}/netif/wlan_lwip_if.h (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/Makefile (50%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/api_lib.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/api_msg.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/err.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/netbuf.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/netdb.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/netifapi.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/sockets.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/api/tcpip.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/dhcpserver.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/espconn.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/espconn_mdns.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/espconn_tcp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/espconn_udp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/netio.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/app/ping.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/def.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/dhcp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/dns.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/init.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/autoip.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/icmp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/igmp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/inet.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/inet_chksum.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/ip.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/ip_addr.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/ipv4/ip_frag.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/mdns.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/mem.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/memp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/netif.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/pbuf.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/raw.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/sntp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/stats.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/sys.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/sys_arch.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/tcp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/tcp_in.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/tcp_out.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/timers.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/core/udp.c (100%) rename {variants/lwip/lwip => tools/sdk/lwip/src}/netif/etharp.c (100%) delete mode 100644 variants/lwip/common.h delete mode 100644 variants/lwip/pins_arduino.h diff --git a/.gitignore b/.gitignore index 2623c405a..b1b0b534e 100644 --- a/.gitignore +++ b/.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 diff --git a/boards.txt b/boards.txt index 46b0e7191..934275987 100644 --- a/boards.txt +++ b/boards.txt @@ -1368,7 +1368,7 @@ wifinfo.menu.UploadSpeed.921600.upload.speed=921600 ############################################################## -coredev.name=Generic ESP8266 Module +coredev.name=Core Development Module coredev.upload.tool=esptool coredev.upload.speed=115200 @@ -1391,18 +1391,17 @@ 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.Espressif.build.variant=generic 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.Prebuilt.build.variant=generic coredev.menu.LwIPVariant.OpenSource=Open Source (gcc) -coredev.menu.LwIPVariant.OpenSource.build.lwip_lib= +coredev.menu.LwIPVariant.OpenSource.build.lwip_lib=-llwip_src coredev.menu.LwIPVariant.OpenSource.build.lwip_flags=-DLWIP_OPEN_SRC -coredev.menu.LwIPVariant.OpenSource.build.variant=lwip +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 diff --git a/platform.txt b/platform.txt index 17a7c08fc..83f70c9f0 100644 --- a/platform.txt +++ b/platform.txt @@ -19,7 +19,7 @@ compiler.warning_flags.all=-Wall -Wextra compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/ compiler.sdk.path={runtime.platform.path}/tools/sdk -compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip" +compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" compiler.c.cmd=xtensa-lx106-elf-gcc compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections diff --git a/tools/sdk/lwip/arch/cc.h b/tools/sdk/lwip/include/arch/cc.h similarity index 100% rename from tools/sdk/lwip/arch/cc.h rename to tools/sdk/lwip/include/arch/cc.h diff --git a/tools/sdk/lwip/arch/perf.h b/tools/sdk/lwip/include/arch/perf.h similarity index 100% rename from tools/sdk/lwip/arch/perf.h rename to tools/sdk/lwip/include/arch/perf.h diff --git a/tools/sdk/lwip/arch/sys_arch.h b/tools/sdk/lwip/include/arch/sys_arch.h similarity index 100% rename from tools/sdk/lwip/arch/sys_arch.h rename to tools/sdk/lwip/include/arch/sys_arch.h diff --git a/tools/sdk/lwip/lwip/api.h b/tools/sdk/lwip/include/lwip/api.h similarity index 100% rename from tools/sdk/lwip/lwip/api.h rename to tools/sdk/lwip/include/lwip/api.h diff --git a/tools/sdk/lwip/lwip/api_msg.h b/tools/sdk/lwip/include/lwip/api_msg.h similarity index 100% rename from tools/sdk/lwip/lwip/api_msg.h rename to tools/sdk/lwip/include/lwip/api_msg.h diff --git a/tools/sdk/lwip/lwip/app/dhcpserver.h b/tools/sdk/lwip/include/lwip/app/dhcpserver.h similarity index 100% rename from tools/sdk/lwip/lwip/app/dhcpserver.h rename to tools/sdk/lwip/include/lwip/app/dhcpserver.h diff --git a/tools/sdk/lwip/lwip/app/espconn.h b/tools/sdk/lwip/include/lwip/app/espconn.h similarity index 100% rename from tools/sdk/lwip/lwip/app/espconn.h rename to tools/sdk/lwip/include/lwip/app/espconn.h diff --git a/tools/sdk/lwip/lwip/app/espconn_tcp.h b/tools/sdk/lwip/include/lwip/app/espconn_tcp.h similarity index 100% rename from tools/sdk/lwip/lwip/app/espconn_tcp.h rename to tools/sdk/lwip/include/lwip/app/espconn_tcp.h diff --git a/tools/sdk/lwip/lwip/app/espconn_udp.h b/tools/sdk/lwip/include/lwip/app/espconn_udp.h similarity index 100% rename from tools/sdk/lwip/lwip/app/espconn_udp.h rename to tools/sdk/lwip/include/lwip/app/espconn_udp.h diff --git a/tools/sdk/lwip/lwip/app/ping.h b/tools/sdk/lwip/include/lwip/app/ping.h similarity index 100% rename from tools/sdk/lwip/lwip/app/ping.h rename to tools/sdk/lwip/include/lwip/app/ping.h diff --git a/tools/sdk/lwip/lwip/arch.h b/tools/sdk/lwip/include/lwip/arch.h similarity index 100% rename from tools/sdk/lwip/lwip/arch.h rename to tools/sdk/lwip/include/lwip/arch.h diff --git a/tools/sdk/lwip/lwip/autoip.h b/tools/sdk/lwip/include/lwip/autoip.h similarity index 100% rename from tools/sdk/lwip/lwip/autoip.h rename to tools/sdk/lwip/include/lwip/autoip.h diff --git a/tools/sdk/lwip/lwip/debug.h b/tools/sdk/lwip/include/lwip/debug.h similarity index 100% rename from tools/sdk/lwip/lwip/debug.h rename to tools/sdk/lwip/include/lwip/debug.h diff --git a/tools/sdk/lwip/lwip/def.h b/tools/sdk/lwip/include/lwip/def.h similarity index 100% rename from tools/sdk/lwip/lwip/def.h rename to tools/sdk/lwip/include/lwip/def.h diff --git a/tools/sdk/lwip/lwip/dhcp.h b/tools/sdk/lwip/include/lwip/dhcp.h similarity index 100% rename from tools/sdk/lwip/lwip/dhcp.h rename to tools/sdk/lwip/include/lwip/dhcp.h diff --git a/tools/sdk/lwip/lwip/dns.h b/tools/sdk/lwip/include/lwip/dns.h similarity index 100% rename from tools/sdk/lwip/lwip/dns.h rename to tools/sdk/lwip/include/lwip/dns.h diff --git a/tools/sdk/lwip/lwip/err.h b/tools/sdk/lwip/include/lwip/err.h similarity index 100% rename from tools/sdk/lwip/lwip/err.h rename to tools/sdk/lwip/include/lwip/err.h diff --git a/tools/sdk/lwip/lwip/icmp.h b/tools/sdk/lwip/include/lwip/icmp.h similarity index 100% rename from tools/sdk/lwip/lwip/icmp.h rename to tools/sdk/lwip/include/lwip/icmp.h diff --git a/tools/sdk/lwip/lwip/igmp.h b/tools/sdk/lwip/include/lwip/igmp.h similarity index 100% rename from tools/sdk/lwip/lwip/igmp.h rename to tools/sdk/lwip/include/lwip/igmp.h diff --git a/tools/sdk/lwip/lwip/inet.h b/tools/sdk/lwip/include/lwip/inet.h similarity index 100% rename from tools/sdk/lwip/lwip/inet.h rename to tools/sdk/lwip/include/lwip/inet.h diff --git a/tools/sdk/lwip/lwip/inet_chksum.h b/tools/sdk/lwip/include/lwip/inet_chksum.h similarity index 100% rename from tools/sdk/lwip/lwip/inet_chksum.h rename to tools/sdk/lwip/include/lwip/inet_chksum.h diff --git a/tools/sdk/lwip/lwip/init.h b/tools/sdk/lwip/include/lwip/init.h similarity index 100% rename from tools/sdk/lwip/lwip/init.h rename to tools/sdk/lwip/include/lwip/init.h diff --git a/tools/sdk/lwip/lwip/ip.h b/tools/sdk/lwip/include/lwip/ip.h similarity index 100% rename from tools/sdk/lwip/lwip/ip.h rename to tools/sdk/lwip/include/lwip/ip.h diff --git a/tools/sdk/lwip/lwip/ip_addr.h b/tools/sdk/lwip/include/lwip/ip_addr.h similarity index 100% rename from tools/sdk/lwip/lwip/ip_addr.h rename to tools/sdk/lwip/include/lwip/ip_addr.h diff --git a/tools/sdk/lwip/lwip/ip_frag.h b/tools/sdk/lwip/include/lwip/ip_frag.h similarity index 100% rename from tools/sdk/lwip/lwip/ip_frag.h rename to tools/sdk/lwip/include/lwip/ip_frag.h diff --git a/tools/sdk/lwip/lwip/mdns.h b/tools/sdk/lwip/include/lwip/mdns.h similarity index 100% rename from tools/sdk/lwip/lwip/mdns.h rename to tools/sdk/lwip/include/lwip/mdns.h diff --git a/tools/sdk/lwip/lwip/mem.h b/tools/sdk/lwip/include/lwip/mem.h similarity index 100% rename from tools/sdk/lwip/lwip/mem.h rename to tools/sdk/lwip/include/lwip/mem.h diff --git a/tools/sdk/lwip/lwip/memp.h b/tools/sdk/lwip/include/lwip/memp.h similarity index 100% rename from tools/sdk/lwip/lwip/memp.h rename to tools/sdk/lwip/include/lwip/memp.h diff --git a/tools/sdk/lwip/lwip/memp_std.h b/tools/sdk/lwip/include/lwip/memp_std.h similarity index 100% rename from tools/sdk/lwip/lwip/memp_std.h rename to tools/sdk/lwip/include/lwip/memp_std.h diff --git a/tools/sdk/lwip/lwip/netbuf.h b/tools/sdk/lwip/include/lwip/netbuf.h similarity index 100% rename from tools/sdk/lwip/lwip/netbuf.h rename to tools/sdk/lwip/include/lwip/netbuf.h diff --git a/tools/sdk/lwip/lwip/netdb.h b/tools/sdk/lwip/include/lwip/netdb.h similarity index 100% rename from tools/sdk/lwip/lwip/netdb.h rename to tools/sdk/lwip/include/lwip/netdb.h diff --git a/tools/sdk/lwip/lwip/netif.h b/tools/sdk/lwip/include/lwip/netif.h similarity index 100% rename from tools/sdk/lwip/lwip/netif.h rename to tools/sdk/lwip/include/lwip/netif.h diff --git a/tools/sdk/lwip/lwip/netifapi.h b/tools/sdk/lwip/include/lwip/netifapi.h similarity index 100% rename from tools/sdk/lwip/lwip/netifapi.h rename to tools/sdk/lwip/include/lwip/netifapi.h diff --git a/tools/sdk/lwip/lwip/opt.h b/tools/sdk/lwip/include/lwip/opt.h similarity index 100% rename from tools/sdk/lwip/lwip/opt.h rename to tools/sdk/lwip/include/lwip/opt.h diff --git a/tools/sdk/lwip/lwip/pbuf.h b/tools/sdk/lwip/include/lwip/pbuf.h similarity index 100% rename from tools/sdk/lwip/lwip/pbuf.h rename to tools/sdk/lwip/include/lwip/pbuf.h diff --git a/tools/sdk/lwip/lwip/puck_def.h b/tools/sdk/lwip/include/lwip/puck_def.h similarity index 100% rename from tools/sdk/lwip/lwip/puck_def.h rename to tools/sdk/lwip/include/lwip/puck_def.h diff --git a/tools/sdk/lwip/lwip/raw.h b/tools/sdk/lwip/include/lwip/raw.h similarity index 100% rename from tools/sdk/lwip/lwip/raw.h rename to tools/sdk/lwip/include/lwip/raw.h diff --git a/tools/sdk/lwip/lwip/sio.h b/tools/sdk/lwip/include/lwip/sio.h similarity index 100% rename from tools/sdk/lwip/lwip/sio.h rename to tools/sdk/lwip/include/lwip/sio.h diff --git a/tools/sdk/lwip/lwip/snmp.h b/tools/sdk/lwip/include/lwip/snmp.h similarity index 100% rename from tools/sdk/lwip/lwip/snmp.h rename to tools/sdk/lwip/include/lwip/snmp.h diff --git a/tools/sdk/lwip/lwip/snmp_asn1.h b/tools/sdk/lwip/include/lwip/snmp_asn1.h similarity index 100% rename from tools/sdk/lwip/lwip/snmp_asn1.h rename to tools/sdk/lwip/include/lwip/snmp_asn1.h diff --git a/tools/sdk/lwip/lwip/snmp_msg.h b/tools/sdk/lwip/include/lwip/snmp_msg.h similarity index 100% rename from tools/sdk/lwip/lwip/snmp_msg.h rename to tools/sdk/lwip/include/lwip/snmp_msg.h diff --git a/tools/sdk/lwip/lwip/snmp_structs.h b/tools/sdk/lwip/include/lwip/snmp_structs.h similarity index 100% rename from tools/sdk/lwip/lwip/snmp_structs.h rename to tools/sdk/lwip/include/lwip/snmp_structs.h diff --git a/tools/sdk/lwip/lwip/sntp.h b/tools/sdk/lwip/include/lwip/sntp.h similarity index 100% rename from tools/sdk/lwip/lwip/sntp.h rename to tools/sdk/lwip/include/lwip/sntp.h diff --git a/tools/sdk/lwip/lwip/sockets.h b/tools/sdk/lwip/include/lwip/sockets.h similarity index 100% rename from tools/sdk/lwip/lwip/sockets.h rename to tools/sdk/lwip/include/lwip/sockets.h diff --git a/tools/sdk/lwip/lwip/stats.h b/tools/sdk/lwip/include/lwip/stats.h similarity index 100% rename from tools/sdk/lwip/lwip/stats.h rename to tools/sdk/lwip/include/lwip/stats.h diff --git a/tools/sdk/lwip/lwip/sys.h b/tools/sdk/lwip/include/lwip/sys.h similarity index 100% rename from tools/sdk/lwip/lwip/sys.h rename to tools/sdk/lwip/include/lwip/sys.h diff --git a/tools/sdk/lwip/lwip/tcp.h b/tools/sdk/lwip/include/lwip/tcp.h similarity index 100% rename from tools/sdk/lwip/lwip/tcp.h rename to tools/sdk/lwip/include/lwip/tcp.h diff --git a/tools/sdk/lwip/lwip/tcp_impl.h b/tools/sdk/lwip/include/lwip/tcp_impl.h similarity index 100% rename from tools/sdk/lwip/lwip/tcp_impl.h rename to tools/sdk/lwip/include/lwip/tcp_impl.h diff --git a/tools/sdk/lwip/lwip/tcpip.h b/tools/sdk/lwip/include/lwip/tcpip.h similarity index 100% rename from tools/sdk/lwip/lwip/tcpip.h rename to tools/sdk/lwip/include/lwip/tcpip.h diff --git a/tools/sdk/lwip/lwip/timers.h b/tools/sdk/lwip/include/lwip/timers.h similarity index 100% rename from tools/sdk/lwip/lwip/timers.h rename to tools/sdk/lwip/include/lwip/timers.h diff --git a/tools/sdk/lwip/lwip/udp.h b/tools/sdk/lwip/include/lwip/udp.h similarity index 100% rename from tools/sdk/lwip/lwip/udp.h rename to tools/sdk/lwip/include/lwip/udp.h diff --git a/tools/sdk/lwip/lwipopts.h b/tools/sdk/lwip/include/lwipopts.h similarity index 100% rename from tools/sdk/lwip/lwipopts.h rename to tools/sdk/lwip/include/lwipopts.h diff --git a/tools/sdk/lwip/netif/etharp.h b/tools/sdk/lwip/include/netif/etharp.h similarity index 100% rename from tools/sdk/lwip/netif/etharp.h rename to tools/sdk/lwip/include/netif/etharp.h diff --git a/tools/sdk/lwip/netif/if_llc.h b/tools/sdk/lwip/include/netif/if_llc.h similarity index 100% rename from tools/sdk/lwip/netif/if_llc.h rename to tools/sdk/lwip/include/netif/if_llc.h diff --git a/tools/sdk/lwip/netif/ppp_oe.h b/tools/sdk/lwip/include/netif/ppp_oe.h similarity index 100% rename from tools/sdk/lwip/netif/ppp_oe.h rename to tools/sdk/lwip/include/netif/ppp_oe.h diff --git a/tools/sdk/lwip/netif/wlan_lwip_if.h b/tools/sdk/lwip/include/netif/wlan_lwip_if.h similarity index 100% rename from tools/sdk/lwip/netif/wlan_lwip_if.h rename to tools/sdk/lwip/include/netif/wlan_lwip_if.h diff --git a/variants/lwip/lwip/Makefile b/tools/sdk/lwip/src/Makefile similarity index 50% rename from variants/lwip/lwip/Makefile rename to tools/sdk/lwip/src/Makefile index d894b7b02..e03fda331 100644 --- a/variants/lwip/lwip/Makefile +++ b/tools/sdk/lwip/src/Makefile @@ -1,36 +1,32 @@ -TOOLS_PATH = $(abspath ../../../tools) -BUILD_PATH = $(abspath build) -LWIP_INCLUDE = -Ibuild -I$(TOOLS_PATH)/sdk/include -I$(TOOLS_PATH)/sdk/lwip -LWIP_SRCS = $(patsubst %.c,$(BUILD_PATH)/%.o,$(wildcard */*.c)) $(patsubst %.c,$(BUILD_PATH)/%.o,$(wildcard */*/*.c)) -LWIP_LIB = $(abspath liblwip_gcc.a) +TOOLS_PATH ?= ../../../xtensa-lx106-elf/bin/xtensa-lx106-elf- +LWIP_LIB ?= liblwip_src.a +SDK_PATH ?= $(abspath ../../) +BUILD_PATH = build +LWIP_SRCS = $(patsubst %.c,$(BUILD_PATH)/%.o,$(wildcard */*.c)) $(patsubst %.c,$(BUILD_PATH)/%.o,$(wildcard */*/*.c)) + +LWIP_INCLUDE = -Ibuild -I$(SDK_PATH)/include -I$(SDK_PATH)/lwip/include BUILD_FLAGS = -c -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections BUILD_DEFINES = -D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ -DLWIP_OPEN_SRC -CC=$(TOOLS_PATH)/xtensa-lx106-elf/bin/xtensa-lx106-elf-gcc -AR=$(TOOLS_PATH)/xtensa-lx106-elf/bin/xtensa-lx106-elf-ar +CC=$(TOOLS_PATH)gcc +AR=$(TOOLS_PATH)ar $(BUILD_PATH)/%.h: - @echo "[CR]" $(notdir $@) @mkdir -p $(dir $@) @touch $@ $(BUILD_PATH)/%.o: %.c - @echo "[CC]" $(notdir $@) @mkdir -p $(dir $@) - @$(CC) $(BUILD_FLAGS) $(BUILD_DEFINES) $(LWIP_INCLUDE) $< -o $@ + $(CC) $(BUILD_FLAGS) $(BUILD_DEFINES) $(LWIP_INCLUDE) $< -o $@ $(LWIP_LIB): $(BUILD_PATH)/user_config.h $(LWIP_SRCS) - @echo "[AR]" $(notdir $(LWIP_LIB)) - @$(AR) cru $(LWIP_LIB) $(LWIP_SRCS) + $(AR) cru $(LWIP_LIB) $(LWIP_SRCS) all: $(LWIP_LIB) install: all - @echo Installing $(notdir $(LWIP_LIB)) to $(TOOLS_PATH)/sdk/lib - @cp -f $(LWIP_LIB) $(TOOLS_PATH)/sdk/lib/$(notdir $(LWIP_LIB)) - -deploy: install clean + cp -f $(LWIP_LIB) $(SDK_PATH)/lib/$(LWIP_LIB) clean: @rm -rf $(BUILD_PATH) $(LWIP_LIB) diff --git a/variants/lwip/lwip/api/api_lib.c b/tools/sdk/lwip/src/api/api_lib.c similarity index 100% rename from variants/lwip/lwip/api/api_lib.c rename to tools/sdk/lwip/src/api/api_lib.c diff --git a/variants/lwip/lwip/api/api_msg.c b/tools/sdk/lwip/src/api/api_msg.c similarity index 100% rename from variants/lwip/lwip/api/api_msg.c rename to tools/sdk/lwip/src/api/api_msg.c diff --git a/variants/lwip/lwip/api/err.c b/tools/sdk/lwip/src/api/err.c similarity index 100% rename from variants/lwip/lwip/api/err.c rename to tools/sdk/lwip/src/api/err.c diff --git a/variants/lwip/lwip/api/netbuf.c b/tools/sdk/lwip/src/api/netbuf.c similarity index 100% rename from variants/lwip/lwip/api/netbuf.c rename to tools/sdk/lwip/src/api/netbuf.c diff --git a/variants/lwip/lwip/api/netdb.c b/tools/sdk/lwip/src/api/netdb.c similarity index 100% rename from variants/lwip/lwip/api/netdb.c rename to tools/sdk/lwip/src/api/netdb.c diff --git a/variants/lwip/lwip/api/netifapi.c b/tools/sdk/lwip/src/api/netifapi.c similarity index 100% rename from variants/lwip/lwip/api/netifapi.c rename to tools/sdk/lwip/src/api/netifapi.c diff --git a/variants/lwip/lwip/api/sockets.c b/tools/sdk/lwip/src/api/sockets.c similarity index 100% rename from variants/lwip/lwip/api/sockets.c rename to tools/sdk/lwip/src/api/sockets.c diff --git a/variants/lwip/lwip/api/tcpip.c b/tools/sdk/lwip/src/api/tcpip.c similarity index 100% rename from variants/lwip/lwip/api/tcpip.c rename to tools/sdk/lwip/src/api/tcpip.c diff --git a/variants/lwip/lwip/app/dhcpserver.c b/tools/sdk/lwip/src/app/dhcpserver.c similarity index 100% rename from variants/lwip/lwip/app/dhcpserver.c rename to tools/sdk/lwip/src/app/dhcpserver.c diff --git a/variants/lwip/lwip/app/espconn.c b/tools/sdk/lwip/src/app/espconn.c similarity index 100% rename from variants/lwip/lwip/app/espconn.c rename to tools/sdk/lwip/src/app/espconn.c diff --git a/variants/lwip/lwip/app/espconn_mdns.c b/tools/sdk/lwip/src/app/espconn_mdns.c similarity index 100% rename from variants/lwip/lwip/app/espconn_mdns.c rename to tools/sdk/lwip/src/app/espconn_mdns.c diff --git a/variants/lwip/lwip/app/espconn_tcp.c b/tools/sdk/lwip/src/app/espconn_tcp.c similarity index 100% rename from variants/lwip/lwip/app/espconn_tcp.c rename to tools/sdk/lwip/src/app/espconn_tcp.c diff --git a/variants/lwip/lwip/app/espconn_udp.c b/tools/sdk/lwip/src/app/espconn_udp.c similarity index 100% rename from variants/lwip/lwip/app/espconn_udp.c rename to tools/sdk/lwip/src/app/espconn_udp.c diff --git a/variants/lwip/lwip/app/netio.c b/tools/sdk/lwip/src/app/netio.c similarity index 100% rename from variants/lwip/lwip/app/netio.c rename to tools/sdk/lwip/src/app/netio.c diff --git a/variants/lwip/lwip/app/ping.c b/tools/sdk/lwip/src/app/ping.c similarity index 100% rename from variants/lwip/lwip/app/ping.c rename to tools/sdk/lwip/src/app/ping.c diff --git a/variants/lwip/lwip/core/def.c b/tools/sdk/lwip/src/core/def.c similarity index 100% rename from variants/lwip/lwip/core/def.c rename to tools/sdk/lwip/src/core/def.c diff --git a/variants/lwip/lwip/core/dhcp.c b/tools/sdk/lwip/src/core/dhcp.c similarity index 100% rename from variants/lwip/lwip/core/dhcp.c rename to tools/sdk/lwip/src/core/dhcp.c diff --git a/variants/lwip/lwip/core/dns.c b/tools/sdk/lwip/src/core/dns.c similarity index 100% rename from variants/lwip/lwip/core/dns.c rename to tools/sdk/lwip/src/core/dns.c diff --git a/variants/lwip/lwip/core/init.c b/tools/sdk/lwip/src/core/init.c similarity index 100% rename from variants/lwip/lwip/core/init.c rename to tools/sdk/lwip/src/core/init.c diff --git a/variants/lwip/lwip/core/ipv4/autoip.c b/tools/sdk/lwip/src/core/ipv4/autoip.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/autoip.c rename to tools/sdk/lwip/src/core/ipv4/autoip.c diff --git a/variants/lwip/lwip/core/ipv4/icmp.c b/tools/sdk/lwip/src/core/ipv4/icmp.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/icmp.c rename to tools/sdk/lwip/src/core/ipv4/icmp.c diff --git a/variants/lwip/lwip/core/ipv4/igmp.c b/tools/sdk/lwip/src/core/ipv4/igmp.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/igmp.c rename to tools/sdk/lwip/src/core/ipv4/igmp.c diff --git a/variants/lwip/lwip/core/ipv4/inet.c b/tools/sdk/lwip/src/core/ipv4/inet.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/inet.c rename to tools/sdk/lwip/src/core/ipv4/inet.c diff --git a/variants/lwip/lwip/core/ipv4/inet_chksum.c b/tools/sdk/lwip/src/core/ipv4/inet_chksum.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/inet_chksum.c rename to tools/sdk/lwip/src/core/ipv4/inet_chksum.c diff --git a/variants/lwip/lwip/core/ipv4/ip.c b/tools/sdk/lwip/src/core/ipv4/ip.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/ip.c rename to tools/sdk/lwip/src/core/ipv4/ip.c diff --git a/variants/lwip/lwip/core/ipv4/ip_addr.c b/tools/sdk/lwip/src/core/ipv4/ip_addr.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/ip_addr.c rename to tools/sdk/lwip/src/core/ipv4/ip_addr.c diff --git a/variants/lwip/lwip/core/ipv4/ip_frag.c b/tools/sdk/lwip/src/core/ipv4/ip_frag.c similarity index 100% rename from variants/lwip/lwip/core/ipv4/ip_frag.c rename to tools/sdk/lwip/src/core/ipv4/ip_frag.c diff --git a/variants/lwip/lwip/core/mdns.c b/tools/sdk/lwip/src/core/mdns.c similarity index 100% rename from variants/lwip/lwip/core/mdns.c rename to tools/sdk/lwip/src/core/mdns.c diff --git a/variants/lwip/lwip/core/mem.c b/tools/sdk/lwip/src/core/mem.c similarity index 100% rename from variants/lwip/lwip/core/mem.c rename to tools/sdk/lwip/src/core/mem.c diff --git a/variants/lwip/lwip/core/memp.c b/tools/sdk/lwip/src/core/memp.c similarity index 100% rename from variants/lwip/lwip/core/memp.c rename to tools/sdk/lwip/src/core/memp.c diff --git a/variants/lwip/lwip/core/netif.c b/tools/sdk/lwip/src/core/netif.c similarity index 100% rename from variants/lwip/lwip/core/netif.c rename to tools/sdk/lwip/src/core/netif.c diff --git a/variants/lwip/lwip/core/pbuf.c b/tools/sdk/lwip/src/core/pbuf.c similarity index 100% rename from variants/lwip/lwip/core/pbuf.c rename to tools/sdk/lwip/src/core/pbuf.c diff --git a/variants/lwip/lwip/core/raw.c b/tools/sdk/lwip/src/core/raw.c similarity index 100% rename from variants/lwip/lwip/core/raw.c rename to tools/sdk/lwip/src/core/raw.c diff --git a/variants/lwip/lwip/core/sntp.c b/tools/sdk/lwip/src/core/sntp.c similarity index 100% rename from variants/lwip/lwip/core/sntp.c rename to tools/sdk/lwip/src/core/sntp.c diff --git a/variants/lwip/lwip/core/stats.c b/tools/sdk/lwip/src/core/stats.c similarity index 100% rename from variants/lwip/lwip/core/stats.c rename to tools/sdk/lwip/src/core/stats.c diff --git a/variants/lwip/lwip/core/sys.c b/tools/sdk/lwip/src/core/sys.c similarity index 100% rename from variants/lwip/lwip/core/sys.c rename to tools/sdk/lwip/src/core/sys.c diff --git a/variants/lwip/lwip/core/sys_arch.c b/tools/sdk/lwip/src/core/sys_arch.c similarity index 100% rename from variants/lwip/lwip/core/sys_arch.c rename to tools/sdk/lwip/src/core/sys_arch.c diff --git a/variants/lwip/lwip/core/tcp.c b/tools/sdk/lwip/src/core/tcp.c similarity index 100% rename from variants/lwip/lwip/core/tcp.c rename to tools/sdk/lwip/src/core/tcp.c diff --git a/variants/lwip/lwip/core/tcp_in.c b/tools/sdk/lwip/src/core/tcp_in.c similarity index 100% rename from variants/lwip/lwip/core/tcp_in.c rename to tools/sdk/lwip/src/core/tcp_in.c diff --git a/variants/lwip/lwip/core/tcp_out.c b/tools/sdk/lwip/src/core/tcp_out.c similarity index 100% rename from variants/lwip/lwip/core/tcp_out.c rename to tools/sdk/lwip/src/core/tcp_out.c diff --git a/variants/lwip/lwip/core/timers.c b/tools/sdk/lwip/src/core/timers.c similarity index 100% rename from variants/lwip/lwip/core/timers.c rename to tools/sdk/lwip/src/core/timers.c diff --git a/variants/lwip/lwip/core/udp.c b/tools/sdk/lwip/src/core/udp.c similarity index 100% rename from variants/lwip/lwip/core/udp.c rename to tools/sdk/lwip/src/core/udp.c diff --git a/variants/lwip/lwip/netif/etharp.c b/tools/sdk/lwip/src/netif/etharp.c similarity index 100% rename from variants/lwip/lwip/netif/etharp.c rename to tools/sdk/lwip/src/netif/etharp.c diff --git a/variants/lwip/common.h b/variants/lwip/common.h deleted file mode 100644 index c0029a70a..000000000 --- a/variants/lwip/common.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - common.h - Commoon pin definition functions for ESP8266 boards - Part of Arduino - http://www.arduino.cc/ - - Copyright (c) 2007 David A. Mellis - Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2016. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General - Public License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA - - $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ -*/ - -#ifndef GENERIC_COMMON_H -#define GENERIC_COMMON_H - -#define EXTERNAL_NUM_INTERRUPTS 16 -#define NUM_DIGITAL_PINS 17 -#define NUM_ANALOG_INPUTS 1 - -// TODO: this should be <= 9 if flash is in DIO mode -#define isFlashInterfacePin(p) ((p) >= 6 && (p) <= 11) - -#define analogInputToDigitalPin(p) ((p > 0) ? NOT_A_PIN : 0) -#define digitalPinToInterrupt(p) (((p) < EXTERNAL_NUM_INTERRUPTS)? (p) : NOT_AN_INTERRUPT) -#define digitalPinHasPWM(p) (((p) < NUM_DIGITAL_PINS && !isFlashInterfacePin(p))? 1 : 0) - -static const uint8_t SS = 15; -static const uint8_t MOSI = 13; -static const uint8_t MISO = 12; -static const uint8_t SCK = 14; - -static const uint8_t A0 = 17; - -// These serial port names are intended to allow libraries and architecture-neutral -// sketches to automatically default to the correct port name for a particular type -// of use. For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN, -// the first hardware serial port whose RX/TX pins are not dedicated to another use. -// -// SERIAL_PORT_MONITOR Port which normally prints to the Arduino Serial Monitor -// -// SERIAL_PORT_USBVIRTUAL Port which is USB virtual serial -// -// SERIAL_PORT_LINUXBRIDGE Port which connects to a Linux system via Bridge library -// -// SERIAL_PORT_HARDWARE Hardware serial port, physical RX & TX pins. -// -// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX -// pins are NOT connected to anything by default. -#define SERIAL_PORT_MONITOR Serial -#define SERIAL_PORT_USBVIRTUAL Serial -#define SERIAL_PORT_HARDWARE Serial -#define SERIAL_PORT_HARDWARE_OPEN Serial1 - -#endif /* GENERIC_COMMON_H */ diff --git a/variants/lwip/pins_arduino.h b/variants/lwip/pins_arduino.h deleted file mode 100644 index 0541019da..000000000 --- a/variants/lwip/pins_arduino.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - pins_arduino.h - Pin definition functions for Arduino - Part of Arduino - http://www.arduino.cc/ - - Copyright (c) 2007 David A. Mellis - Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General - Public License along with this library; if not, write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307 USA - - $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ -*/ - -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include "common.h" - -static const uint8_t SDA = 4; -static const uint8_t SCL = 5; - -static const uint8_t BUILTIN_LED = 1; -static const uint8_t LED_BUILTIN = 1; - -#endif /* Pins_Arduino_h */