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

This commit is contained in:
Johny Mattsson 2015-10-08 12:07:08 +11:00
parent e905c24dcc
commit 67a711931a
2 changed files with 16 additions and 10 deletions

View File

@ -24,7 +24,6 @@ SPECIAL_MKTARGETS=$(APP_MKTARGETS)
SUBDIRS= \
user \
driver \
lwip \
json \
upgrade \
platform \
@ -43,6 +42,8 @@ SUBDIRS= \
dhtlib \
tsl2561
#lwip \
endif # } PDIR
APPDIR = .
@ -69,7 +70,6 @@ LD_FILE = $(LDDIR)/nodemcu.ld
COMPONENTS_eagle.app.v6 = \
user/libuser.a \
driver/libdriver.a \
lwip/liblwip.a \
json/libjson.a \
upgrade/libupgrade.a \
platform/libplatform.a \
@ -85,17 +85,19 @@ COMPONENTS_eagle.app.v6 = \
cjson/libcjson.a \
crypto/libcrypto.a \
dhtlib/libdhtlib.a \
tsl2561/tsl2561lib.a \
tsl2561/tsl2561lib.a \
modules/libmodules.a
#lwip/liblwip.a \
LINKFLAGS_eagle.app.v6 = \
-Wl,--gc-sections \
-Wl,-Map=mapfile \
-nostdlib \
-T$(LD_FILE) \
-Wl,@../ld/defsym.rom \
-T$(LD_FILE) \
-Wl,@../ld/defsym.rom \
-Wl,--no-check-sections \
-Wl,--wrap=_xtos_set_exception_handler \
-Wl,--wrap=_xtos_set_exception_handler \
-Wl,-static \
-Wl,--start-group \
-lc \
@ -109,12 +111,14 @@ LINKFLAGS_eagle.app.v6 = \
-ljson \
-lsmartconfig \
-lssl \
-llwip \
$(DEP_LIBS_eagle.app.v6) \
-Wl,--end-group \
-lm
DEPENDS_eagle.app.v6 = \
$(LD_FILE) \
Makefile
#############################################################
# Configuration i.e. compile options etc.
@ -131,10 +135,11 @@ DEPENDS_eagle.app.v6 = \
# -DTXRX_RXBUF_DEBUG
# -DWLAN_CONFIG_CCX
CONFIGURATION_DEFINES = -D__ets__ \
-DICACHE_FLASH \
-DLWIP_OPEN_SRC \
-DPBUF_RSV_FOR_WLAN \
-DEBUF_LWIP
# -DICACHE_FLASH \
# -DLWIP_OPEN_SRC \
# -DPBUF_RSV_FOR_WLAN \
# -DEBUF_LWIP
DEFINES += \
$(UNIVERSAL_TARGET_DEFINES) \

View File

@ -67,6 +67,7 @@
#include "tsl2561.h"
#include "platform.h"
#include "user_interface.h"
#include "osapi.h"
static const uint32_t tsl2561_i2c_id = 0;
static bool _tsl2561Initialised = 0;