Skip to content

Commit e67ebc5

Browse files
authored
Merge branch 'master' into ota_commands_in_flash
2 parents 38b267f + 01e9d94 commit e67ebc5

File tree

196 files changed

+19974
-15142
lines changed

Some content is hidden

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

196 files changed

+19974
-15142
lines changed

.travis.yml

+14-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: bash
22
os: linux
3-
dist: trusty
3+
dist: bionic
44

55
git:
66
depth: 1
@@ -76,21 +76,29 @@ jobs:
7676
env:
7777
- BUILD_PARITY=odd
7878

79+
- name: "Mac OSX can build sketches"
80+
os: osx
81+
stage: build
82+
script: $TRAVIS_BUILD_DIR/tests/build.sh
83+
env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
84+
85+
- name: "Windows can build sketches"
86+
os: windows
87+
stage: build
88+
script: $TRAVIS_BUILD_DIR/tests/build.sh
89+
env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
90+
7991
- name: "Host tests"
8092
stage: build
8193
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
8294
install:
83-
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
84-
- sudo apt-get update -q
85-
- sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
8695
- sudo apt-get install valgrind lcov
87-
env: CC=gcc-7 CXX=g++-7
8896

8997
- name: "Docs"
9098
stage: build
9199
script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
92100
install:
93-
- sudo apt-get install python3-pip
101+
- sudo apt-get install python3-pip python3-setuptools
94102
- pip3 install --user -r doc/requirements.txt;
95103

96104
- name: "Style check"
@@ -101,23 +109,6 @@ jobs:
101109
- name: "Mock trivial test"
102110
stage: build
103111
script: $TRAVIS_BUILD_DIR/tests/buildm.sh
104-
install:
105-
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
106-
- sudo apt-get update -q
107-
- sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
108-
env: CC=gcc-7 CXX=g++-7
109-
110-
- name: "Mac OSX can build sketches"
111-
os: osx
112-
stage: build
113-
script: $TRAVIS_BUILD_DIR/tests/build.sh
114-
env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
115-
116-
- name: "Windows can build sketches"
117-
os: windows
118-
stage: build
119-
script: $TRAVIS_BUILD_DIR/tests/build.sh
120-
env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
121112

122113
- name: "Boards"
123114
stage: build

README.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
33

44
# Quick links
55

6-
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.2/)
6+
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.6.1/)
77
- [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
88
- [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
99

@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
3636
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
3737
Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
3838

39-
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.2/](https://arduino-esp8266.readthedocs.io/en/2.5.2/)
39+
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.6.1/](https://arduino-esp8266.readthedocs.io/en/2.6.1/)
4040

4141
### Using git version
4242
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
@@ -123,3 +123,13 @@ ESP8266 core files are licensed under LGPL.
123123
[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).
124124

125125
[LittleFS](https://github.com/ARMmbed/littlefs) library written by ARM Limited and released under the [BSD 3-clause license](https://github.com/ARMmbed/littlefs/blob/master/LICENSE.md).
126+
127+
### Other useful links ###
128+
129+
[Toolchain repo](https://github.com/earlephilhower/esp-quick-toolchain)
130+
131+
[Lwip link layer repo](https://github.com/d-a-v/esp82xx-nonos-linklayer)
132+
133+
[SoftwareSerial repo](https://github.com/plerup/espsoftwareserial)
134+
135+
[Serial Monitor Arduino IDE plugin](https://github.com/mytrain/arduino-esp8266-serial-plugin) Original discussion [here](https://github.com/esp8266/Arduino/issues/1360), quick download [there](http://mytrain.fr/cms//images/mytrain/private/ESP8266SM.v3.zip).

0 commit comments

Comments
 (0)