Skip to content

Commit c69135d

Browse files
me-no-devme-no-dev
committed
Merge pull request #2 from esp8266/esp8266
pull master
2 parents 1c3225f + 8e09520 commit c69135d

Some content is hidden

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

59 files changed

+3823
-789
lines changed

Diff for: ‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,5 @@ nbproject
7575
build/macosx/esptool-*-osx.zip
7676

7777
build/macosx/dist/osx-xtensa-lx106-elf.tgz
78+
/docs/lib_dump/full
79+
/docs/lib_dump

Diff for: ‎.travis.yml

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
1-
sudo: true
1+
sudo: false
2+
23
language: java
34

45
os:
56
- linux
6-
- osx
7+
8+
addons:
9+
apt:
10+
packages:
11+
- ant
712

813
jdk:
914
- oraclejdk8
1015

1116
script:
12-
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi
13-
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -qq ant; fi
1417
- pushd build
15-
- echo "" | ant dist
18+
- echo "" | ant build
1619
- popd
17-
#- bash -x ./generate-appimage
18-
19-
deploy:
20-
provider: releases
21-
api_key:
22-
secure: eKHcAMuC58JZKRsn1QwbiYE4aL/9dZsybDqqHTo1dUo8x9+3fGed/Dci76ItFFS7SmFfIdl6ej8/Uj0nPK/sIE21blKBe3+L0KAJm0TTq3m0ig1suCmMipCsSW+srWYM0hl58+OKagM4FoHKDjsEnzRDv9Z4xtxyvG+7/XLD1dE=
23-
skip_cleanup: true
24-
file_glob: true
25-
file:
26-
- '$TRAVIS_BUILD_DIR/build/linux/arduino-*.tar.xz'
27-
# - '$TRAVIS_BUILD_DIR/Arduino.AppImage'
28-
on:
29-
tags: true
30-
all_branches: true
20+
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
21+
- sleep 3
22+
- export DISPLAY=:1.0
23+
- export PATH="$PWD/build/linux/work:$PATH"
24+
- which arduino
25+
- source hardware/esp8266com/esp8266/tests/common.sh
26+
- arduino --board esp8266com:esp8266:generic --save-prefs
27+
- build_sketches arduino $PWD/hardware/esp8266com/esp8266
3128

3229
notifications:
3330
email:
3431
on_success: change
3532
on_failure: change
33+
webhooks:
34+
urls:
35+
- secure: "dnSY+KA7NK+KD+Z71copmANDUsyVePrZ0iXvXxmqMEQv+lp3j2Z87G5pHn7j0WNcNZrejJqOdbElJ9Q4QESRaAYxTR7cA6ameJeEKHiFJrQtN/4abvoXb9E1CxpL8aNON/xgnqCk+fycOK3nbWWXlJBodzBm7KN64vrcHO7et+M="
36+
on_success: change # options: [always|never|change] default: always
37+
on_failure: always # options: [always|never|change] default: always
38+
on_start: false # default: false

Diff for: ‎README.md

+36-288
Large diffs are not rendered by default.

Diff for: ‎boards.txt

+137-86
Original file line numberDiff line numberDiff line change
@@ -135,56 +135,46 @@ generic.menu.FlashSize.4M.upload.maximum_size=1044464
135135
# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
136136

137137
##############################################################
138-
modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
138+
huzzah.name=Adafruit HUZZAH ESP8266
139139

140-
modwifi.upload.tool=esptool
141-
modwifi.upload.speed=115200
142-
modwifi.upload.resetmethod=ck
143-
modwifi.upload.maximum_size=1044464
144-
modwifi.upload.maximum_data_size=81920
145-
modwifi.upload.wait_for_upload_port=true
146-
modwifi.serial.disableDTR=true
147-
modwifi.serial.disableRTS=true
140+
huzzah.upload.tool=esptool
141+
huzzah.upload.speed=115200
142+
huzzah.upload.resetmethod=ck
143+
huzzah.upload.maximum_size=1044464
144+
huzzah.upload.maximum_data_size=81920
145+
huzzah.upload.wait_for_upload_port=true
146+
huzzah.serial.disableDTR=true
147+
huzzah.serial.disableRTS=true
148148

