Skip to content

Commit 4e1b855

Browse files
authored
Merge pull request #1 from esp8266/master
sync from upstream
2 parents a5be2d6 + ea4720b commit 4e1b855

File tree

692 files changed

+74666
-14514
lines changed

Some content is hidden

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

692 files changed

+74666
-14514
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,16 @@ exclude.txt
88
tools/sdk/lib/liblwip_src.a
99
tools/sdk/lwip/src/build
1010
tools/sdk/lwip/src/liblwip_src.a
11+
tools/sdk/ld/backup
12+
tools/sdk/ld/eagle.app.v6.common.ld
1113

1214
*.pyc
15+
*.gch
16+
17+
boards.local.txt
18+
19+
*.gcov
20+
*.gcno
21+
*.gcda
22+
*.o
23+
*.a

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "lwip2"]
2+
path = tools/sdk/lwip2/builder
3+
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: 52 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,61 @@
11
sudo: false
22
language: bash
3-
os:
4-
- linux
3+
os: linux
4+
dist: trusty
55

6-
addons:
7-
apt:
8-
sources:
9-
- ubuntu-toolchain-r-test
10-
packages:
11-
- g++-4.8
6+
cache:
7+
directories:
8+
- $HOME/astyle
9+
10+
matrix:
11+
include:
12+
- env:
13+
- BUILD_TYPE=build_even
14+
- env:
15+
- BUILD_TYPE=build_odd
16+
- env:
17+
- BUILD_TYPE=platformio
18+
- env:
19+
- BUILD_TYPE=docs
20+
- env:
21+
- BUILD_TYPE=package
22+
- env:
23+
- BUILD_TYPE=host_tests
24+
- env:
25+
- BUILD_TYPE=style_check
26+
27+
install:
28+
- >
29+
[ "$BUILD_TYPE" = "docs" ] && {
30+
pip install --user -r doc/requirements.txt;
31+
} || true
32+
- >
33+
[ "$BUILD_TYPE" = "style_check" ] && {
34+
[ -f $HOME/astyle/build/gcc/bin/astyle ] || {
35+
wget -O astyle_3.1_linux.tar.gz https://sourceforge.net/projects/astyle/files/astyle/astyle%203.1/astyle_3.1_linux.tar.gz/download;
36+
tar -xf astyle_3.1_linux.tar.gz -C $HOME;
37+
make -C $HOME/astyle/build/gcc;
38+
}
39+
make -C $HOME/astyle/build/gcc prefix=$HOME install;
40+
} || true
1241
1342
script:
14-
- set -e
15-
- export CXX="g++-4.8" CC="gcc-4.8" GCOV="gcov-4.8"
16-
- echo -e "travis_fold:start:host_tests"
17-
- pushd $TRAVIS_BUILD_DIR/tests/host
18-
- make
19-
- make clean-objects
20-
- echo -e "travis_fold:end:host_tests"
21-
- echo -e "travis_fold:start:sketch_test_env_prepare"
22-
- popd
23-
- wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
24-
- tar xf arduino.tar.xz
25-
- mv arduino-nightly $HOME/arduino_ide
26-
- cd $HOME/arduino_ide/hardware
27-
- mkdir esp8266com
28-
- cd esp8266com
29-
- ln -s $TRAVIS_BUILD_DIR esp8266
30-
- cd esp8266/tools
31-
- python get.py
32-
- export PATH="$HOME/arduino_ide:$TRAVIS_BUILD_DIR/tools/xtensa-lx106-elf/bin:$PATH"
33-
- which arduino
34-
- cd $TRAVIS_BUILD_DIR
35-
- source tests/common.sh
36-
- install_libraries
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"
43+
- $TRAVIS_BUILD_DIR/tests/common.sh
4444

45-
after_success:
46-
- pushd $TRAVIS_BUILD_DIR/tests/host
47-
- bash <(curl -s https://codecov.io/bash) -X gcov
45+
deploy:
46+
provider: releases
47+
prerelease: true
48+
skip_cleanup: true
49+
api_key:
50+
secure: A4FBmqyhlzy33oPeZVolg2Q/A3ZcJ3WnRQqQJ3NAPy+qGM5xcboOYtwcLL9vKaHZGfUB7lUP9QVZFGou1Wrmo9DnPvAoe3+XvCaDRGzVMxeIpu7UStbBD4Knbh98tlbMvZCXYRlT4VcusI9bMLK6UWw4sMdPislBh2FEfglTiag=
51+
file_glob: true
52+
file:
53+
- package/versions/$TRAVIS_TAG/esp8266-$TRAVIS_TAG.zip
54+
- package/versions/$TRAVIS_TAG/package_esp8266com_index.json
55+
on:
56+
repo: esp8266/Arduino
57+
tags: true
58+
condition: "$BUILD_TYPE = package"
4859

4960
notifications:
5061
email:

ISSUE_TEMPLATE.md

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,65 @@
1+
----------------------------- Delete below -----------------------------
12

2-
Please fill the info fields, it helps to get you faster support ;)
3+
If your issue is a general question, starts similar to "How do I..", is related to 3rd party libs, or is related to hardware, please discuss at a community forum like esp8266.com.
34

