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
51fabc74
Commit
51fabc74
authored
Sep 20, 2016
by
Johny Mattsson
Browse files
Fixed NodeMCU boot banner.
Build for ESP32 on Travis.
parent
9bbf8f43
Changes
3
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
51fabc74
...
@@ -5,30 +5,15 @@ addons:
...
@@ -5,30 +5,15 @@ addons:
packages
:
packages
:
-
python-serial
-
python-serial
-
srecord
-
srecord
-
gperf
cache
:
cache
:
directories
:
directories
:
-
cache
-
cache
install
:
install
:
-
export PATH=$PWD/tools/toolchains/esp8266/bin:$PWD/tools/toolchains/esp32/bin:$PATH
-
export PATH=$PWD/tools/toolchains/esp8266/bin:$PWD/tools/toolchains/esp32/bin:$PATH
script
:
script
:
-
exit
0
-
export BUILD_DATE=$(date +%Y%m%d)
-
export BUILD_DATE=$(date +%Y%m%d)
-
make EXTRA_CCFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" all
-
env BUILD_DIR_BASE=build/float make MORE_CFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
-
cd bin/esp8266
-
env BUILD_DIR_BASE=build/integer make MORE_CFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
-
file_name_float="nodemcu_float_${TRAVIS_TAG}.bin"
-
srec_cat -output ${file_name_float} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
-
cd ../..
-
make clean
-
make EXTRA_CCFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'"
-
cd bin/esp8266
-
file_name_integer="nodemcu_integer_${TRAVIS_TAG}.bin"
-
srec_cat -output ${file_name_integer} -binary 0x00000.bin -binary -fill 0xff 0x00000 0x10000 0x10000.bin -binary -offset 0x10000
-
cd ../..
-
make clean
-
make HW=ESP32 EXTRA_CCFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" all
-
mv bin/esp32 bin/esp32-float
-
make clean
-
make HW=ESP32 EXTRA_CCFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'"
-
mv bin/esp32 bin/esp32-integer
# http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
# http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
-
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/pr-build.sh; fi
#
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/pr-build.sh; fi
Makefile
View file @
51fabc74
...
@@ -25,6 +25,6 @@ LUA_LTR_DEFINES=\
...
@@ -25,6 +25,6 @@ LUA_LTR_DEFINES=\
-DMIN_OPT_LEVEL
=
2
\
-DMIN_OPT_LEVEL
=
2
\
# Ensure these overrides are always used
# Ensure these overrides are always used
CC
:=
$(CC)
$(BASIC_TYPES)
$(LUA_LTR_DEFINES)
-D__ESP32__
CC
:=
$(CC)
$(BASIC_TYPES)
$(LUA_LTR_DEFINES)
-D__ESP32__
$(MORE_CFLAGS)
endif
endif
components/lua/lua.c
View file @
51fabc74
...
@@ -128,7 +128,7 @@ static int docall (lua_State *L, int narg, int clear) {
...
@@ -128,7 +128,7 @@ static int docall (lua_State *L, int narg, int clear) {
static
void
print_version
(
lua_State
*
L
)
{
static
void
print_version
(
lua_State
*
L
)
{
lua_pushliteral
(
L
,
"
\n
"
NODE_VERSION
" build "
BUILD_DATE
" powered by "
LUA_RELEASE
" on
RTOS-SDK
"
);
lua_pushliteral
(
L
,
NODE_VERSION
" build "
BUILD_DATE
" powered by "
LUA_RELEASE
" on
ESP32 IDF
"
);
lua_pushstring
(
L
,
system_get_sdk_version
());
lua_pushstring
(
L
,
system_get_sdk_version
());
lua_concat
(
L
,
2
);
lua_concat
(
L
,
2
);
const
char
*
msg
=
lua_tostring
(
L
,
-
1
);
const
char
*
msg
=
lua_tostring
(
L
,
-
1
);
...
...
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