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
dd5dafa9
Commit
dd5dafa9
authored
Jan 13, 2016
by
philip
Browse files
Merge remote-tracking branch 'jmattsson/tmr-libmain-binpatch150' into sdk1.5.1
Conflicts: Makefile
parents
1d9336fb
5af57d58
Changes
5
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
dd5dafa9
sdk/
sdk/
cache/
.travis.yml
View file @
dd5dafa9
...
@@ -5,6 +5,9 @@ addons:
...
@@ -5,6 +5,9 @@ addons:
packages
:
packages
:
-
python-serial
-
python-serial
-
srecord
-
srecord
cache
:
directories
:
-
cache
install
:
install
:
-
tar -zxvf tools/esp-open-sdk.tar.gz
-
tar -zxvf tools/esp-open-sdk.tar.gz
-
export PATH=$PATH:$PWD/esp-open-sdk/xtensa-lx106-elf/bin
-
export PATH=$PATH:$PWD/esp-open-sdk/xtensa-lx106-elf/bin
...
...
Makefile
View file @
dd5dafa9
...
@@ -4,6 +4,9 @@
...
@@ -4,6 +4,9 @@
# SDK version NodeMCU is locked to
# SDK version NodeMCU is locked to
SDK_VER
:=
1.5.1
SDK_VER
:=
1.5.1
SDK_FILE_VER
:=
$(SDK_VER)
_16_01_08
SDK_FILE_ID
:=
1046
SDK_FILE_SIZE
:=
2185752
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
# Ensure we search "our" SDK before the tool-chain's SDK (if any)
TOP_DIR
:=
$(
abspath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
TOP_DIR
:=
$(
abspath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
SDK_DIR
:=
$(TOP_DIR)
/sdk/esp_iot_sdk_v
$(SDK_VER)
SDK_DIR
:=
$(TOP_DIR)
/sdk/esp_iot_sdk_v
$(SDK_VER)
...
@@ -171,14 +174,20 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
...
@@ -171,14 +174,20 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
all
:
sdk_extracted .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
all
:
sdk_extracted .subdirs $(OBJS) $(OLIBS) $(OIMAGES) $(OBINS) $(SPECIAL_MKTARGETS)
.PHONY
:
sdk_extracted
.PHONY
:
sdk_extracted
sdk_extracted
:
$(TOP_DIR)/sdk/.extracted-$(SDK_VER)
sdk_extracted
:
$(TOP_DIR)/sdk/.extracted-$(SDK_VER)
$(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
$@
)
"
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
$@
)
"
&&
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
rm
-f
$(SDK_DIR)
/lib/liblwip.a
touch
$@
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
;
}
[
`
wc
-c
<
"
$@
"
`
-eq
$(SDK_FILE_SIZE)
]
||
{
rm
-f
"
$@
"
;
exit
1
;
}
clean
:
clean
:
$(
foreach
d,
$(SUBDIRS)
,
$(MAKE)
-C
$(d)
clean
;
)
$(
foreach
d,
$(SUBDIRS)
,
$(MAKE)
-C
$(d)
clean
;
)
$(RM)
-r
$(ODIR)
/
$(TARGET)
/
$(FLAVOR)
$(RM)
-r
$(ODIR)
/
$(TARGET)
/
$(FLAVOR)
...
...
app/include/user_version.h
View file @
dd5dafa9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#define NODE_VERSION_MAJOR 1U
#define NODE_VERSION_MAJOR 1U
#define NODE_VERSION_MINOR 5U
#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_INTERNAL 0U
#define NODE_VERSION "NodeMCU 1.5.1"
#define NODE_VERSION "NodeMCU 1.5.1"
...
...
cache/esp_iot_sdk_v1.5.1_16_01_08.zip
deleted
100644 → 0
View file @
1d9336fb
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