Skip to content

Commit c1fda76

Browse files
authored
Merge branch 'master' into NanoC6
2 parents d944ead + e54fb9e commit c1fda76

File tree

18 files changed

+425
-46
lines changed

18 files changed

+425
-46
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+
- v3.0.2
4445
- v3.0.1
4546
- v3.0.0
4647
- v2.0.17

.github/workflows/tests_results.yml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ jobs:
2222
statuses: write
2323
checks: write
2424
pull-requests: write
25+
contents: write
2526
steps:
27+
- uses: actions/checkout@v4
28+
with:
29+
ref: gh-pages
30+
2631
- name: Download and Extract Artifacts
2732
uses: dawidd6/action-download-artifact@v6
2833
with:
@@ -35,15 +40,18 @@ jobs:
3540
original_action=$(cat ./artifacts/parent-artifacts/action.txt)
3641
original_sha=$(cat ./artifacts/parent-artifacts/sha.txt)
3742
original_ref=$(cat ./artifacts/parent-artifacts/ref.txt)
43+
original_conclusion=$(cat ./artifacts/parent-artifacts/conclusion.txt)
3844
echo "original_event=$original_event" >> $GITHUB_ENV
3945
echo "original_action=$original_action" >> $GITHUB_ENV
4046
echo "original_sha=$original_sha" >> $GITHUB_ENV
4147
echo "original_ref=$original_ref" >> $GITHUB_ENV
48+
echo "original_conclusion=$original_conclusion" >> $GITHUB_ENV
4249
4350
echo "original_event = $original_event"
4451
echo "original_action = $original_action"
4552
echo "original_sha = $original_sha"
4653
echo "original_ref = $original_ref"
54+
echo "original_conclusion = $original_conclusion"
4755
4856
- name: Publish Unit Test Results
4957
uses: EnricoMi/publish-unit-test-result-action@v2
@@ -54,6 +62,10 @@ jobs:
5462
files: ./artifacts/**/*.xml
5563
action_fail: true
5664

65+
- name: Fail if tests failed
66+
if: ${{ env.original_conclusion == 'failure' || env.original_conclusion == 'timed_out' || github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'timed_out' }}
67+
run: exit 1
68+
5769
- name: Clean up caches
5870
if: always()
5971
uses: actions/github-script@v7
@@ -102,7 +114,33 @@ jobs:
102114
repo: repo,
103115
sha: sha,
104116
state: '${{ job.status }}',
105-
description: '${{ job.status }}' ? 'Runtime tests successful' : 'Runtime tests failed',
117+
description: '${{ job.status }}' == 'success' ? 'Runtime tests successful' : 'Runtime tests failed',
106118
target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
107119
})).data;
108120
core.info(`${name} is ${state}`);
121+
122+
- name: Create output folder
123+
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
124+
run: |
125+
rm -rf artifacts
126+
mkdir -p runtime-tests-results
127+
128+
- name: Generate badge
129+
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
130+
uses: jaywcjlove/generated-badges@v1.0.13
131+
with:
132+
label: Runtime Tests
133+
status: ${{ job.status }}
134+
output: runtime-tests-results/badge.svg
135+
color: ${{ job.status == 'success' && 'green' || 'red' }}
136+
137+
- name: Push badge
138+
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }}
139+
run: |
140+
git config user.name "github-actions[bot]"
141+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
142+
if [[ `git status --porcelain` ]]; then
143+
git add --all
144+
git commit -m "Updated runtime tests badge"
145+
git push origin HEAD:gh-pages
146+
fi

.github/workflows/tests_wokwi.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ jobs:
9292
exit 1
9393
fi
9494
95+
conclusion="${{ github.event.workflow_run.conclusion }}"
96+
printf "$conclusion" >> artifacts/conclusion.txt
97+
printf "\nConclusion = "
98+
cat artifacts/conclusion.txt
99+
95100
echo "pr_num=$pr_num" >> $GITHUB_OUTPUT
96101
echo "ref=$ref" >> $GITHUB_OUTPUT
97102

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
22

3-
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/actions/workflows/tests.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/tests.yml?query=event%3Aschedule)
3+
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
44

55
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
66

boards.txt

Lines changed: 176 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,6 +2413,7 @@ esp32wroverkit.menu.FlashSize.2M.build.flash_size=2MB
24132413
esp32wroverkit.menu.FlashSize.2M.build.partitions=minimal
24142414
esp32wroverkit.menu.FlashSize.16M=16MB (128Mb)
24152415
esp32wroverkit.menu.FlashSize.16M.build.flash_size=16MB
2416+
esp32wroverkit.menu.FlashSize.16M.build.partitions=default_16MB
24162417

