Skip to content

Commit 7a9fd45

Browse files
authored
Merge branch 'espressif:master' into i2s_fix
2 parents 26ac979 + a5f03a8 commit 7a9fd45

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v2.0.5
4445
- v2.0.4
4546
- v2.0.3
4647
- v2.0.2

docs/source/esp-idf_component.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Installation
3737
cd ../.. && \
3838
idf.py menuconfig
3939
40+
.. note:: If you use Arduino with ESP-IDF often, you can place the arduino folder into global components folder.
41+
4042
Configuration
4143
-------------
4244

docs/source/guides/core_debug.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,4 @@ Then simply build the libs for all SoCs or one specific SoC. Note that building
3535
- ``esp32s3``
3636
- Example: ``./build.sh -t esp32``
3737
- A wrong format or non-existing SoC will result in the error sed: can't read sdkconfig: No such file or directory
38-
- **Option 3**: Build for multiple SoCs (not all) - simply write them down separated with space: ``./build.sh -t <soc1> <soc2> <soc3>``
39-
40-
- Example: ``./build.sh -t esp32 esp32-c3``
4138

package/package_esp32_index.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
},
344344
{
345345
"host": "aarch64-linux-gnu",
346-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-3.3-linux.tar.gz",
346+
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.4/esptool-4.2.1-linux.tar.gz",
347347
"archiveFileName": "esptool-4.2.1-linux.tar.gz",
348348
"checksum": "SHA-256:5a45fb77eb6574554ec2f45230d0b350f26f9c24ab3b6c13c4031ebdf72a34ab",
349349
"size": "90123"

0 commit comments

Comments
 (0)