Commit 67a71193 authored by Johny Mattsson's avatar Johny Mattsson
Browse files

Switch to SDK LWIP until issues with the open one can be resolved.

parent e905c24d
...@@ -24,7 +24,6 @@ SPECIAL_MKTARGETS=$(APP_MKTARGETS) ...@@ -24,7 +24,6 @@ SPECIAL_MKTARGETS=$(APP_MKTARGETS)
SUBDIRS= \ SUBDIRS= \
user \ user \
driver \ driver \
lwip \
json \ json \
upgrade \ upgrade \
platform \ platform \
...@@ -43,6 +42,8 @@ SUBDIRS= \ ...@@ -43,6 +42,8 @@ SUBDIRS= \
dhtlib \ dhtlib \
tsl2561 tsl2561
#lwip \
endif # } PDIR endif # } PDIR
APPDIR = . APPDIR = .
...@@ -69,7 +70,6 @@ LD_FILE = $(LDDIR)/nodemcu.ld ...@@ -69,7 +70,6 @@ LD_FILE = $(LDDIR)/nodemcu.ld
COMPONENTS_eagle.app.v6 = \ COMPONENTS_eagle.app.v6 = \
user/libuser.a \ user/libuser.a \
driver/libdriver.a \ driver/libdriver.a \
lwip/liblwip.a \
json/libjson.a \ json/libjson.a \
upgrade/libupgrade.a \ upgrade/libupgrade.a \
platform/libplatform.a \ platform/libplatform.a \
...@@ -85,17 +85,19 @@ COMPONENTS_eagle.app.v6 = \ ...@@ -85,17 +85,19 @@ COMPONENTS_eagle.app.v6 = \
cjson/libcjson.a \ cjson/libcjson.a \
crypto/libcrypto.a \ crypto/libcrypto.a \
dhtlib/libdhtlib.a \ dhtlib/libdhtlib.a \
tsl2561/tsl2561lib.a \ tsl2561/tsl2561lib.a \
modules/libmodules.a modules/libmodules.a
#lwip/liblwip.a \
LINKFLAGS_eagle.app.v6 = \ LINKFLAGS_eagle.app.v6 = \
-Wl,--gc-sections \ -Wl,--gc-sections \
-Wl,-Map=mapfile \ -Wl,-Map=mapfile \
-nostdlib \ -nostdlib \
-T$(LD_FILE) \ -T$(LD_FILE) \
-Wl,@../ld/defsym.rom \ -Wl,@../ld/defsym.rom \
-Wl,--no-check-sections \ -Wl,--no-check-sections \
-Wl,--wrap=_xtos_set_exception_handler \ -Wl,--wrap=_xtos_set_exception_handler \
-Wl,-static \ -Wl,-static \
-Wl,--start-group \ -Wl,--start-group \
-lc \ -lc \
...@@ -109,12 +111,14 @@ LINKFLAGS_eagle.app.v6 = \ ...@@ -109,12 +111,14 @@ LINKFLAGS_eagle.app.v6 = \
-ljson \ -ljson \
-lsmartconfig \ -lsmartconfig \
-lssl \ -lssl \
-llwip \
$(DEP_LIBS_eagle.app.v6) \ $(DEP_LIBS_eagle.app.v6) \
-Wl,--end-group \ -Wl,--end-group \
-lm -lm
DEPENDS_eagle.app.v6 = \ DEPENDS_eagle.app.v6 = \
$(LD_FILE) \ $(LD_FILE) \
Makefile
############################################################# #############################################################
# Configuration i.e. compile options etc. # Configuration i.e. compile options etc.
...@@ -131,10 +135,11 @@ DEPENDS_eagle.app.v6 = \ ...@@ -131,10 +135,11 @@ DEPENDS_eagle.app.v6 = \
# -DTXRX_RXBUF_DEBUG # -DTXRX_RXBUF_DEBUG
# -DWLAN_CONFIG_CCX # -DWLAN_CONFIG_CCX
CONFIGURATION_DEFINES = -D__ets__ \ CONFIGURATION_DEFINES = -D__ets__ \
-DICACHE_FLASH \
-DLWIP_OPEN_SRC \ # -DICACHE_FLASH \
-DPBUF_RSV_FOR_WLAN \ # -DLWIP_OPEN_SRC \
-DEBUF_LWIP # -DPBUF_RSV_FOR_WLAN \
# -DEBUF_LWIP
DEFINES += \ DEFINES += \
$(UNIVERSAL_TARGET_DEFINES) \ $(UNIVERSAL_TARGET_DEFINES) \
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
#include "tsl2561.h" #include "tsl2561.h"
#include "platform.h" #include "platform.h"
#include "user_interface.h" #include "user_interface.h"
#include "osapi.h"
static const uint32_t tsl2561_i2c_id = 0; static const uint32_t tsl2561_i2c_id = 0;
static bool _tsl2561Initialised = 0; static bool _tsl2561Initialised = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment