Skip to content

Commit 548d702

Browse files
authored
Merge branch 'master' into wifi_mesh_update_2.2
2 parents 1dcd4c4 + 372a3ec commit 548d702

File tree

225 files changed

+7174
-2740
lines changed

Some content is hidden

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

225 files changed

+7174
-2740
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919
[submodule "tools/esptool"]
2020
path = tools/esptool
2121
url = https://github.com/espressif/esptool.git
22+
[submodule "tools/sdk/uzlib"]
23+
path = tools/sdk/uzlib
24+
url = https://github.com/earlephilhower/uzlib.git

.travis.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ jobs:
2424
- name: "Platformio (1)"
2525
stage: build
2626
script: $TRAVIS_BUILD_DIR/tests/platformio.sh
27+
install:
28+
- sudo apt-get install python3-pip python3-setuptools
2729
env:
2830
- BUILD_PARITY=even
2931
- name: "Platformio (2)"
3032
stage: build
3133
script: $TRAVIS_BUILD_DIR/tests/platformio.sh
34+
install:
35+
- sudo apt-get install python3-pip python3-setuptools
3236
env:
3337
- BUILD_PARITY=odd
3438

@@ -76,6 +80,18 @@ jobs:
7680
env:
7781
- BUILD_PARITY=odd
7882

83+
- name: "Mac OSX can build sketches"
84+
os: osx
85+
stage: build
86+
script: $TRAVIS_BUILD_DIR/tests/build.sh
87+
env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
88+
89+
- name: "Windows can build sketches"
90+
os: windows
91+
stage: build
92+
script: $TRAVIS_BUILD_DIR/tests/build.sh
93+
env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
94+
7995
- name: "Host tests"
8096
stage: build
8197
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
@@ -98,18 +114,6 @@ jobs:
98114
stage: build
99115
script: $TRAVIS_BUILD_DIR/tests/buildm.sh
100116

101-
- name: "Mac OSX can build sketches"
102-
os: osx
103-
stage: build
104-
script: $TRAVIS_BUILD_DIR/tests/build.sh
105-
env: MACOSX=1 BUILD_PARITY=custom mod=500 rem=1
106-
107-
- name: "Windows can build sketches"
108-
os: windows
109-
stage: build
110-
script: $TRAVIS_BUILD_DIR/tests/build.sh
111-
env: WINDOWS=1 BUILD_PARITY=custom mod=500 rem=1
112-
113117
- name: "Boards"
114118
stage: build
115119
script: $TRAVIS_BUILD_DIR/tests/ci/build_boards.sh

README.md

Lines changed: 15 additions & 3 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

@@ -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.3/](https://arduino-esp8266.readthedocs.io/en/2.6.3/)
4040

4141
### Using git version
4242
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
@@ -106,7 +106,7 @@ Arduino IDE is developed and maintained by the Arduino team. The IDE is licensed
106106

107107
ESP8266 core includes an xtensa gcc toolchain, which is also under GPL.
108108

109-
Esptool written by Christian Klippel is licensed under GPLv2, currently maintained by Ivan Grokhotkov: https://github.com/igrr/esptool-ck.
109+
Esptool.py was initially created by Fredrik Ahlberg (@themadinventor, @kongo), and is currently maintained by Angus Gratton (@projectgus) under GPL 2.0 license.
110110

111111
Espressif SDK included in this build is under Espressif MIT License.
112112

@@ -123,3 +123,15 @@ 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+
[uzlib](https://github.com/pfalcon/uzlib) library written and (c) 2014-2018 Paul Sokolovsky, licensed under the ZLib license (https://www.zlib.net/zlib_license.html). uzlib is based on: tinf library by Joergen Ibsen (Deflate decompression); Deflate Static Huffman tree routines by Simon Tatham; LZ77 compressor by Paul Sokolovsky; with library integrated and maintained by Paul Sokolovsky.
128+
129+
### Other useful links ###
130+
131+
[Toolchain repo](https://github.com/earlephilhower/esp-quick-toolchain)
132+
133+
[Lwip link layer repo](https://github.com/d-a-v/esp82xx-nonos-linklayer)
134+
135+
[SoftwareSerial repo](https://github.com/plerup/espsoftwareserial)
136+
137+
[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)