24172418
esp32wroverkit.menu.PSRAM.enabled=Enabled
24182419
esp32wroverkit.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw
@@ -2426,6 +2427,9 @@ esp32wroverkit.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
24262427
esp32wroverkit.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
24272428
esp32wroverkit.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
24282429
esp32wroverkit.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
2430+
esp32wroverkit.menu.PartitionScheme.default_16MB=16M with spiffs (6.25MB APP/3.43MB SPIFFS)
2431+
esp32wroverkit.menu.PartitionScheme.default_16MB.build.partitions=default_16MB
2432+
esp32wroverkit.menu.PartitionScheme.default_16MB.upload.maximum_size=6553600
24292433
esp32wroverkit.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
24302434
esp32wroverkit.menu.PartitionScheme.minimal.build.partitions=minimal
24312435
esp32wroverkit.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
@@ -8749,6 +8753,174 @@ lolin_s3_mini.menu.EraseFlash.all.upload.erase_cmd=-e
87498753

87508754
##############################################################
87518755

8756+
lolin_s3_mini_pro.name=LOLIN S3 Mini Pro
8757+
lolin_s3_mini_pro.vid.0=0x303a
8758+
lolin_s3_mini_pro.pid.0=0x8216
8759+
8760+
lolin_s3_mini_pro.bootloader.tool=esptool_py
8761+
lolin_s3_mini_pro.bootloader.tool.default=esptool_py
8762+
8763+
lolin_s3_mini_pro.upload.tool=esptool_py
8764+
lolin_s3_mini_pro.upload.tool.default=esptool_py
8765+
lolin_s3_mini_pro.upload.tool.network=esp_ota
8766+
8767+
lolin_s3_mini_pro.upload.maximum_size=1310720
8768+
lolin_s3_mini_pro.upload.maximum_data_size=327680
8769+
lolin_s3_mini_pro.upload.flags=
8770+
lolin_s3_mini_pro.upload.extra_flags=
8771+
lolin_s3_mini_pro.upload.use_1200bps_touch=false
8772+
lolin_s3_mini_pro.upload.wait_for_upload_port=false
8773+
8774+
lolin_s3_mini_pro.serial.disableDTR=false
8775+
lolin_s3_mini_pro.serial.disableRTS=false
8776+
8777+
lolin_s3_mini_pro.build.tarch=xtensa
8778+
lolin_s3_mini_pro.build.bootloader_addr=0x0
8779+
lolin_s3_mini_pro.build.target=esp32s3
8780+
lolin_s3_mini_pro.build.mcu=esp32s3
8781+
lolin_s3_mini_pro.build.core=esp32
8782+
lolin_s3_mini_pro.build.variant=lolin_s3_mini_pro
8783+
lolin_s3_mini_pro.build.board=LOLIN_S3_MINI_PRO
8784+
8785+
lolin_s3_mini_pro.build.usb_mode=1
8786+
lolin_s3_mini_pro.build.cdc_on_boot=0
8787+
lolin_s3_mini_pro.build.msc_on_boot=0
8788+
lolin_s3_mini_pro.build.dfu_on_boot=0
8789+
lolin_s3_mini_pro.build.f_cpu=240000000L
8790+
lolin_s3_mini_pro.build.flash_size=4MB
8791+
lolin_s3_mini_pro.build.flash_freq=80m
8792+
lolin_s3_mini_pro.build.flash_mode=dio
8793+
lolin_s3_mini_pro.build.boot=qio
8794+
lolin_s3_mini_pro.build.boot_freq=80m
8795+
lolin_s3_mini_pro.build.partitions=default
8796+
lolin_s3_mini_pro.build.defines=-DBOARD_HAS_PSRAM
8797+
lolin_s3_mini_pro.build.loop_core=
8798+
lolin_s3_mini_pro.build.event_core=
8799+
lolin_s3_mini_pro.build.psram_type=qspi
8800+
lolin_s3_mini_pro.build.memory_type={build.boot}_{build.psram_type}
8801+
8802+
lolin_s3_mini_pro.menu.FlashMode.qio=QIO 80MHz
8803+
lolin_s3_mini_pro.menu.FlashMode.qio.build.flash_mode=dio
8804+
lolin_s3_mini_pro.menu.FlashMode.qio.build.boot=qio
8805+
lolin_s3_mini_pro.menu.FlashMode.qio.build.boot_freq=80m
8806+
lolin_s3_mini_pro.menu.FlashMode.qio.build.flash_freq=80m
8807+
lolin_s3_mini_pro.menu.FlashMode.qio120=QIO 120MHz
8808+
lolin_s3_mini_pro.menu.FlashMode.qio120.build.flash_mode=dio
8809+
lolin_s3_mini_pro.menu.FlashMode.qio120.build.boot=qio
8810+
lolin_s3_mini_pro.menu.FlashMode.qio120.build.boot_freq=120m
8811+
lolin_s3_mini_pro.menu.FlashMode.qio120.build.flash_freq=80m
8812+
8813+
lolin_s3_mini_pro.menu.LoopCore.1=Core 1
8814+
lolin_s3_mini_pro.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
8815+
lolin_s3_mini_pro.menu.LoopCore.0=Core 0
8816+
lolin_s3_mini_pro.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
8817+
8818+
lolin_s3_mini_pro.menu.EventsCore.1=Core 1
8819+
lolin_s3_mini_pro.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
8820+
lolin_s3_mini_pro.menu.EventsCore.0=Core 0
8821+
lolin_s3_mini_pro.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
8822+
8823+
lolin_s3_mini_pro.menu.USBMode.hwcdc=Hardware CDC and JTAG
8824+
lolin_s3_mini_pro.menu.USBMode.hwcdc.build.usb_mode=1
8825+
lolin_s3_mini_pro.menu.USBMode.default=USB-OTG (TinyUSB)
8826+
lolin_s3_mini_pro.menu.USBMode.default.build.usb_mode=0
8827+
8828+
lolin_s3_mini_pro.menu.CDCOnBoot.default=Disabled
8829+
lolin_s3_mini_pro.menu.CDCOnBoot.default.build.cdc_on_boot=0
8830+
lolin_s3_mini_pro.menu.CDCOnBoot.cdc=Enabled
8831+
lolin_s3_mini_pro.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
8832+
8833+
lolin_s3_mini_pro.menu.MSCOnBoot.default=Disabled
8834+
lolin_s3_mini_pro.menu.MSCOnBoot.default.build.msc_on_boot=0
8835+
lolin_s3_mini_pro.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
8836+
lolin_s3_mini_pro.menu.MSCOnBoot.msc.build.msc_on_boot=1
8837+
8838+
lolin_s3_mini_pro.menu.DFUOnBoot.default=Disabled
8839+
lolin_s3_mini_pro.menu.DFUOnBoot.default.build.dfu_on_boot=0
8840+
lolin_s3_mini_pro.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
8841+
lolin_s3_mini_pro.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
8842+
8843+
lolin_s3_mini_pro.menu.UploadMode.default=UART0 / Hardware CDC
8844+
lolin_s3_mini_pro.menu.UploadMode.default.upload.use_1200bps_touch=false
8845+
lolin_s3_mini_pro.menu.UploadMode.default.upload.wait_for_upload_port=false
8846+
lolin_s3_mini_pro.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
8847+
lolin_s3_mini_pro.menu.UploadMode.cdc.upload.use_1200bps_touch=true
8848+
lolin_s3_mini_pro.menu.UploadMode.cdc.upload.wait_for_upload_port=true
8849+
8850+
lolin_s3_mini_pro.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
8851+
lolin_s3_mini_pro.menu.PartitionScheme.default.build.partitions=default
8852+
lolin_s3_mini_pro.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
8853+
lolin_s3_mini_pro.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
8854+
lolin_s3_mini_pro.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
8855+
lolin_s3_mini_pro.menu.PartitionScheme.no_ota.build.partitions=no_ota
8856+
lolin_s3_mini_pro.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
8857+
lolin_s3_mini_pro.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
8858+
lolin_s3_mini_pro.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
8859+
lolin_s3_mini_pro.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
8860+
lolin_s3_mini_pro.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
8861+
lolin_s3_mini_pro.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
8862+
lolin_s3_mini_pro.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
8863+
lolin_s3_mini_pro.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
8864+
lolin_s3_mini_pro.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
8865+
lolin_s3_mini_pro.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
8866+
lolin_s3_mini_pro.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
8867+
lolin_s3_mini_pro.menu.PartitionScheme.huge_app.build.partitions=huge_app
8868+
lolin_s3_mini_pro.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
8869+
lolin_s3_mini_pro.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
8870+
lolin_s3_mini_pro.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
8871+
lolin_s3_mini_pro.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
8872+
lolin_s3_mini_pro.menu.PartitionScheme.rainmaker=RainMaker
8873+
lolin_s3_mini_pro.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
8874+
lolin_s3_mini_pro.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
8875+
8876+
lolin_s3_mini_pro.menu.CPUFreq.240=240MHz (WiFi)
8877+
lolin_s3_mini_pro.menu.CPUFreq.240.build.f_cpu=240000000L
8878+
lolin_s3_mini_pro.menu.CPUFreq.160=160MHz (WiFi)
8879+
lolin_s3_mini_pro.menu.CPUFreq.160.build.f_cpu=160000000L
8880+
lolin_s3_mini_pro.menu.CPUFreq.80=80MHz (WiFi)
8881+
lolin_s3_mini_pro.menu.CPUFreq.80.build.f_cpu=80000000L
8882+
lolin_s3_mini_pro.menu.CPUFreq.40=40MHz
8883+
lolin_s3_mini_pro.menu.CPUFreq.40.build.f_cpu=40000000L
8884+
lolin_s3_mini_pro.menu.CPUFreq.20=20MHz
8885+
lolin_s3_mini_pro.menu.CPUFreq.20.build.f_cpu=20000000L
8886+
lolin_s3_mini_pro.menu.CPUFreq.10=10MHz
8887+
lolin_s3_mini_pro.menu.CPUFreq.10.build.f_cpu=10000000L
8888+
8889+
lolin_s3_mini_pro.menu.UploadSpeed.921600=921600
8890+
lolin_s3_mini_pro.menu.UploadSpeed.921600.upload.speed=921600
8891+
lolin_s3_mini_pro.menu.UploadSpeed.115200=115200
8892+
lolin_s3_mini_pro.menu.UploadSpeed.115200.upload.speed=115200
8893+
lolin_s3_mini_pro.menu.UploadSpeed.256000.windows=256000
8894+
lolin_s3_mini_pro.menu.UploadSpeed.256000.upload.speed=256000
8895+
lolin_s3_mini_pro.menu.UploadSpeed.230400.windows.upload.speed=256000
8896+
lolin_s3_mini_pro.menu.UploadSpeed.230400=230400
8897+
lolin_s3_mini_pro.menu.UploadSpeed.230400.upload.speed=230400
8898+
lolin_s3_mini_pro.menu.UploadSpeed.460800.linux=460800
8899+
lolin_s3_mini_pro.menu.UploadSpeed.460800.macosx=460800
8900+
lolin_s3_mini_pro.menu.UploadSpeed.460800.upload.speed=460800
8901+
lolin_s3_mini_pro.menu.UploadSpeed.512000.windows=512000
8902+
lolin_s3_mini_pro.menu.UploadSpeed.512000.upload.speed=512000
8903+
8904+
lolin_s3_mini_pro.menu.DebugLevel.none=None
8905+
lolin_s3_mini_pro.menu.DebugLevel.none.build.code_debug=0
8906+
lolin_s3_mini_pro.menu.DebugLevel.error=Error
8907+
lolin_s3_mini_pro.menu.DebugLevel.error.build.code_debug=1
8908+
lolin_s3_mini_pro.menu.DebugLevel.warn=Warn
8909+
lolin_s3_mini_pro.menu.DebugLevel.warn.build.code_debug=2
8910+
lolin_s3_mini_pro.menu.DebugLevel.info=Info
8911+
lolin_s3_mini_pro.menu.DebugLevel.info.build.code_debug=3
8912+
lolin_s3_mini_pro.menu.DebugLevel.debug=Debug
8913+
lolin_s3_mini_pro.menu.DebugLevel.debug.build.code_debug=4
8914+
lolin_s3_mini_pro.menu.DebugLevel.verbose=Verbose
8915+
lolin_s3_mini_pro.menu.DebugLevel.verbose.build.code_debug=5
8916+
8917+
lolin_s3_mini_pro.menu.EraseFlash.none=Disabled
8918+
lolin_s3_mini_pro.menu.EraseFlash.none.upload.erase_cmd=
8919+
lolin_s3_mini_pro.menu.EraseFlash.all=Enabled
8920+
lolin_s3_mini_pro.menu.EraseFlash.all.upload.erase_cmd=-e
8921+
8922+
##############################################################
8923+
87528924
lolin_s3_pro.name=LOLIN S3 Pro
87538925
lolin_s3_pro.vid.0=0x303a
87548926
lolin_s3_pro.pid.0=0x8161
@@ -15264,7 +15436,7 @@ nodemcu-32s.build.target=esp32
1526415436
nodemcu-32s.build.mcu=esp32
1526515437
nodemcu-32s.build.core=esp32
1526615438
nodemcu-32s.build.variant=nodemcu-32s
15267-
nodemcu-32s.build.board=NodeMCU_32S
15439+
nodemcu-32s.build.board=NODEMCU_32S
1526815440

