Skip to content

Commit 061ea26

Browse files
authored
Merge branch 'master' into fix-blescan
2 parents 7073e9a + 3491ca7 commit 061ea26

File tree

124 files changed

+3565
-427
lines changed

Some content is hidden

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

124 files changed

+3565
-427
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ echo "Installing Platform ESP32 ..."
1212
python -m platformio platform install https://github.com/platformio/platform-espressif32.git > /dev/null 2>&1
1313

1414
echo "Replacing the framework version ..."
15-
if [[ "$OSTYPE" == "darwin"* ]]; then
16-
sed 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' "$HOME/.platformio/platforms/espressif32/platform.json" > "platform.json"
17-
mv -f "platform.json" "$HOME/.platformio/platforms/espressif32/platform.json"
18-
else
19-
sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' "$HOME/.platformio/platforms/espressif32/platform.json"
20-
fi
15+
python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif32']['version'] = '*'; del data['packages']['framework-arduinoespressif32']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
2116

2217
if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then
2318
echo "Linking Core..."
2419
ln -s $GITHUB_WORKSPACE "$PLATFORMIO_ESP32_PATH"
2520
else
2621
echo "Cloning Core Repository ..."
27-
git clone https://github.com/espressif/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
22+
git clone --recursive https://github.com/espressif/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
2823
fi
2924

3025
echo "PlatformIO for ESP32 has been installed"

.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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ set(LIBRARY_SRCS
6060
libraries/SPI/src/SPI.cpp
6161
libraries/Ticker/src/Ticker.cpp
6262
libraries/Update/src/Updater.cpp
63+
libraries/Update/src/HttpsOTAUpdate.cpp
6364
libraries/WebServer/src/WebServer.cpp
6465
libraries/WebServer/src/Parsing.cpp
6566
libraries/WebServer/src/detail/mimetable.cpp
@@ -206,8 +207,8 @@ set(COMPONENT_ADD_INCLUDEDIRS
206207

207208
set(COMPONENT_PRIV_INCLUDEDIRS cores/esp32/libb64)
208209

209-
set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet esp_adc_cal)
210-
set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt)
210+
set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet esp_adc_cal wifi_provisioning)
211+
set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt esp_http_client esp_https_ota)
211212

212213
register_component()
213214

Kconfig.projbuild

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ config ARDUINO_UDP_RUNNING_CORE
8282
default 1 if ARDUINO_UDP_RUN_CORE1
8383
default -1 if ARDUINO_UDP_RUN_NO_AFFINITY
8484

85+
config CONFIG_ARDUINO_UDP_TASK_PRIORITY
86+
int
87+
default 3
8588

8689
config DISABLE_HAL_LOCKS
8790
bool "Disable mutex locks for HAL"

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
- [ESP32Dev Board PINMAP](#esp32dev-board-pinmap)
1212

1313
### Development Status
14-
[Latest stable release ![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.svg?style=plastic) ![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) ![Downloads](https://img.shields.io/github/downloads/espressif/arduino-esp32/latest/total.svg?style=plastic)
1514

16-
[Latest development release ![Development Version](https://img.shields.io/github/release/espressif/arduino-esp32/all.svg?style=plastic) ![Development Date](https://img.shields.io/github/release-date-pre/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) ![Downloads](https://img.shields.io/github/downloads-pre/espressif/arduino-esp32/latest/total.svg?style=plastic)
15+
Latest Stable Release [![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Downloads](https://img.shields.io/github/downloads/espressif/arduino-esp32/latest/total.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/)
16+
17+
Latest Development Release [![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Downloads](https://img.shields.io/github/downloads/espressif/arduino-esp32/latest/total.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/)
18+
1719

1820
### Installation Instructions
1921
- Using Arduino IDE Boards Manager (preferred)

0 commit comments

Comments
 (0)