Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
67a71193
Commit
67a71193
authored
Oct 08, 2015
by
Johny Mattsson
Browse files
Switch to SDK LWIP until issues with the open one can be resolved.
parent
e905c24d
Changes
2
Show whitespace changes
Inline
Side-by-side
app/Makefile
View file @
67a71193
...
...
@@ -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
\
...
...
@@ -88,6 +88,8 @@ COMPONENTS_eagle.app.v6 = \
tsl2561/tsl2561lib.a
\
modules/libmodules.a
#lwip/liblwip.a \
LINKFLAGS_eagle.app.v6
=
\
-Wl
,--gc-sections
\
-Wl
,-Map
=
mapfile
\
...
...
@@ -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)
\
...
...
app/tsl2561/tsl2561.c
View file @
67a71193
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment