Skip to content

Commit 7fef63e

Browse files
MakunaMakuna
committed
Merge pull request #2 from esp8266/esp8266
merged
2 parents cff5749 + d50aa43 commit 7fef63e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1135
-215
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ Libraries that don't rely on low-level access to AVR registers should work well.
195195
- [NeoPixelBus](https://github.com/Makuna/NeoPixelBus) - Arduino NeoPixel library compatible with esp8266.
196196
- [RTC](https://github.com/Makuna/Rtc) - Arduino Library for Ds1307 & Ds3231 compatible with esp8266.
197197
- [Blynk](https://github.com/blynkkk/blynk-library) - easy IoT framework for Makers (check out the [Kickstarter page](http://tiny.cc/blynk-kick)).
198+
- [arduinoWebSockets](https://github.com/Links2004/arduinoWebSockets) - WebSocket Server and Client compatible with esp8266 (RFC6455)
198199

199200
#### Upload via serial port ####
200201
Pick the correct serial port.

‎build/build.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,13 @@
398398

399399

400400
<antcall target="untar">
401-
<param name="archive_file" value="${staging_folder}/esptool-0.4.4-osx.tar.gz" />
402-
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-osx.tar.gz" />
403-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-osx" />
401+
<param name="archive_file" value="${staging_folder}/esptool-0.4.5-osx.tar.gz" />
402+
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-osx.tar.gz" />
403+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-osx" />
404404
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
405405
</antcall>
406-
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
407-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-osx/" />
406+
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-osx/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
407+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-osx/" />
408408

409409
</target>
410410

@@ -673,13 +673,13 @@
673673
</antcall>
674674

675675
<antcall target="untar">
676-
<param name="archive_file" value="${staging_folder}/esptool-0.4.4-linux64.tar.gz" />
677-
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-linux64.tar.gz" />
678-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-linux64" />
676+
<param name="archive_file" value="${staging_folder}/esptool-0.4.5-linux64.tar.gz" />
677+
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-linux64.tar.gz" />
678+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-linux64" />
679679
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
680680
</antcall>
681-
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
682-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-linux64/" />
681+
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool" />
682+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-linux64/" />
683683

684684
</target>
685685

@@ -891,7 +891,7 @@
891891
<fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
892892
</chmod>
893893

894-
<loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/release" prefix="windows"/>
894+
<loadproperties srcfile="${WINDOWS_BUNDLED_JVM}/../release" prefix="windows"/>
895895

896896
<fail message="It looks like ${WINDOWS_BUNDLED_JVM} does not contain a Windows JVM">
897897
<condition>
@@ -928,13 +928,13 @@
928928

929929

930930
<antcall target="unzip">
931-
<param name="archive_file" value="${staging_folder}/esptool-0.4.4-win32.zip" />
932-
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-win32.zip" />
933-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-win32" />
931+
<param name="archive_file" value="${staging_folder}/esptool-0.4.5-win32.zip" />
932+
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-win32.zip" />
933+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-win32" />
934934
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/" />
935935
</antcall>
936-
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool.exe" />
937-
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.4-win32/" />
936+
<move file="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool.exe" />
937+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/esp8266com/esp8266/tools/esptool-0.4.5-win32/" />
938938

939939
</target>
940940

‎build/build_board_manager_package.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ cat << EOF > package_esp8266com_index.json
6464
},
6565
{
6666
"name":"NodeMCU 1.0 (ESP-12E Module)"
67+
},
68+
{
69+
"name":"Adafruit HUZZAH ESP8266 (ESP-12)"
6770
}
68-
6971
],
7072
"toolsDependencies":[ {
7173
"packager":"esp8266",

‎build/linux/esptool-0.4.4-linux64.tar.gz.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/linux/esptool-0.4.5-linux64.tar.gz.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ef9940f7b690f346739b54e4df46d0fbd37f0e12

‎build/macosx/esptool-0.4.4-osx.tar.gz.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/macosx/esptool-0.4.5-osx.tar.gz.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
702be33406745b31904a40b28cf6ebb87173e4c8

‎build/windows/esptool-0.4.4-win32.zip.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/windows/esptool-0.4.5-win32.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7c6b0049e016889a85dc0c7e01282ef0ce36d1f3

‎hardware/esp8266com/esp8266/boards.txt

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ generic.name=Generic ESP8266 Module
99
generic.upload.tool=esptool
1010
generic.upload.speed=115200
1111
generic.upload.resetmethod=ck
12-
generic.upload.maximum_size=372736
12+
generic.upload.maximum_size=434160
1313
generic.upload.maximum_data_size=81920
1414
generic.upload.wait_for_upload_port=true
1515
generic.serial.disableDTR=true
@@ -59,55 +59,55 @@ generic.menu.FlashSize.512K.build.flash_ld=eagle.flash.512k.ld
5959
generic.menu.FlashSize.512K.build.spiffs_start=0x6B000
6060
generic.menu.FlashSize.512K.build.spiffs_end=0x7B000
6161
generic.menu.FlashSize.512K.build.spiffs_blocksize=4096
62-
generic.menu.FlashSize.512K.upload.maximum_size=372736
62+
generic.menu.FlashSize.512K.upload.maximum_size=434160
6363

6464
generic.menu.FlashSize.1M512=1M (512K SPIFFS)
6565
generic.menu.FlashSize.1M512.build.flash_size=1M
6666
generic.menu.FlashSize.1M512.build.flash_ld=eagle.flash.1m512.ld
67-
generic.menu.FlashSize.1M512.build.spiffs_start=0x6B000
67+
generic.menu.FlashSize.1M512.build.spiffs_start=0x7B000
6868
generic.menu.FlashSize.1M512.build.spiffs_end=0xFB000
6969
generic.menu.FlashSize.1M512.build.spiffs_blocksize=8192
70-
generic.menu.FlashSize.1M512.upload.maximum_size=438272
70+
generic.menu.FlashSize.1M512.upload.maximum_size=499696
7171

7272
generic.menu.FlashSize.1M256=1M (256K SPIFFS)
7373
generic.menu.FlashSize.1M256.build.flash_size=1M
7474
generic.menu.FlashSize.1M256.build.flash_ld=eagle.flash.1m256.ld
75-
generic.menu.FlashSize.1M256.build.spiffs_start=0xAB000
75+
generic.menu.FlashSize.1M256.build.spiffs_start=0xBB000
7676
generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
7777
generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
78-
generic.menu.FlashSize.1M256.upload.maximum_size=700416
78+
generic.menu.FlashSize.1M256.upload.maximum_size=761840
7979

8080
generic.menu.FlashSize.1M128=1M (128K SPIFFS)
8181
generic.menu.FlashSize.1M128.build.flash_size=1M
8282
generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
83-
generic.menu.FlashSize.1M128.build.spiffs_start=0xCB000
83+
generic.menu.FlashSize.1M128.build.spiffs_start=0xDB000
8484
generic.menu.FlashSize.1M128.build.spiffs_end=0xFB000
8585
generic.menu.FlashSize.1M128.build.spiffs_blocksize=4096
86-
generic.menu.FlashSize.1M128.upload.maximum_size=831488
86+
generic.menu.FlashSize.1M128.upload.maximum_size=892912
8787

8888
generic.menu.FlashSize.1M64=1M (64K SPIFFS)
8989
generic.menu.FlashSize.1M64.build.flash_size=1M
9090
generic.menu.FlashSize.1M64.build.flash_ld=eagle.flash.1m64.ld
9191
generic.menu.FlashSize.1M64.build.spiffs_start=0xEB000
9292
generic.menu.FlashSize.1M64.build.spiffs_end=0xFB000
9393
generic.menu.FlashSize.1M64.build.spiffs_blocksize=4096
94-
generic.menu.FlashSize.1M64.upload.maximum_size=897024
94+
generic.menu.FlashSize.1M64.upload.maximum_size=958448
9595

9696
generic.menu.FlashSize.2M=2M (1M SPIFFS)
9797
generic.menu.FlashSize.2M.build.flash_size=2M
9898
generic.menu.FlashSize.2M.build.flash_ld=eagle.flash.2m.ld
9999
generic.menu.FlashSize.2M.build.spiffs_start=0x100000
100100
generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
101101
generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
102-
generic.menu.FlashSize.2M.upload.maximum_size=983040
102+
generic.menu.FlashSize.2M.upload.maximum_size=1044464
103103

104104
generic.menu.FlashSize.4M=4M (3M SPIFFS)
105105
generic.menu.FlashSize.4M.build.flash_size=4M
106106
generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
107107
generic.menu.FlashSize.4M.build.spiffs_start=0x100000
108108
generic.menu.FlashSize.4M.build.spiffs_end=0x3FB000
109109
generic.menu.FlashSize.4M.build.spiffs_blocksize=8192
110-
generic.menu.FlashSize.4M.upload.maximum_size=983040
110+
generic.menu.FlashSize.4M.upload.maximum_size=1044464
111111

112112
# disabled because espressif's bootloader refuses to write above 4M
113113
# generic.menu.FlashSize.8M=8M (7M SPIFFS)
@@ -134,7 +134,7 @@ modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
134134
modwifi.upload.tool=esptool
135135
modwifi.upload.speed=115200
136136
modwifi.upload.resetmethod=ck
137-
modwifi.upload.maximum_size=983040
137+
modwifi.upload.maximum_size=1044464
138138
modwifi.upload.maximum_data_size=81920
139139
modwifi.upload.wait_for_upload_port=true
140140
modwifi.serial.disableDTR=true
@@ -186,7 +186,7 @@ nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
186186
nodemcu.upload.tool=esptool
187187
nodemcu.upload.speed=115200
188188
nodemcu.upload.resetmethod=ck
189-
nodemcu.upload.maximum_size=983040
189+
nodemcu.upload.maximum_size=1044464
190190
nodemcu.upload.maximum_data_size=81920
191191
nodemcu.upload.wait_for_upload_port=true
192192
nodemcu.serial.disableDTR=true
@@ -237,7 +237,7 @@ nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
237237
nodemcuv2.upload.tool=esptool
238238
nodemcuv2.upload.speed=115200
239239
nodemcuv2.upload.resetmethod=ck
240-
nodemcuv2.upload.maximum_size=983040
240+
nodemcuv2.upload.maximum_size=1044464
241241
nodemcuv2.upload.maximum_data_size=81920
242242
nodemcuv2.upload.wait_for_upload_port=true
243243
nodemcuv2.serial.disableDTR=true
@@ -282,6 +282,48 @@ nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
282282
nodemcuv2.menu.UploadSpeed.921600=921600
283283
nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
284284

285+
##############################################################
286+
huzzah.name=Adafruit HUZZAH ESP8266
287+
288+
huzzah.upload.tool=esptool
289+
huzzah.upload.speed=115200
290+
huzzah.upload.resetmethod=ck
291+
huzzah.upload.maximum_size=1044464
292+
huzzah.upload.maximum_data_size=81920
293+
huzzah.upload.wait_for_upload_port=true
294+
huzzah.serial.disableDTR=true
295+
huzzah.serial.disableRTS=true
296+
297+
huzzah.build.mcu=esp8266
298+
huzzah.build.f_cpu=80000000L
299+
huzzah.build.board=ESP8266_ESP12
300+
huzzah.build.core=esp8266
301+
huzzah.build.variant=adafruit
302+
huzzah.build.flash_mode=qio
303+
huzzah.build.flash_size=4M
304+
huzzah.build.flash_freq=40
305+
huzzah.build.flash_ld=eagle.flash.4m.ld
306+
huzzah.build.spiffs_start=0x100000
307+
huzzah.build.spiffs_end=0x3FB000
308+
huzzah.build.spiffs_pagesize=256
309+
huzzah.build.spiffs_blocksize=8192
310+
311+
huzzah.menu.CpuFrequency.80=80 MHz
312+
huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
313+
huzzah.menu.CpuFrequency.160=160 MHz
314+
huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L
315+
316+
huzzah.menu.UploadSpeed.115200=115200
317+
huzzah.menu.UploadSpeed.115200.upload.speed=115200
318+
huzzah.menu.UploadSpeed.9600=9600
319+
huzzah.menu.UploadSpeed.9600.upload.speed=9600
320+
huzzah.menu.UploadSpeed.57600=57600
321+
huzzah.menu.UploadSpeed.57600.upload.speed=57600
322+
huzzah.menu.UploadSpeed.256000=256000
323+
huzzah.menu.UploadSpeed.256000.upload.speed=256000
324+
huzzah.menu.UploadSpeed.921600=921600
325+
huzzah.menu.UploadSpeed.921600.upload.speed=921600
326+
285327
##############################################################
286328
# wifio.name=Wifio
287329
#

‎hardware/esp8266com/esp8266/bootloaders/eboot/LICENSE

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Copyright (c) 2015 Ivan Grokhotkov
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without modification,
5+
are permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice,
8+
this list of conditions and the following disclaimer.
9+
2. Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation
11+
and/or other materials provided with the distribution.
12+
3. The name of the authors may not be used to endorse or promote products
13+
derived from this software without specific prior written permission.
14+
15+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
16+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
17+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
18+
SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
20+
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
23+
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
24+
OF SUCH DAMAGE.
25+
26+
Authors: Ivan Grokhotkov

‎hardware/esp8266com/esp8266/bootloaders/eboot/Makefile

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
XTENSA_TOOCHAIN ?=
2+
3+
BIN_DIR := ./
4+
TARGET_DIR := ./
5+
6+
TARGET_OBJ_FILES := \
7+
eboot.o \
8+
9+
TARGET_OBJ_PATHS := $(addprefix $(TARGET_DIR)/,$(TARGET_OBJ_FILES))
10+
11+
CC := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-gcc
12+
CXX := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-g++
13+
AR := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-ar
14+
LD := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-gcc
15+
OBJDUMP := $(XTENSA_TOOCHAIN)xtensa-lx106-elf-objdump
16+
17+
18+
CFLAGS += -std=gnu99
19+
20+
CFLAGS += -O0 -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals
21+
22+
LDFLAGS += -nostdlib -Wl,--no-check-sections -umain
23+
24+
LD_SCRIPT := -Teboot.ld
25+
26+
APP_OUT:= eboot.elf
27+
APP_AR := eboot.a
28+
APP_FW := eboot.bin
29+
30+
all: $(APP_FW)
31+
32+
$(APP_AR): $(TARGET_OBJ_PATHS)
33+
$(AR) cru $@ $^
34+
35+
36+
$(APP_OUT): $(APP_AR)
37+
$(LD) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group -Wl,--whole-archive $(APP_AR) -Wl,--end-group -o $@
38+
39+
$(APP_FW): $(APP_OUT)
40+
$(ESPTOOL) -vvv -eo $(APP_OUT) -bo $@ -bs .text -bs .data -bs .rodata -bc -ec || true
41+
42+
43+
clean:
44+
rm -f *.o
45+
rm -f $(APP_AR)
46+
rm -f $(APP_OUT)
47+
48+
49+
.PHONY: all clean default
50+

0 commit comments

Comments
 (0)