4-
if you have a stack dump decode it:
5-
https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/stack_dump.md
5+
INSTRUCTIONS
6+
============
7+
If you do not follow these instructions, your issue may be dismissed.
68

7-
for better debug messages:
8-
https://github.com/esp8266/Arduino/blob/master/doc/Troubleshooting/debugging.md
9+
1. Follow the checklist under Basic Infos and fill in the [ ] spaces with an X.
10+
2. Fill in all the fields under Platform and Settings in IDE marked with [ ] (pick the correct option for you in each case, delete the others).
11+
3. If you haven't already done so, test your issue against current master branch (aka latest git), because it may have been already fixed.
12+
4. Describe your problem.
13+
5. If you have a STACK DUMP decode it:
914

10-
----------------------------- Remove above -----------------------------
15+
https://arduino-esp8266.readthedocs.io/en/latest/Troubleshooting/stack_dump.html
16+
17+
6. Include a Minimal Complete Reproducible Example sketch that shows your issue. Do not include your entire project, or a huge piece of code.
18+
7. Include debug messages:
19+
20+
https://arduino-esp8266.readthedocs.io/en/latest/Troubleshooting/debugging.html
21+
22+
8. Use markup (buttons above) and the Preview tab to check what the issue will look like.
23+
9. Delete these instructions from the above to the below marker lines before submitting this issue.
24+
25+
26+
----------------------------- Delete above -----------------------------
1127

1228
### Basic Infos
1329