1526915441
nodemcu-32s.build.f_cpu=240000000L
1527015442
nodemcu-32s.build.flash_mode=dio
@@ -15278,9 +15450,6 @@ nodemcu-32s.menu.FlashFreq.80.build.flash_freq=80m
1527815450
nodemcu-32s.menu.FlashFreq.40=40MHz
1527915451
nodemcu-32s.menu.FlashFreq.40.build.flash_freq=40m
1528015452

15281-
nodemcu-32s.menu.UploadSpeed.460800.linux=460800
15282-
nodemcu-32s.menu.UploadSpeed.460800.macosx=460800
15283-
nodemcu-32s.menu.UploadSpeed.460800.upload.speed=460800
1528415453
nodemcu-32s.menu.UploadSpeed.115200=115200
1528515454
nodemcu-32s.menu.UploadSpeed.115200.upload.speed=115200
1528615455
nodemcu-32s.menu.UploadSpeed.256000.windows=256000
@@ -15290,6 +15459,9 @@ nodemcu-32s.menu.UploadSpeed.230400=230400
1529015459
nodemcu-32s.menu.UploadSpeed.230400.upload.speed=230400
1529115460
nodemcu-32s.menu.UploadSpeed.512000.windows=512000
1529215461
nodemcu-32s.menu.UploadSpeed.512000.upload.speed=512000
15462+
nodemcu-32s.menu.UploadSpeed.460800.linux=460800
15463+
nodemcu-32s.menu.UploadSpeed.460800.macosx=460800
15464+
nodemcu-32s.menu.UploadSpeed.460800.upload.speed=460800
1529315465
nodemcu-32s.menu.UploadSpeed.921600=921600
1529415466
nodemcu-32s.menu.UploadSpeed.921600.upload.speed=921600
1529515467

