Skip to content

Commit ffa856b

Browse files
committed
Merge remote-tracking branch 'upstream/master' into pr/8725
2 parents fc5654b + 1149650 commit ffa856b

File tree

81 files changed

+9457
-1998
lines changed

Some content is hidden

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

81 files changed

+9457
-1998
lines changed

Diff for: .github/workflows/docs_build.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
- release/*
88
paths:
99
- 'docs/**'
10-
- '.github/workflows/docs.yml'
10+
- '.github/workflows/docs_build.yml'
1111
pull_request:
1212
paths:
1313
- 'docs/**'
14-
- '.github/workflows/docs.yml'
14+
- '.github/workflows/docs_build.yml'
1515

1616
jobs:
1717

@@ -42,4 +42,3 @@ jobs:
4242
with:
4343
name: docs
4444
path: docs
45-

Diff for: .github/workflows/docs_deploy.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
name: Documentation Build and Production Deploy CI
22

33
on:
4+
release:
5+
types: [published]
46
push:
57
branches:
68
- release/*
9+
- master
710
paths:
811
- 'docs/**'
9-
- '.github/workflows/docs.yml'
12+
- '.github/workflows/docs_deploy.yml'
1013

1114
jobs:
1215

@@ -27,12 +30,11 @@ jobs:
2730
env:
2831
# Deploy to production server
2932
# DOCS_BUILD_DIR: "./docs/_build/"
30-
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }}
31-
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }}
33+
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
34+
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
3235
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
33-
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }}
34-
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
35-
# Deploy to preview server
36+
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
37+
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
3638
run: |
3739
sudo apt update
3840
sudo apt install python3-pip python3-setuptools

Diff for: .github/workflows/docs_preview.yml

-48
This file was deleted.

Diff for: CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ set(CORE_SRCS
5050
cores/esp32/Esp.cpp
5151
cores/esp32/FunctionalInterrupt.cpp
5252
cores/esp32/HardwareSerial.cpp
53+
cores/esp32/HEXBuilder.cpp
5354
cores/esp32/IPAddress.cpp
5455
cores/esp32/libb64/cdecode.c
5556
cores/esp32/libb64/cencode.c
5657
cores/esp32/main.cpp
5758
cores/esp32/MD5Builder.cpp
5859
cores/esp32/Print.cpp
60+
cores/esp32/SHA1Builder.cpp
5961
cores/esp32/stdlib_noniso.c
6062
cores/esp32/Stream.cpp
6163
cores/esp32/StreamString.cpp

Diff for: README.md

+4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ You can use the [Arduino-ESP32 Online Documentation](https://docs.espressif.com/
3636

3737
---
3838

39+
**APIs compatibility with ESP8266 and Arduino-CORE (Arduino.cc) is explained [here](https://docs.espressif.com/projects/arduino-esp32/en/latest/libraries.html#apis).**
40+
41+
---
42+
3943
* [Getting Started](https://docs.espressif.com/projects/arduino-esp32/en/latest/getting_started.html)
4044
* [Installing (Windows, Linux and macOS)](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html)
4145
* [Libraries](https://docs.espressif.com/projects/arduino-esp32/en/latest/libraries.html)

0 commit comments

Comments
 (0)