14-
#### Hardware
15-
Hardware: ?ESP-12?
16-
Core Version: ?2.1.0-rc2?
30+
- [ ] This issue complies with the [issue POLICY doc](https://github.com/esp8266/Arduino/blob/master/POLICY.md).
31+
- [ ] I have read the documentation at [readthedocs](https://arduino-esp8266.readthedocs.io/en/latest) and the issue is not addressed there.
32+
- [ ] I have tested that the issue is present in current master branch (aka latest git).
33+
- [ ] I have searched the issue tracker for a similar issue.
34+
- [ ] If there is a stack dump, I have decoded it.
35+
- [ ] I have filled out all fields below.
1736

18-
### Description
37+
#### Platform
1938

20-
Problem description
39+
- Hardware: [ESP-12|ESP-01|ESP-07|ESP8285 device|other]
40+
- Core Version: [latest git hash or date]
41+
- Development Env: [Arduino IDE|Platformio|Make|other]
42+
- Operating System: [Windows|Ubuntu|MacOS]
2143

2244
### Settings in IDE
2345

24-
Module: ?Generic ESP8266 Module?
25-
Flash Size: ?4MB/1MB?
26-
CPU Frequency: ?80Mhz?
27-
Flash Mode: ?qio?
28-
Flash Frequency: ?40Mhz?
29-
Upload Using: ?OTA / SERIAL?
30-
Reset Method: ?ck / nodemcu?
46+
- Module: [Generic ESP8266 Module|Wemos D1 mini r2|Nodemcu|other]
47+
- Flash Mode: [qio|dio|other]
48+
- Flash Size: [4MB/1MB]
49+
- lwip Variant: [v1.4|v2 Lower Memory|Higher Bandwidth]
50+
- Reset Method: [ck|nodemcu]
51+
- Flash Frequency: [40Mhz]
52+
- CPU Frequency: [80Mhz|160MHz]
53+
- Upload Using: [OTA|SERIAL]
54+
- Upload Speed: [115200|other] (serial upload only)
3155

3256

33-
### Sketch
57+
### Problem Description
58+
59+
Detailed problem description goes here.
60+
61+
62+
### [MCVE](https://stackoverflow.com/help/mcve) Sketch
3463

3564
```cpp
3665

@@ -43,12 +72,13 @@ void setup() {
4372
void loop() {
4473

4574
}
75+
4676
```
4777

4878
### Debug Messages
4979

5080
```
51-
messages here
81+
Debug messages go here
5282
```
5383

5484

POLICY.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
This document describes rules that are in effect for this repository, meant for handling issues by contributors in the issue tracker and PRs.
2+
# Opening New Issues
3+
1. The issue tracker is precisely that: a tool to track issues in the core code, and not a discussion forum. Opening an issue means that a problem has been found in the core code, and that it should be addressed by a contributor.
4+
2. When opening an issue, a template is presented with fields to fill out. The requested information is important. If the template is ignored, or not enough info about the issue is provided, the issue may be closed due to lack of info. Example:
5+
* Using WifiMulti and FS crashes with error. Why? (no basic info, no IDE settings, no sketch provided)
6+
3. Questions of type "How do I..." or "Can you please help me with..." or "Can the ESP do..." won't be handled here. Such questions should be directed at a discussion forum, like esp8266.com or stackoverflow. All issues of this type will be closed with a simple reference to the policy. Example:
7+
* how do I connect to wifi
8+
* how do I connect two ESPs
9+
* can I send http data over a public network
10+
* my wiring/project/code doesn't work, help!
11+
4. Issues that are obviously user error, programming language errors, lack of knowledge or experience with the use semantics of the core libs, or similar, will be closed with a reference to the policy. Examples:
12+
* sketch crashes due to a char[] in it that is not null terminated
13+
* trying to use yield/delay, or libs that use yield/delay, from inside async callbacks
14+
* Use of new/malloc without matching delete/free (mem leak)
15+
5. Issues about topics already handled in the documentation will be closed in a similar manner. Example:
16+
* can't flash with error espcomm failed
17+
6. Issues must be provided with a minimalist sketch. Issues with an incomplete sketch, or a huge sketch, will be closed. Maximum effort must be put forth by the person opening the issue to reduce the relevant code that reproduces the issue, so that investigation can be taken up. MCVE is a must.
18+
7. Issues for unmerged PRs will be closed. If there is an issue with a PR, the explanation should be added to the PR itself.
19+
8. Issues with accompanied investigation that shows the root of the problem should be given priority
20+
9. Duplicate issues will be closed with a reference to the original
21+
22+
# Triaging
23+
1. Any contributor of the project can participate in the triaging process, if he/she chooses to do so
24+
2. An issue that needs to be closed, either due to not complying with this policy, or for other reasons, should be closed by a contributor
25+
3. Issues that are accepted should be marked with appropriate labels, e.g.: component: xyz
26+
4. If an issue is deemed to require specialized knowledge (e.g.: TLS, HTTP parser, SDK integration, etc), contributor(s) relevant to the affected code should be /cc’ed, as this can help grab attention
27+
5. Severe issues should be assigned to the current milestone (i.e.: the next version to be released), or the milestone following. It is ok to push back issues depending on available resources.
28+
6. Issues that could impact functionality for many users should be considered severe.
29+
7. Issues caused by the SDK or chip should not be marked severe, as there usually isn’t much to be done. Common sense should be applied when deciding. Such issues should be documented in a KID (Known Issues Document), possibly on the Wiki, for reference by users. Example:
30+
* ARP issue
31+
* Extra channel change beacon announced by the SoftAP
32+
* Wakeup ROM bug in the ESP chip
33+
8. Issues with feature requests should be discussed for viability/desirability. Example:
34+
* Support for new board. If the new board is not widely used, doesn’t have a manufacturer webpage, etc, then it isn’t desirable to support it. If the new board is essentially a duplicate of another, it isn’t desirable to duplicate the existing one.
35+
9. Feature requests or changes that are meant to address a very specific/limited use case, especially if at the expense of increased code complexity, may be denied, or may be required to be redesigned, generalized, or simplified
36+
10. Feature requests that are not accompanied by a PR:
37+
* could be closed immediately (denied)
38+
* could be closed after some predetermined period of time (left as candidate for somebody to pick up)
39+
* could be deemed interesting enough to work on, but without a specific project or target, and hence accumulated in a long-term feature request list. Such feature requests will in general not be targeted for a deadline or release.
40+
11. In some cases, feedback may be requested from the issue reporter, either as additional info for clarification, additional testing, or other. If no feedback is provided after 30 days, the issue may be closed by a contributor.
41+
42+
# Compatibility
43+
1. Compatibility with the Arduino build system is first priority. Compatibility with PlatformIO and make are also maintained, but are second priority.
44+
2. Feature requests should consider compatibility with Arduino
45+
* ESP-specific APIs should be added with care, and should be marked as such (Example: ESP8266WiFi)
46+
* APIs of common libraries should maintain compatibility (Example: Wire, SPI, Servo)
47+
* ESP-specific extensions to compatible APIs are ok, especially if required to fully use certain peripherals, but such functions should be clearly marked as ESP-specific
48+
3. When making changes that are likely to impact PlatformIO or make, relevant people should be notified. Check whether some corresponding changes are needed on the build system side. When an issue related to one of these build systems is reported, redirect the issue reporter to the respective issue tracker.
49+
4. The core libs are implemented as a wrapper layer over the Espressif SDK. Due to the requirements and limitations imposed by the SDK, there are inherent differences between the behavior of this core and the standard Arduino core (Example: using long delay()s is not allowed here). Compatibility can’t be maintained in such cases, and differences should be clearly documented.
50+
51+
# Pull requests
52+
1. All pull requests should undergo peer review by at least one contributor other than the creator
53+
2. All pull requests should consider updates to the documentation
54+
3. All pull requests should consider updates to regression tests, where possible
55+
4. Pull requests that address an outstanding issue, particularly an issue deemed to be severe, should be given priority
56+
5. If a PR is accepted, then it should undergo review and updated based on the feedback provided, then merged
57+
6. Pull requests that don't meet the above will be denied and closed
58+
59+
# Other
60+
A table should be maintained for relating maintainers and components. When triaging, this is essential to figure out if someone in particular should be consulted about specific changes.
61+
62+
A stable release cadence should be established, e.g.: every 6 months.
63+
64+
Regression testing should be revisited and streamlined with the release process. Running regression tests should be done before merging a PR to reduce overhead for a release.
65+
66+
67+

0 commit comments

Comments
 (0)