Skip to content

Commit f41f4bb

Browse files
authored
Merge pull request #1 from esp8266/master
update
2 parents 661fbca + 7b32e6a commit f41f4bb

File tree

545 files changed

+63918
-4361
lines changed

Some content is hidden

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

545 files changed

+63918
-4361
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ tools/esptool/
55
tools/mkspiffs/
66
package/versions/
77
exclude.txt
8+
tools/sdk/lib/liblwip_src.a
9+
tools/sdk/lwip/src/build
10+
tools/sdk/lwip/src/liblwip_src.a
11+
12+
*.pyc

.travis.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ addons:
1313
script:
1414
- set -e
1515
- export CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8"
16+
- echo -e "travis_fold:start:host_tests"
1617
- pushd $TRAVIS_BUILD_DIR/tests/host
1718
- make
1819
- make clean-objects
20+
- echo -e "travis_fold:end:host_tests"
21+
- echo -e "travis_fold:start:sketch_test_env_prepare"
1922
- popd
2023
- wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
2124
- tar xf arduino.tar.xz
@@ -26,15 +29,18 @@ script:
2629
- ln -s $TRAVIS_BUILD_DIR esp8266
2730
- cd esp8266/tools
2831
- python get.py
29-
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
30-
- sleep 3
31-
- export DISPLAY=:1.0
32-
- export PATH="$HOME/arduino_ide:$PATH"
32+
- export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf/bin:$PATH"
3333
- which arduino
3434
- cd $TRAVIS_BUILD_DIR
3535
- source tests/common.sh
3636
- install_libraries
37-
- build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR "python tools/build.py -l $HOME/Arduino/libraries -b generic -v"
37+
- echo -e "travis_fold:end:sketch_test_env_prepare"
38+
- echo -e "travis_fold:start:sketch_test"
39+
- build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries"
40+
- echo -e "travis_fold:end:sketch_test"
41+
- echo -e "travis_fold:start:size_report"
42+
- cat size.log
43+
- echo -e "travis_fold:end:size_report"
3844

3945
after_success:
4046
- pushd $TRAVIS_BUILD_DIR/tests/host

README.md

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and
99
- Installing options:
1010
- [Using Boards Manager](#installing-with-boards-manager)
1111
- [Using git version](#using-git-version)
12-
- [Using stable version with PlatformIO](#using-stable-version-with-platformio)
12+
- [Using PlatformIO](#using-platformio)
1313
- [Building with make](#building-with-make)
1414
- [Documentation](#documentation)
1515
- [Issues and support](#issues-and-support)
@@ -20,7 +20,7 @@ ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and
2020

2121
Starting with 1.6.4, Arduino allows installation of third-party platform packages using Boards Manager. We have packages available for Windows, Mac OS, and Linux (32 and 64 bit).
2222

23-
- Install Arduino 1.6.5 from the [Arduino website](http://www.arduino.cc/en/main/software).
23+
- Install Arduino 1.6.8 from the [Arduino website](http://www.arduino.cc/en/main/software).
2424
- Start Arduino and open Preferences window.
2525
- Enter ```http://arduino.esp8266.com/stable/package_esp8266com_index.json``` into *Additional Board Manager URLs* field. You can add multiple URLs, separating them with commas.
2626
- Open Boards Manager from Tools > Board menu and install *esp8266* platform (and don't forget to select your ESP8266 board from Tools > Board menu after installation).
@@ -34,17 +34,17 @@ If you find this forum or the ESP8266 Boards Manager package useful, please cons
3434
##### Stable version ![](http://arduino.esp8266.com/stable/badge.svg)
3535
Boards manager link: `http://arduino.esp8266.com/stable/package_esp8266com_index.json`
3636

37-
Documentation: [http://esp8266.github.io/Arduino/versions/2.1.0/](http://esp8266.github.io/Arduino/versions/2.1.0/)
37+
Documentation: [http://esp8266.github.io/Arduino/versions/2.3.0/](http://esp8266.github.io/Arduino/versions/2.3.0/)
3838

3939
##### Staging version ![](http://arduino.esp8266.com/staging/badge.svg)
4040
Boards manager link: `http://arduino.esp8266.com/staging/package_esp8266com_index.json`
4141

42-
Documentation: [http://esp8266.github.io/Arduino/versions/2.1.0-rc2/](http://esp8266.github.io/Arduino/versions/2.1.0-rc2/)
42+
Documentation: [http://esp8266.github.io/Arduino/versions/2.3.0-rc2/](http://esp8266.github.io/Arduino/versions/2.3.0-rc2/)
4343

44-
### Using git version
44+
### Using git version
4545
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino) [![codecov.io](https://codecov.io/github/esp8266/Arduino/coverage.svg?branch=master)](https://codecov.io/github/esp8266/Arduino?branch=master)
4646

47-
- Install Arduino 1.6.7
47+
- Install Arduino 1.6.8
4848
- Go to Arduino directory
4949
- Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
5050
```bash
@@ -60,18 +60,27 @@ python get.py
6060
```
6161
- Restart Arduino
6262

63-
### Using stable version with PlatformIO
63+
### Using PlatformIO
6464

65-
[PlatformIO](http://platformio.org) is a cross-platform code-builder and library manager for embedded development with no external dependencies. Works on the popular host OS: Mac OS X, Windows, Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard). More details in documentation [What is PlatformIO? How does it work?](http://docs.platformio.org/en/latest/faq.html#general).
65+
[PlatformIO](http://platformio.org) is an open source ecosystem for IoT
66+
development with cross platform build system, library manager and full support
67+
for Espressif (ESP8266) development. It works on the popular host OS: Mac OS X, Windows,
68+
Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard).
6669

67-
See [detailed instructions on how to use Espressif platform with PlatformIO](doc/platformio.md).
70+
- [What is PlatformIO?](http://docs.platformio.org/en/stable/what-is-platformio.html)
71+
- [PlatformIO IDE](http://platformio.org/platformio-ide)
72+
- Quick Start with [PlatformIO IDE](http://docs.platformio.org/en/stable/ide/atom.html#quick-start) or [PlatformIO CLI](http://docs.platformio.org/en/stable/quickstart.html)
73+
- [Advanced using](http://docs.platformio.org/en/stable/platforms/espressif.html) -
74+
custom settings, uploading to SPIFFS, Over-the-Air (OTA) or using stage version
75+
- [Integration with other IDE](http://docs.platformio.org/en/stable/ide.html) -
76+
Atom, CLion, Eclipse, Emacs, NetBeans, Qt Creator, Sublime Text, VIM and Visual Studio
77+
- [Project Examples](http://docs.platformio.org/en/stable/platforms/espressif.html#examples)
6878

6979
### Building with make
7080

7181
[makeEspArduino](https://github.com/plerup/makeEspArduino) is a generic makefile for any ESP8266 Arduino project.
7282
Using make instead of the Arduino IDE makes it easier to do automated and production builds.
7383

74-
7584
### Documentation
7685

7786
Documentation for latest development version:
@@ -81,6 +90,7 @@ Documentation for latest development version:
8190
- [File system](doc/filesystem.md)
8291
- [OTA update](doc/ota_updates/readme.md)
8392
- [Supported boards](doc/boards.md)
93+
- [FAQ / Trubleshooting](doc/faq/readme.md)
8494
- [Change log](doc/changes.md)
8595

8696
### Issues and support ###

0 commit comments

Comments
 (0)