8000 Espressif master by Jason2866 · Pull Request #28 · Jason2866/arduino-esp32 · GitHub
[go: up one dir, main page]
Skip to content
< 8000 diff-file-filter>

Espressif master #28

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 9 commits into from
Sep 6, 2022
Merged

Espressif master #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4146d27
Enable configuring target variants (#7019)
kohlschuetter Aug 22, 2022
fdf8389
Update .gitignore (#7021)
kohlschuetter Aug 22, 2022
3ebb774
Update esptool to version 4.2.1 (#7127)
me-no-dev Aug 22, 2022
3f69bcf
Update get.py to support python 3.10+ (#7166)
me-no-dev Aug 22, 2022
d22bcb7
fixed names on the VID and PID for boards (#7144)
strid3r21 Aug 24, 2022
adb01cf
Compile error if CONFIG_FREERTOS_HZ != 1000 (#6955)
egnor Aug 26, 2022
01e2229
Adding u-blox NORA-W10 series (ESP32-S3) (#7191)
mazgch Aug 29, 2022
77065bf
Fixed espressif/esp-rainmaker#152 (#7171)
sanketwadekar Aug 29, 2022
074f315
Update PlatformIO build scripts (#7200)
valeros Sep 6, 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
Update esptool to version 4.2.1 (espressif#7127) 
* Update esptool to version 4.2.1

* Fix esptool for MacOS

* Esptool v4.2.1 for CI Platformio (espressif#7147)

to complete the test.

Co-authored-by: Jason2866 <24528715+Jason2866@users.noreply.github.com>
  • Loading branch information
@me-no-dev @Jason2866
me-no-dev and Jason2866 authored Aug 22, 2022
commit 3ebb774463181f457a735b5e75094e7b2deb2785
2 changes: 1 addition & 1 deletion .github/scripts/on-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ else
replace_script+="data['packages']['toolchain-xtensa-esp32']['optional']=True;"
replace_script+="data['packages']['toolchain-xtensa-esp32s3']['optional']=False;"
replace_script+="data['packages']['tool-esptoolpy']['owner']='tasmota';"
replace_script+="data['packages']['tool-esptoolpy']['version']='https://github.com/tasmota/esptool/releases/download/v3.3/esptool-3.3.zip';"
replace_script+="data['packages']['tool-esptoolpy']['version']='https://github.com/tasmota/esptool/releases/download/v4.2.1/esptool-4.2.1.zip';"
replace_script+="fp.seek(0);fp.truncate();json.dump(data, fp, indent=2);fp.close()"
python -c "$replace_script"

Expand Down
60 changes: 30 additions & 30 deletions package/package_esp32_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{
"packager": "esp32",
"name": "esptool_py",
"version": "3.3.0"
"version": "4.2.1"
},
{
"packager": "esp32",
Expand Down Expand Up @@ -297,56 +297,56 @@
},
{
"name": "esptool_py",
"version": "3.3.0",
"version": "4.2.1",
"systems": [
{
"host": "i686-mingw32",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-windows.zip",
"archiveFileName": "esptool-3.3-windows.zip",
"checksum": "SHA-256:55a1d7165414bf4dbd2bb16ca094e555d671958450f5d1536b457a518d2b15df",
"size": "7436864"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-windows.zip",
"archiveFileName": "esptool-4.2.1-windows.zip",
"checksum": "SHA-256:582560067bfbd9895f4862eb5fdf87558ddee5d4d30e7575c9b8bcb0dd60fd94",
"size": "6368279"
},
{
"host": "x86_64-mingw32",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-windows.zip",
"archiveFileName": "esptool-3.3-windows.zip",
"checksum": "SHA-256:55a1d7165414bf4dbd2bb16ca094e555d671958450f5d1536b457a518d2b15df",
"size": "7436864"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-windows.zip",
"archiveFileName": "esptool-4.2.1-windows.zip",
"checksum": "SHA-256:582560067bfbd9895f4862eb5fdf87558ddee5d4d30e7575c9b8bcb0dd60fd94",
"size": "6368279"
},
{
"host": "x86_64-apple-darwin",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-macos.tar.gz",
"archiveFileName": "esptool-3.3-macos.tar.gz",
"checksum": "SHA-256:3e5f7b521ae33c8c63f3b48efc909c08f37bef1a083c0eafa408312c09900afd",
"size": "6944975"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-macos.tar.gz",
"archiveFileName": "esptool-4.2.1-macos.tar.gz",
"checksum": "SHA-256:a984f7ad8bdb40c42d0d368bf4bb21b69a9587aed46b7b6d7de23ca58a3f150d",
"size": "5816598"
},
{
"host": "x86_64-pc-linux-gnu",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-linux.tar.gz",
"archiveFileName": "esptool-3.3-linux.tar.gz",
"checksum": "SHA-256:fbe91a49e5f5deca4881f5eed32e8903faf97bfd365fe2d0d1512b80bdb67f5e",
"size": "97026"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-linux.tar.gz",
"archiveFileName": "esptool-4.2.1-linux.tar.gz",
"checksum": "SHA-256:5a45fb77eb6574554ec2f45230d0b350f26f9c24ab3b6c13c4031ebdf72a34ab",
"size": "90123"
},
{
"host": "i686-pc-linux-gnu",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-linux.tar.gz",
"archiveFileName": "esptool-3.3-linux.tar.gz",
"checksum": "SHA-256:fbe91a49e5f5deca4881f5eed32e8903faf97bfd365fe2d0d1512b80bdb67f5e",
"size": "97026"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-linux.tar.gz",
"archiveFileName": "esptool-4.2.1-linux.tar.gz",
"checksum": "SHA-256:5a45fb77eb6574554ec2f45230d0b350f26f9c24ab3b6c13c4031ebdf72a34ab",
"size": "90123"
},
{
"host": "arm-linux-gnueabihf",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-linux.tar.gz",
"archiveFileName": "esptool-3.3-linux.tar.gz",
"checksum": "SHA-256:fbe91a49e5f5deca4881f5eed32e8903faf97bfd365fe2d0d1512b80bdb67f5e",
"size": "97026"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-linux.tar.gz",
"archiveFileName": "esptool-4.2.1-linux.tar.gz",
"checksum": "SHA-256:5a45fb77eb6574554ec2f45230d0b350f26f9c24ab3b6c13c4031ebdf72a34ab",
"size": "90123"
},
{
"host": "aarch64-linux-gnu",
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.2/esptool-3.3-linux.tar.gz",
"archiveFileName": "esptool-3.3-linux.tar.gz",
"checksum": "SHA-256:fbe91a49e5f5deca4881f5eed32e8903faf97bfd365fe2d0d1512b80bdb67f5e",
"size": "97026"
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-3.3-linux.tar.gz",
"archiveFileName": "esptool-4.2.1-linux.tar.gz",
"checksum": "SHA-256:5a45fb77eb6574554ec2f45230d0b350f26f9c24ab3b6c13c4031ebdf72a34ab",
"size": "90123"
}
]
},
Expand Down
0