Skip to content

Commit 6c12968

Browse files
authored
Merge branch 'master' into dynamic_sd_cache
2 parents 1d9af16 + 41de43a commit 6c12968

File tree

508 files changed

+41674
-16280
lines changed

Some content is hidden

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

508 files changed

+41674
-16280
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ tools/sdk/lib/liblwip_src.a
99
tools/sdk/lwip/src/build
1010
tools/sdk/lwip/src/liblwip_src.a
1111
tools/sdk/ld/backup
12+
tools/sdk/ld/eagle.app.v6.common.ld
13+
14+
tests/hosts/lcov/
1215

1316
*.pyc
1417
*.gch

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "lwip2"]
22
path = tools/sdk/lwip2/builder
33
url = https://github.com/d-a-v/esp82xx-nonos-linklayer.git
4+
[submodule "tools/sdk/ssl/bearssl"]
5+
path = tools/sdk/ssl/bearssl
6+
url = https://github.com/earlephilhower/bearssl-esp8266

.travis.yml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ cache:
1010
matrix:
1111
include:
1212
- env:
13-
- BUILD_TYPE=build
13+
- BUILD_TYPE=build_even
14+
- env:
15+
- BUILD_TYPE=build_odd
16+
- env:
17+
- BUILD_TYPE=debug_even
18+
- env:
19+
- BUILD_TYPE=debug_odd
1420
- env:
1521
- BUILD_TYPE=platformio
1622
- env:
@@ -36,24 +42,36 @@ install:
3642
}
3743
make -C $HOME/astyle/build/gcc prefix=$HOME install;
3844
} || true
45+
- sudo apt-get install valgrind lcov
3946

4047
script:
4148
- $TRAVIS_BUILD_DIR/tests/common.sh
4249

4350
deploy:
44-
provider: releases
45-
prerelease: true
46-
skip_cleanup: true
47-
api_key:
48-
secure: A4FBmqyhlzy33oPeZVolg2Q/A3ZcJ3WnRQqQJ3NAPy+qGM5xcboOYtwcLL9vKaHZGfUB7lUP9QVZFGou1Wrmo9DnPvAoe3+XvCaDRGzVMxeIpu7UStbBD4Knbh98tlbMvZCXYRlT4VcusI9bMLK6UWw4sMdPislBh2FEfglTiag=
49-
file_glob: true
50-
file:
51-
- package/versions/$TRAVIS_TAG/esp8266-$TRAVIS_TAG.zip
52-
- package/versions/$TRAVIS_TAG/package_esp8266com_index.json
53-
on:
54-
repo: esp8266/Arduino
55-
tags: true
56-
condition: "$BUILD_TYPE = package"
51+
- provider: releases
52+
draft: true
53+
skip_cleanup: true
54+
api_key:
55+
secure: A4FBmqyhlzy33oPeZVolg2Q/A3ZcJ3WnRQqQJ3NAPy+qGM5xcboOYtwcLL9vKaHZGfUB7lUP9QVZFGou1Wrmo9DnPvAoe3+XvCaDRGzVMxeIpu7UStbBD4Knbh98tlbMvZCXYRlT4VcusI9bMLK6UWw4sMdPislBh2FEfglTiag=
56+
file_glob: true
57+
tag_name: $TRAVIS_TAG
58+
target_commitish: $TRAVIS_COMMIT
59+
file:
60+
- package/versions/$TRAVIS_TAG/esp8266-$TRAVIS_TAG.zip
61+
- package/versions/$TRAVIS_TAG/package_esp8266com_index.json
62+
on:
63+
repo: esp8266/Arduino
64+
tags: true
65+
condition: "$BUILD_TYPE = package"
66+
67+
- provider: script
68+
skip_cleanup: true
69+
script: bash package/deploy_package_index.sh
70+
on:
71+
repo: esp8266/Arduino
72+
tags: true
73+
condition: "$BUILD_TYPE = package"
74+
5775

5876
notifications:
5977
email:

README.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and
88
# Contents
99
- Installing options:
1010
- [Using Boards Manager](#installing-with-boards-manager)
11-
- [Using git version](#using-git-version)
11+
- [Using git version](#using-git-version-basic-instructions)
1212
- [Using PlatformIO](#using-platformio)
1313
- [Building with make](#building-with-make)
1414
- [Documentation](#documentation)
@@ -28,13 +28,22 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
2828
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
2929
Boards manager link: `http://arduino.esp8266.com/stable/package_esp8266com_index.json`
3030

31-
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.4.1/](https://arduino-esp8266.readthedocs.io/en/2.4.1/)
31+
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.4.2/](https://arduino-esp8266.readthedocs.io/en/2.4.2/)
3232

33-
### Using git version
33+
### Using git version (basic instructions)
3434
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
3535

36-
- Install Arduino 1.8.2 from the [Arduino website](http://www.arduino.cc/en/main/software).
36+
- Install the current upstream Arduino IDE at the 1.8 level or later. The current version is at the [Arduino website](http://www.arduino.cc/en/main/software).
3737
- Go to Arduino directory
38+
- For Mac OS X, it is `Arduino.app` showing as the Arduino icon.
39+
This location may be your `~/Downloads`, `~/Desktop` or even `/Applications`.
40+
```bash
41+
cd <application-directory>/Arduino.app/Contents/Java
42+
```
43+
- For Linux, it is ~/arduino by default.
44+
```bash
45+
cd ~arduino
46+
```
3847
- Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
3948
```bash
4049
cd hardware
@@ -119,3 +128,5 @@ ESP8266 core files are licensed under LGPL.
119128
[umm_malloc](https://github.com/rhempel/umm_malloc) memory management library written by Ralph Hempel is used in this project. It is distributed under MIT license.
120129

121130
[axTLS](http://axtls.sourceforge.net/) library written by Cameron Rich, built from https://github.com/igrr/axtls-8266, is used in this project. It is distributed under [BSD license](https://github.com/igrr/axtls-8266/blob/master/LICENSE).
131+
132+
[BearSSL](https://bearssl.org) library written by Thomas Pornin, built from https://github.com/earlephilhower/bearssl-esp8266, is used in this project. It is distributed under the [MIT License](https://bearssl.org/#legal-details).

0 commit comments

Comments
 (0)