Skip to content
This repository was archived by the owner on Jul 9, 2024. It is now read-only.

Commit 9f0a703

Browse files
committed
Merge remote-tracking branch 'upstream/master' into new-master
2 parents 0a4ea5a + 4d98cea commit 9f0a703

File tree

296 files changed

+17748
-4667
lines changed

Some content is hidden

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

296 files changed

+17748
-4667
lines changed

.github/scripts/install-platformio-esp32.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "Installing PlatformIO ..."
99
pip install -U https://github.com/platformio/platformio/archive/develop.zip > /dev/null 2>&1
1010

1111
echo "Installing Platform ESP32 ..."
12-
python -m platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage > /dev/null 2>&1
12+
python -m platformio platform install https://github.com/platformio/platform-espressif32.git > /dev/null 2>&1
1313

1414
echo "Replacing the framework version ..."
1515
if [[ "$OSTYPE" == "darwin"* ]]; then

.github/workflows/push.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v1
22+
- uses: actions/setup-python@v1
23+
with:
24+
python-version: '3.x'
2225
- name: Build Sketches
2326
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} 15
2427

@@ -32,6 +35,9 @@ jobs:
3235

3336
steps:
3437
- uses: actions/checkout@v1
38+
- uses: actions/setup-python@v1
39+
with:
40+
python-version: '3.x'
3541
- name: Build Sketches
3642
run: bash ./.github/scripts/on-push.sh
3743

@@ -45,5 +51,8 @@ jobs:
4551

4652
steps:
4753
- uses: actions/checkout@v1
54+
- uses: actions/setup-python@v1
55+
with:
56+
python-version: '3.x'
4857
- name: Build Sketches
4958
run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@master
14+
- uses: actions/setup-python@v1
15+
with:
16+
python-version: '3.x'
1417
- name: Build Release
1518
env:
1619
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ tools/mkspiffs/mkspiffs.exe
1212
.vs/
1313
__vm/
1414
*.vcxproj*
15+
.vscode/

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ set(LIBRARY_SRCS
7171
libraries/WiFi/src/WiFi.cpp
7272
libraries/WiFi/src/WiFiGeneric.cpp
7373
libraries/WiFi/src/WiFiMulti.cpp
74+
libraries/WiFi/src/WiFiProv.cpp
7475
libraries/WiFi/src/WiFiScan.cpp
7576
libraries/WiFi/src/WiFiServer.cpp
7677
libraries/WiFi/src/WiFiSTA.cpp
@@ -205,7 +206,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
205206

206207
set(COMPONENT_PRIV_INCLUDEDIRS cores/esp32/libb64)
207208

208-
set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet)
209+
set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet esp_adc_cal wifi_provisioning)
209210
set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt)
210211

211212
register_component()

0 commit comments

Comments
 (0)