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
7d3202e8
Commit
7d3202e8
authored
Jan 14, 2016
by
Johny Mattsson
Browse files
Merge pull request #928 from pjsg/sdk1.5.1
Upgrade to SDK version 1.5.1 from Espressif
parents
2ff1324d
b2850c3f
Changes
6
Show whitespace changes
Inline
Side-by-side
.gitignore
View file @
7d3202e8
sdk/
cache/
.travis.yml
View file @
7d3202e8
...
...
@@ -5,6 +5,9 @@ addons:
packages
:
-
python-serial
-
srecord
cache
:
directories
:
-
cache
install
:
-
tar -zxvf tools/esp-open-sdk.tar.gz
-
export PATH=$PATH:$PWD/esp-open-sdk/xtensa-lx106-elf/bin
...
...
Makefile
View file @
7d3202e8
...
...
@@ -3,7 +3,10 @@
.NOTPARALLEL
:
# SDK version NodeMCU is locked to
SDK_VER
:=
1.5.0
SDK_VER
:=
1.5.1
SDK_FILE_VER
:=
$(SDK_VER)
_16_01_08
SDK_FILE_ID
:=
1046
SDK_FILE_SHA1
:=
374f689a5f9e47690d7b4cd2fc1a1094f3fd5a4f
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
TOP_DIR
:=
$(
abspath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
SDK_DIR
:=
$(TOP_DIR)
/sdk/esp_iot_sdk_v
$(SDK_VER)
...
...
@@ -171,14 +174,20 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
all
:
sdk_extracted .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
.PHONY
:
sdk_extracted
sdk_extracted
:
$(TOP_DIR)/sdk/.extracted
$(TOP_DIR)/sdk/.extracted
:
sdk_extracted
:
$(TOP_DIR)/sdk/.extracted-$(SDK_VER)
$(TOP_DIR)/sdk/.extracted-$(SDK_VER)
:
$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip
mkdir
-p
"
$(
dir
$@
)
"
(
cd
"
$(
dir
$@
)
"
&&
unzip
$(TOP_DIR)
/cache/esp_iot_sdk_v
$(SDK_VER)
*
.zip esp_iot_sdk_v
$(SDK_VER)
/lib/
*
esp_iot_sdk_v
$(SDK_VER)
/ld/eagle.rom.addr.v6.ld esp_iot_sdk_v
$(SDK_VER)
/include/
*
)
(
cd
"
$(
dir
$@
)
"
&&
rm
-fr
esp_iot_sdk_v
$(SDK_VER)
&&
unzip
$(TOP_DIR)
/cache/esp_iot_sdk_v
$(SDK_VER)
*
.zip esp_iot_sdk_v
$(SDK_VER)
/lib/
*
esp_iot_sdk_v
$(SDK_VER)
/ld/eagle.rom.addr.v6.ld esp_iot_sdk_v
$(SDK_VER)
/include/
*
)
rm
-f
$(SDK_DIR)
/lib/liblwip.a
touch
$@
$(TOP_DIR)/cache/esp_iot_sdk_v$(SDK_FILE_VER).zip
:
mkdir
-p
"
$(
dir
$@
)
"
wget
--tries
=
10
--timeout
=
15
--waitretry
=
30
--read-timeout
=
20
--retry-connrefused
http://bbs.espressif.com/download/file.php?id
=
$(SDK_FILE_ID)
-O
$@
||
{
rm
-f
"
$@
"
;
exit
1
;
}
(
echo
"
$(SDK_FILE_SHA1)
$@
"
|
sha1sum
-c
-
)
||
{
rm
-f
"
$@
"
;
exit
1
;
}
clean
:
$(
foreach
d,
$(SUBDIRS)
,
$(MAKE)
-C
$(d)
clean
;
)
$(RM)
-r
$(ODIR)
/
$(TARGET)
/
$(FLAVOR)
...
...
README.md
View file @
7d3202e8
# **NodeMCU 1.5.
0
** #
# **NodeMCU 1.5.
1
** #
[

](https://gitter.im/nodemcu/nodemcu-firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[

](https://travis-ci.org/nodemcu/nodemcu-firmware)
###A lua based firmware for wifi-soc esp8266
-
Build on
[
ESP8266 NONOS SDK 1.5.
0
](
http://bbs.espressif.com/viewtopic.php?f=46&
t=1442
)
-
Build on
[
ESP8266 NONOS SDK 1.5.
1
](
http://bbs.espressif.com/viewtopic.php?f=46&
p=5315
)
-
Lua core based on
[
eLua project
](
http://www.eluaproject.net/
)
-
cjson based on
[
lua-cjson
](
https://github.com/mpx/lua-cjson
)
-
File system based on
[
spiffs
](
https://github.com/pellepl/spiffs
)
...
...
@@ -298,7 +298,7 @@ Comment-out the #define statement for unused modules. Example:
Identify your firmware builds by editing
`app/include/user_version.h`
```
c
#define NODE_VERSION "NodeMCU 1.5.
0
+myname"
#define NODE_VERSION "NodeMCU 1.5.
1
+myname"
#ifndef BUILD_DATE
#define BUILD_DATE "YYYYMMDD"
#endif
...
...
app/include/user_version.h
View file @
7d3202e8
...
...
@@ -3,10 +3,10 @@
#define NODE_VERSION_MAJOR 1U
#define NODE_VERSION_MINOR 5U
#define NODE_VERSION_REVISION
0
U
#define NODE_VERSION_REVISION
1
U
#define NODE_VERSION_INTERNAL 0U
#define NODE_VERSION "NodeMCU 1.5.
0
"
#define NODE_VERSION "NodeMCU 1.5.
1
"
#ifndef BUILD_DATE
#define BUILD_DATE "unspecified"
#endif
...
...
cache/esp_iot_sdk_v1.5.0_15_11_27.zip
deleted
100644 → 0
View file @
2ff1324d
File deleted
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