docs/en/esp-idf_component.rst

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,36 @@ For a simplified method, see `Installing using Boards Manager <https://docs.espr
1414
If you plan to use these modified settings multiple times, for different projects and targets, you can recompile the Arduino core with the new settings using the Arduino Static Library Builder.
1515
For more information, see the `Lib Builder documentation <lib_builder.html>`_.
1616

17+
.. note:: Latest Arduino Core ESP32 version (3.0.X) is now compatible with `ESP-IDF v5.1 <https://github.com/espressif/esp-idf/tree/release/v5.1>`_. Please consider this compatibility when using Arduino as a component in ESP-IDF.
18+
19+
For easiest use of Arduino framework as a ESP-IDF component, you can use the `IDF Component Manager <https://docs.espressif.com/projects/esp-idf/en/v5.1.4/esp32/api-guides/tools/idf-component-manager.html>`_ to add the Arduino component to your project.
20+
This will automatically clone the repository and its submodules. You can find the Arduino component in the `ESP Registry <https://components.espressif.com/components/espressif/arduino-esp32>`_ together with dependencies list and examples.
21+
1722
Installation
1823
------------
1924

20-
.. note:: Latest Arduino Core ESP32 version is now compatible with `ESP-IDF v4.4 <https://github.com/espressif/esp-idf/tree/release/v4.4>`_. Please consider this compatibility when using Arduino as a component in ESP-IDF.
21-
2225
#. Download and install `ESP-IDF <https://github.com/espressif/esp-idf>`_.
2326

