Skip to content

Commit 2cad10b

Browse files
authored
Merge branch 'master' into bugfix2/ESP8266HTTPClient
2 parents 6e80ffd + d40dbb4 commit 2cad10b

File tree

329 files changed

+23140
-16347
lines changed

Some content is hidden

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

329 files changed

+23140
-16347
lines changed

.travis.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
language: bash
22
os: linux
3-
dist: trusty
3+
dist: bionic
44

55
git:
66
depth: 1
77
submodules: false
88

9-
addons:
10-
apt:
11-
sources:
12-
- ubuntu-toolchain-r-test
13-
packages:
14-
- g++-7
15-
- gcc-7
16-
179
before_install:
1810
- git submodule update --init # no recursive update
1911

@@ -84,17 +76,29 @@ jobs:
8476
env:
8577
- BUILD_PARITY=odd
8678

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+
8791
- name: "Host tests"
8892
stage: build
8993
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
90-
install: sudo apt-get install valgrind lcov
91-
env: CC=gcc-7 CXX=g++-7
94+
install:
95+
- sudo apt-get install valgrind lcov
9296

9397
- name: "Docs"
9498
stage: build
9599
script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
96100
install:
97-
- sudo apt-get install python3-pip
101+
- sudo apt-get install python3-pip python3-setuptools
98102
- pip3 install --user -r doc/requirements.txt;
99103

100104
- name: "Style check"
@@ -105,7 +109,6 @@ jobs:
105109
- name: "Mock trivial test"
106110
stage: build
107111
script: $TRAVIS_BUILD_DIR/tests/buildm.sh
108-
env: CC=gcc-7 CXX=g++-7
109112

110113
- name: "Boards"
111114
stage: build

README.md

Lines changed: 17 additions & 29 deletions
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.3/)
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

@@ -16,7 +16,7 @@ ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and
1616
# Contents
1717
- Installing options:
1818
- [Using Boards Manager](#installing-with-boards-manager)
19-
- [Using git version](#using-git-version-basic-instructions)
19+
- [Using git version](#using-git-version)
2020
- [Using PlatformIO](#using-platformio)
2121
- [Building with make](#building-with-make)
2222
- [Documentation](#documentation)
@@ -36,37 +36,15 @@ 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.3/](https://arduino-esp8266.readthedocs.io/en/2.6.3/)
4040

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

44+
Also known as latest git or master branch.
45+
4446
- Install the current upstream Arduino IDE at the 1.8 level or later. The current version is on the [Arduino website](https://www.arduino.cc/en/main/software).
45-
- Go to Arduino directory
46-
- For Mac OS X, it is `Arduino.app` showing as the Arduino icon.
47-
This location may be your `~/Downloads`, `~/Desktop` or even `/Applications`.
48-
```bash
49-
cd <application-directory>/Arduino.app/Contents/Java
50-
```
51-
- For Linux, it is ~/Arduino by default.
52-
```bash
53-
cd ~/Arduino
54-
```
55-
- Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
56-
```bash
57-
cd hardware
58-
mkdir esp8266com
59-
cd esp8266com
60-
git clone https://github.com/esp8266/Arduino.git esp8266
61-
cd esp8266
62-
git submodule update --init
63-
```
64-
- Download binary tools (you need Python 2.7)
65-
```bash
66-
cd esp8266/tools
67-
python get.py
68-
```
69-
- Restart Arduino
47+
- Follow the [instructions in the documentation](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version).
7048

7149
### Using PlatformIO
7250

@@ -145,3 +123,13 @@ ESP8266 core files are licensed under LGPL.
145123
[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).
146124

147125
[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)