10000 updates from upstream by Jason2866 · Pull Request #134 · tasmota/arduino-esp32 · GitHub
[go: up one dir, main page]
Skip to content

updates from upstream #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 26, 2022
Merged

updates from upstream #134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4692772
LittleFs is working with C3
Jason2866 Apr 23, 2022
3cfeb3b
Delete .skip.esp32c3
Jason2866 Apr 23, 2022
f0636d5
Add support for extra flash images (#6625)
valeros Apr 26, 2022
22c5157
publish.yml: Remove a leftover parenthesis that was making the workfl…
Ouss4 Apr 26, 2022
1aa1610
Enable LittleFs sketches for C3 (#6618)
Jason2866 Apr 26, 2022
0a1ba74
Update LittleFS PlatformIO example (#6617)
Jason2866 Apr 26, 2022
d8a99ed
Added RainMaker support on Arduino IDE for ESP32-C3/S2/S3 (#6598)
pedrominatel Apr 26, 2022
f3bdfb3
Touch change to init only selected GPIO. (#6609)
P-R-O-C-H-Y Apr 26, 2022
b88a70a
Allow BluetoothSerial::connect() with specified channel and more opti…
ferbar Apr 26, 2022
d7ffd57
Fixes stream load memory leak in WifiSecureClient for SSL CACert, Cer…
beeboopx Apr 26, 2022
a9d33de
Call i2c_set_timeout in i2cSetClock (#6537)
PaulZC Apr 26, 2022
823fe77
Uniform behaviour of WiFiClientSecure and WiFiClient setTimeout() (#6…
gonzabrusco Apr 26, 2022
0dd517d
enh(log) salvage TAG from ESP_IDF log-statements > (#6567)
ankostis Apr 26, 2022
adfaaec
add AirM2M_CORE_ESP32C3 board (#6613)
dreamcmi Apr 26, 2022
89e9178
Merge branch 'espressif:master' into patch-3
Jason2866 Apr 26, 2022
5fa0c20
Added Unexpected Maker Reflow Master Pro (UM RMP) board (#6630)
UnexpectedMaker Apr 26, 2022
83ad7d7
Merge branch 'espressif:master' into patch-3
Jason2866 Apr 26, 2022
a82c99d
Tasmota changes (#24)
Jason2866 Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add support for extra flash images (espressif#6625) 
This PR adds support for uploading additional flash images (e.g. Adafruit Tiny UF2 bootloader) specified in board manifests.

Additionally, the PR switches the PlatformIO CI script to the upstream version of the ESP32 dev-platform (basically reverts changes introduced in espressif#5387 as they are no longer required).
  • Loading branch information
@valeros
valeros authored Apr 26, 2022
commit f0636d515f37d89c3d750151cf4e8f9bf10f3ea8
2 changes: 1 addition & 1 deletion .github/scripts/install-platformio-esp32.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

export PLATFORMIO_ESP32_PATH="$HOME/.platformio/packages/framework-arduinoespressif32"
PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master"
PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"

TOOLCHAIN_VERSION="8.4.0+2021r2-patch3"
ESPTOOLPY_VERSION="~1.30100.0"
Expand Down
8 changes: 7 additions & 1 deletion tools/platformio-build-esp32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py

from os.path import abspath, isdir, isfile, join, basename
from os.path import abspath, isdir, isfile, join

from SCons.Script import DefaultEnvironment

Expand Down Expand Up @@ -331,6 +331,12 @@
("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"))
]
+ [
(offset, join(FRAMEWORK_DIR, img))
8000 for offset, img in env.BoardConfig().get(
"upload.arduino.flash_extra_images", []
)
],
)

#
Expand Down
8 changes: 7 additions & 1 deletion tools/platformio-build-esp32c3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py

from os.path import abspath, isdir, isfile, join, basename
from os.path import abspath, isdir, isfile, join

from SCons.Script import DefaultEnvironment

Expand Down Expand Up @@ -324,6 +324,12 @@
("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"))
]
+ [
(offset, join(FRAMEWORK_ 8000 DIR, img))
for offset, img in env.BoardConfig().get(
"upload.arduino.flash_extra_images", []
)
],
)

#
Expand Down
8 changes: 7 additions & 1 deletion tools/platformio-build-esp32s2.py
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py

from os.path import abspath, isdir, isfile, join, basename
from os.path import abspath, isdir, isfile, join

from SCons.Script import DefaultEnvironment

Expand Down Expand Up @@ -326,6 +326,12 @@
("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"))
]
+ [
(offset, join(FRAMEWORK_DIR, img))
for offset, img in env.BoardConfig().get(
"upload.arduino.flash_extra_images", []
)
],
)

#
Expand Down
8 changes: 7 additions & 1 deletion tools/platformio-build-esp32s3.py
View file
Open in desktop
54A4
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py

from os.path import abspath, isdir, isfile, join, basename
from os.path import abspath, isdir, isfile, join

from SCons.Script import DefaultEnvironment

Expand Down Expand Up @@ -343,6 +343,12 @@
("0x8000", join(env.subst("$BUILD_DIR"), "partitions.bin")),
("0xe000", join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"))
]
+ [
(offset, join(FRAMEWORK_DIR, img))
for offset, img in env.BoardConfig().get(
"upload.arduino.flash_extra_images", []
)
],
)

#
Expand Down
0