2427
* For more information see `Get Started <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html#installation-step-by-step>`_.
28+
29+
Installing using IDF Component Manager
30+
**************************************
31+
32+
To add the Arduino component to your project using the IDF Component Manager, run the following command in your project directory:
33+
34+
.. code-block:: bash
35+
36+
idf.py add-dependency "espressif/arduino-esp32^3.0.2"
37+
38+
Or you can start a new project from a template with the Arduino component:
39+
40+
.. code-block:: bash
41+
42+
idf.py create-project-from-example "espressif/arduino-esp32^3.0.2:hello_world"
43+
44+
Manual installation of Arduino framework
45+
****************************************
46+
2547
#. Create a blank ESP-IDF project (use sample_project from /examples/get-started) or choose one of the examples.
2648
#. In the project folder, create a new folder called ``components`` and clone this repository inside the newly created folder.
2749

libraries/ESP32/examples/Zigbee/Zigbee_Temperature_Sensor/Zigbee_Temperature_Sensor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* @brief This example demonstrates simple Zigbee temperature sensor.
1717
*
18-
* The example demonstrates how to use ESP Zigbee stack to create a end device temperatu sensor.
18+
* The example demonstrates how to use ESP Zigbee stack to create a end device temperature sensor.
1919
* The temperature sensor is a Zigbee end device, which is controlled by a Zigbee coordinator.
2020
*
2121
* Proper Zigbee mode must be selected in Tools->Zigbee mode

0 commit comments

Comments
 (0)