149-
modwifi.build.mcu=esp8266
150-
modwifi.build.f_cpu=80000000L
151-
modwifi.build.board=MOD_WIFI_ESP8266
152-
modwifi.build.core=esp8266
153-
modwifi.build.variant=generic
154-
# Winbond W25Q16 flash
155-
modwifi.build.flash_mode=qio
156-
modwifi.build.flash_size=2M
157-
modwifi.build.flash_freq=40
158-
modwifi.build.flash_ld=eagle.flash.2m.ld
159-
modwifi.build.spiffs_start=0x100000
160-
modwifi.build.spiffs_end=0x1FB000
161-
modwifi.build.spiffs_pagesize=256
162-
modwifi.build.spiffs_blocksize=8192
149+
huzzah.build.mcu=esp8266
150+
huzzah.build.f_cpu=80000000L
151+
huzzah.build.board=ESP8266_ESP12
152+
huzzah.build.core=esp8266
153+
huzzah.build.variant=adafruit
154+
huzzah.build.flash_mode=qio
155+
huzzah.build.flash_size=4M
156+
huzzah.build.flash_freq=40
157+
huzzah.build.flash_ld=eagle.flash.4m.ld
158+
huzzah.build.spiffs_start=0x100000
159+
huzzah.build.spiffs_end=0x3FB000
160+
huzzah.build.spiffs_pagesize=256
161+
huzzah.build.spiffs_blocksize=8192
163162

164-
modwifi.menu.CpuFrequency.80=80 MHz
165-
modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
166-
modwifi.menu.CpuFrequency.160=160 MHz
167-
modwifi.menu.CpuFrequency.160.build.f_cpu=160000000L
163+
huzzah.menu.CpuFrequency.80=80 MHz
164+
huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
165+
huzzah.menu.CpuFrequency.160=160 MHz
166+
huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L
168167

169-
modwifi.menu.UploadSpeed.115200=115200
170-
modwifi.menu.UploadSpeed.115200.upload.speed=115200
171-
modwifi.menu.UploadSpeed.9600=9600
172-
modwifi.menu.UploadSpeed.9600.upload.speed=9600
173-
modwifi.menu.UploadSpeed.57600=57600
174-
modwifi.menu.UploadSpeed.57600.upload.speed=57600
175-
modwifi.menu.UploadSpeed.256000.windows=256000
176-
modwifi.menu.UploadSpeed.256000.upload.speed=256000
177-
modwifi.menu.UploadSpeed.230400.linux=230400
178-
modwifi.menu.UploadSpeed.230400.macosx=230400
179-
modwifi.menu.UploadSpeed.230400.macosx=230400
180-
modwifi.menu.UploadSpeed.230400.upload.speed=230400
181-
modwifi.menu.UploadSpeed.460800.linux=460800
182-
modwifi.menu.UploadSpeed.460800.macosx=460800
183-
modwifi.menu.UploadSpeed.460800.upload.speed=460800
184-
modwifi.menu.UploadSpeed.512000.windows=512000
185-
modwifi.menu.UploadSpeed.512000.upload.speed=512000
186-
modwifi.menu.UploadSpeed.921600=921600
187-
modwifi.menu.UploadSpeed.921600.upload.speed=921600
168+
huzzah.menu.UploadSpeed.115200=115200
169+
huzzah.menu.UploadSpeed.115200.upload.speed=115200
170+
huzzah.menu.UploadSpeed.9600=9600
171+
huzzah.menu.UploadSpeed.9600.upload.speed=9600
172+
huzzah.menu.UploadSpeed.57600=57600
173+
huzzah.menu.UploadSpeed.57600.upload.speed=57600
174+
huzzah.menu.UploadSpeed.256000=256000
175+
huzzah.menu.UploadSpeed.256000.upload.speed=256000
176+
huzzah.menu.UploadSpeed.921600=921600
177+
huzzah.menu.UploadSpeed.921600.upload.speed=921600
188178

189179
##############################################################
190180
nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
@@ -239,7 +229,7 @@ nodemcu.menu.UploadSpeed.921600.upload.speed=921600
239229

