Skip to content

Commit ea89cba

Browse files
authored
Merge branch 'master' into master
2 parents c086949 + 625c3a6 commit ea89cba

File tree

858 files changed

+76325
-29519
lines changed

Some content is hidden

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

858 files changed

+76325
-29519
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
.DS_Store
22
tools/dist/
33
tools/xtensa-lx106-elf/
4-
tools/esptool/
54
tools/mkspiffs/
5+
tools/python/
66
package/versions/
77
exclude.txt
88
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
@@ -19,3 +22,4 @@ boards.local.txt
1922
*.gcno
2023
*.gcda
2124
*.o
25+
*.a

.gitmodules

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
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.git
7+
[submodule "libraries/SoftwareSerial"]
8+
path = libraries/SoftwareSerial
9+
url = https://github.com/plerup/espsoftwareserial.git
10+
[submodule "libraries/ESP8266SdFat"]
11+
path = libraries/ESP8266SdFat
12+
url = https://github.com/earlephilhower/ESP8266SdFat.git
13+
[submodule "tools/pyserial"]
14+
path = tools/pyserial
15+
url = https://github.com/pyserial/pyserial.git
16+
[submodule "tools/esptool"]
17+
path = tools/esptool
18+
url = https://github.com/espressif/esptool.git

.travis.yml

Lines changed: 125 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,133 @@
1-
sudo: false
21
language: bash
32
os: linux
43
dist: trusty
54

6-
matrix:
5+
git:
6+
depth: 1
7+
submodules: false
8+
9+
before_install:
10+
- git submodule update --init # no recursive update
11+
12+
cache:
13+
directories:
14+
- $HOME/astyle
15+
16+
stages:
17+
- build
18+
- deploy
19+
20+
jobs:
721
include:
8-
- env:
9-
- BUILD_TYPE=build
10-
- env:
11-
- BUILD_TYPE=platformio
12-
- env:
13-
- BUILD_TYPE=docs
14-
- env:
15-
- BUILD_TYPE=package
16-
- env:
17-
- BUILD_TYPE=host_tests
18-
19-
install:
20-
- pip install --user -r doc/requirements.txt
21-
22-
script:
23-
- $TRAVIS_BUILD_DIR/tests/common.sh
24-
25-
deploy:
26-
provider: releases
27-
prerelease: true
28-
skip_cleanup: true
29-
api_key:
30-
secure: A4FBmqyhlzy33oPeZVolg2Q/A3ZcJ3WnRQqQJ3NAPy+qGM5xcboOYtwcLL9vKaHZGfUB7lUP9QVZFGou1Wrmo9DnPvAoe3+XvCaDRGzVMxeIpu7UStbBD4Knbh98tlbMvZCXYRlT4VcusI9bMLK6UWw4sMdPislBh2FEfglTiag=
31-
file_glob: true
32-
file:
33-
- package/versions/$TRAVIS_TAG/esp8266-$TRAVIS_TAG.zip
34-
- package/versions/$TRAVIS_TAG/package_esp8266com_index.json
35-
on:
36-
repo: esp8266/Arduino
37-
tags: true
38-
condition: "$BUILD_TYPE = package"
22+
# Build stage. To save time, run all kinds of builds and tests in parallel.
23+
24+
- name: "Platformio (1)"
25+
stage: build
26+
script: $TRAVIS_BUILD_DIR/tests/platformio.sh
27+
env:
28+
- BUILD_PARITY=even
29+
- name: "Platformio (2)"
30+
stage: build
31+
script: $TRAVIS_BUILD_DIR/tests/platformio.sh
32+
env:
33+
- BUILD_PARITY=odd
34+
35+
- name: "Build (1)"
36+
stage: build
37+
script: $TRAVIS_BUILD_DIR/tests/build.sh
38+
env:
39+
- BUILD_PARITY=even
40+
- name: "Build (2)"
41+
stage: build
42+
script: $TRAVIS_BUILD_DIR/tests/build.sh
43+
env:
44+
- BUILD_PARITY=odd
45+
46+
- name: "Debug (1)"
47+
stage: build
48+
script: $TRAVIS_BUILD_DIR/tests/debug.sh
49+
env:
50+
- BUILD_PARITY=even
51+
- name: "Debug (2)"
52+
stage: build
53+
script: $TRAVIS_BUILD_DIR/tests/debug.sh
54+
env:
55+
- BUILD_PARITY=odd
56+
57+
- name: "Build IPv6 (1)"
58+
stage: build
59+
script: $TRAVIS_BUILD_DIR/tests/build6.sh
60+
env:
61+
- BUILD_PARITY=even
62+
- name: "Build IPv6 (2)"
63+
stage: build
64+
script: $TRAVIS_BUILD_DIR/tests/build6.sh
65+
env:
66+
- BUILD_PARITY=odd
67+
68+
- name: "Build lwIP-v1.4 (1)"
69+
stage: build
70+
script: $TRAVIS_BUILD_DIR/tests/build1.sh
71+
env:
72+
- BUILD_PARITY=even
73+
- name: "Build lwIP-v1.4 (2)"
74+
stage: build
75+
script: $TRAVIS_BUILD_DIR/tests/build1.sh
76+
env:
77+
- BUILD_PARITY=odd
78+
79+
- name: "Host tests"
80+
stage: build
81+
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
82+
install: sudo apt-get install valgrind lcov
83+
84+
- name: "Docs"
85+
stage: build
86+
script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
87+
install:
88+
- sudo apt-get install python3-pip
89+
- pip3 install --user -r doc/requirements.txt;
90+
91+
- name: "Style check"
92+
stage: build
93+
script: $TRAVIS_BUILD_DIR/tests/ci/style_check.sh
94+
install: tests/ci/install_astyle.sh
95+
96+
- name: "Boards"
97+
stage: build
98+
script: $TRAVIS_BUILD_DIR/tests/ci/build_boards.sh
99+
100+
# Deploy stage.
101+
# Here we build the package JSON (always) and do the deployments
102+
- name: "Package / deploy"
103+
stage: deploy
104+
script: tests/ci/build_package.sh
105+
env: BUILD_TYPE=package
106+
before_deploy: git submodule update --init
107+
deploy:
108+
# Create Github release, upload artifacts
109+
- provider: releases
110+
draft: true
111+
skip_cleanup: true
112+
api_key:
113+
secure: kYsxX/N21fwLSTLpbb0c96PnQHn1CIMqZstm02hfUhCX83FygWSh4vs3gzW28DMpjQMZ6vC4g+jtfosYU2tUhht/bynurDH4edpEyGeMyK+fzCI9pAr4JT0RbKQI84EC18ScpgP/UP0jTc1LJ+xl8UMwSiDE0mzHx7xJ4mMNQbA=
114+
file_glob: true
115+
tag_name: $TRAVIS_TAG
116+
target_commitish: $TRAVIS_COMMIT
117+
file:
118+
- package/versions/$TRAVIS_TAG/esp8266-$TRAVIS_TAG.zip
119+
- package/versions/$TRAVIS_TAG/package_esp8266com_index.json
120+
on:
121+
repo: esp8266/Arduino
122+
tags: true
123+
124+
# Update the package index URL to point to the new version
125+
- provider: script
126+
skip_cleanup: true
127+
script: bash package/deploy_package_index.sh
128+
on:
129+
repo: esp8266/Arduino
130+
tags: true
39131

40132
notifications:
41133
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.rst
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.rst
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

0 commit comments

Comments
 (0)