240230
##############################################################
241231
nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
242-
232+
243233
nodemcuv2.upload.tool=esptool
244234
nodemcuv2.upload.speed=115200
245235
nodemcuv2.upload.resetmethod=ck
@@ -248,7 +238,7 @@ nodemcuv2.upload.maximum_data_size=81920
248238
nodemcuv2.upload.wait_for_upload_port=true
249239
nodemcuv2.serial.disableDTR=true
250240
nodemcuv2.serial.disableRTS=true
251-
241+
252242
nodemcuv2.build.mcu=esp8266
253243
nodemcuv2.build.f_cpu=80000000L
254244
nodemcuv2.build.board=ESP8266_ESP12
@@ -262,12 +252,12 @@ nodemcuv2.build.spiffs_start=0x100000
262252
nodemcuv2.build.spiffs_end=0x3FB000
263253
nodemcuv2.build.spiffs_pagesize=256
264254
nodemcuv2.build.spiffs_blocksize=8192
265-
255+
266256
nodemcuv2.menu.CpuFrequency.80=80 MHz
267257
nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
268258
nodemcuv2.menu.CpuFrequency.160=160 MHz
269259
nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
270-
260+
271261
nodemcuv2.menu.UploadSpeed.115200=115200
272262
nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
273263
nodemcuv2.menu.UploadSpeed.9600=9600
@@ -289,46 +279,106 @@ nodemcuv2.menu.UploadSpeed.921600=921600
289279
nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
290280

291281
##############################################################
292-
huzzah.name=Adafruit HUZZAH ESP8266
282+
modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
293283

294-
huzzah.upload.tool=esptool
295-
huzzah.upload.speed=115200
296-
huzzah.upload.resetmethod=ck
297-
huzzah.upload.maximum_size=1044464
298-
huzzah.upload.maximum_data_size=81920
299-
huzzah.upload.wait_for_upload_port=true
300-
huzzah.serial.disableDTR=true
301-
huzzah.serial.disableRTS=true
284+
modwifi.upload.tool=esptool
285+
modwifi.upload.speed=115200
286+
modwifi.upload.resetmethod=ck
287+
modwifi.upload.maximum_size=1044464
288+
modwifi.upload.maximum_data_size=81920
289+
modwifi.upload.wait_for_upload_port=true
290+
modwifi.serial.disableDTR=true
291+
modwifi.serial.disableRTS=true
302292

303-
huzzah.build.mcu=esp8266
304-
huzzah.build.f_cpu=80000000L
305-
huzzah.build.board=ESP8266_ESP12
306-
huzzah.build.core=esp8266
307-
huzzah.build.variant=adafruit
308-
huzzah.build.flash_mode=qio
309-
huzzah.build.flash_size=4M
310-
huzzah.build.flash_freq=40
311-
huzzah.build.flash_ld=eagle.flash.4m.ld
312-
huzzah.build.spiffs_start=0x100000
313-
huzzah.build.spiffs_end=0x3FB000
314-
huzzah.build.spiffs_pagesize=256
315-
huzzah.build.spiffs_blocksize=8192
293+
modwifi.build.mcu=esp8266
294+
modwifi.build.f_cpu=80000000L
295+
modwifi.build.board=MOD_WIFI_ESP8266
296+
modwifi.build.core=esp8266
297+
modwifi.build.variant=generic
298+
# Winbond W25Q16 flash
299+
modwifi.build.flash_mode=qio
300+
modwifi.build.flash_size=2M
301+
modwifi.build.flash_freq=40
302+
modwifi.build.flash_ld=eagle.flash.2m.ld
303+
modwifi.build.spiffs_start=0x100000
304+
modwifi.build.spiffs_end=0x1FB000
305+
modwifi.build.spiffs_pagesize=256
306+
modwifi.build.spiffs_blocksize=8192
316307

317-
huzzah.menu.CpuFrequency.80=80 MHz
318-
huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
319-
huzzah.menu.CpuFrequency.160=160 MHz
320-
huzzah.menu.CpuFrequency.160.build.f_cpu=160000000L
308+
modwifi.menu.CpuFrequency.80=80 MHz
309+
modwifi.menu.CpuFrequency.80.build.f_cpu=80000000L
310+
modwifi.menu.CpuFrequency.160=160 MHz
311+
modwifi.menu.CpuFrequency.160.build.f_cpu=160000000L
321312

322-
huzzah.menu.UploadSpeed.115200=115200
323-
huzzah.menu.UploadSpeed.115200.upload.speed=115200
324-
huzzah.menu.UploadSpeed.9600=9600
325-
huzzah.menu.UploadSpeed.9600.upload.speed=9600
326-
huzzah.menu.UploadSpeed.57600=57600
327-
huzzah.menu.UploadSpeed.57600.upload.speed=57600
328-
huzzah.menu.UploadSpeed.256000=256000
329-
huzzah.menu.UploadSpeed.256000.upload.speed=256000
330-
huzzah.menu.UploadSpeed.921600=921600
331-
huzzah.menu.UploadSpeed.921600.upload.speed=921600
313+
modwifi.menu.UploadSpeed.115200=115200
314+
modwifi.menu.UploadSpeed.115200.upload.speed=115200
315+
modwifi.menu.UploadSpeed.9600=9600
316+
modwifi.menu.UploadSpeed.9600.upload.speed=9600
317+
modwifi.menu.UploadSpeed.57600=57600
318+
modwifi.menu.UploadSpeed.57600.upload.speed=57600
319+
modwifi.menu.UploadSpeed.256000.windows=256000
320+
modwifi.menu.UploadSpeed.256000.upload.speed=256000
321+
modwifi.menu.UploadSpeed.230400.linux=230400
322+
modwifi.menu.UploadSpeed.230400.macosx=230400
323+
modwifi.menu.UploadSpeed.230400.macosx=230400
324+
modwifi.menu.UploadSpeed.230400.upload.speed=230400
325+
modwifi.menu.UploadSpeed.460800.linux=460800
326+
modwifi.menu.UploadSpeed.460800.macosx=460800
327+
modwifi.menu.UploadSpeed.460800.upload.speed=460800
328+
modwifi.menu.UploadSpeed.512000.windows=512000
329+
modwifi.menu.UploadSpeed.512000.upload.speed=512000
330+
modwifi.menu.UploadSpeed.921600=921600
331+
modwifi.menu.UploadSpeed.921600.upload.speed=921600
332+
333+
##############################################################
334+
thing.name=SparkFun ESP8266 Thing
335+
336+
thing.upload.tool=esptool
337+
thing.upload.speed=921600
338+
thing.upload.resetmethod=ck
339+
thing.upload.maximum_size=434160
340+
thing.upload.maximum_data_size=81920
341+
thing.upload.wait_for_upload_port=true
342+
thing.serial.disableDTR=true
343+
thing.serial.disableRTS=true
344+
345+
thing.build.mcu=esp8266
346+
thing.build.f_cpu=80000000L
347+
thing.build.board=ESP8266_THING
348+
thing.build.core=esp8266
349+
thing.build.variant=thing
350+
thing.build.flash_mode=qio
351+
# flash chip: AT25SF041 (512 kbyte, 4Mbit)
352+
thing.build.flash_size=512K
353+
thing.build.flash_ld=eagle.flash.512k.ld
354+
thing.build.flash_freq=40
355+
thing.build.spiffs_start=0x6B000
356+
thing.build.spiffs_end=0x7B000
357+
thing.build.spiffs_blocksize=4096
358+
359+
thing.menu.CpuFrequency.80=80 MHz
360+
thing.menu.CpuFrequency.80.build.f_cpu=80000000L
361+
thing.menu.CpuFrequency.160=160 MHz
362+
thing.menu.CpuFrequency.160.build.f_cpu=160000000L
363+
364+
thing.menu.UploadSpeed.115200=115200
365+
thing.menu.UploadSpeed.115200.upload.speed=115200
366+
thing.menu.UploadSpeed.9600=9600
367+
thing.menu.UploadSpeed.9600.upload.speed=9600
368+
thing.menu.UploadSpeed.57600=57600
369+
thing.menu.UploadSpeed.57600.upload.speed=57600
370+
thing.menu.UploadSpeed.256000.windows=256000
371+
thing.menu.UploadSpeed.256000.upload.speed=256000
372+
thing.menu.UploadSpeed.230400.linux=230400
373+
thing.menu.UploadSpeed.230400.macosx=230400
374+
thing.menu.UploadSpeed.230400.upload.speed=230400
375+
thing.menu.UploadSpeed.460800.linux=460800
376+
thing.menu.UploadSpeed.460800.macosx=460800
377+
thing.menu.UploadSpeed.460800.upload.speed=460800
378+
thing.menu.UploadSpeed.512000.windows=512000
379+
thing.menu.UploadSpeed.512000.upload.speed=512000
380+
thing.menu.UploadSpeed.921600=921600
381+
thing.menu.UploadSpeed.921600.upload.speed=921600
332382

333383
##############################################################
334384
esp210.name=SweetPea ESP-210
@@ -337,6 +387,7 @@ esp210.upload.tool=esptool
337387
esp210.upload.speed=115200
338388
esp210.upload.resetmethod=ck
339389
esp210.upload.maximum_size=1044464
390+
esp210.upload.maximum_data_size=81920
340391
esp210.upload.wait_for_upload_port=true
341392
esp210.serial.disableDTR=true
342393
esp210.serial.disableRTS=true

0 commit comments

Comments
 (0)