Skip to content

Commit 9fa8b54

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
Merge branch 'master' into window_covering
2 parents 5f8c8e2 + f22866f commit 9fa8b54

Some content is hidden

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

45 files changed

+658
-97
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Arduino ESP32 Gitter Channel
4-
url: https://gitter.im/espressif/arduino-esp32
5-
about: Community channel for questions and help
3+
- name: Arduino Core for Espressif Discord Server
4+
url: https://discord.gg/8xY6e9crwv
5+
about: Community Discord server for questions and help
66
- name: ESP32 Forum - Arduino
77
url: https://esp32.com/viewforum.php?f=19
88
about: Official Forum for questions

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
[![External Libraries Test](https://img.shields.io/github/actions/workflow/status/espressif/arduino-esp32/lib.yml?branch=master&event=schedule&label=External%20Libraries%20Test)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md)
66
[![Runtime 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)
77

8-
### 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)
8+
### Need help or have a question? Join the chat at [Discord](https://discord.gg/8xY6e9crwv) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
9+
10+
[![Discord invite](https://img.shields.io/discord/1327272229427216425?logo=discord&logoColor=white&logoSize=auto&label=Discord)](https://discord.gg/8xY6e9crwv)
911

1012
## Contents
1113

‎boards.txt

+202-6
Original file line numberDiff line numberDiff line change
@@ -450,15 +450,24 @@ esp32h2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
450450
#esp32h2.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
451451
#esp32h2.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
452452
#esp32h2.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
453-
esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
454-
esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
455-
esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
456453
esp32h2.menu.PartitionScheme.zigbee_2MB=Zigbee 2MB with spiffs
457454
esp32h2.menu.PartitionScheme.zigbee_2MB.build.partitions=zigbee_2MB
458455
esp32h2.menu.PartitionScheme.zigbee_2MB.upload.maximum_size=1310720
456+
esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
457+
esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
458+
esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
459+
esp32h2.menu.PartitionScheme.zigbee_8MB=Zigbee 8MB with spiffs
460+
esp32h2.menu.PartitionScheme.zigbee_8MB.build.partitions=zigbee_8MB
461+
esp32h2.menu.PartitionScheme.zigbee_8MB.upload.maximum_size=3407872
462+
esp32h2.menu.PartitionScheme.zigbee_zczr_2MB=Zigbee ZCZR 2MB with spiffs
463+
esp32h2.menu.PartitionScheme.zigbee_zczr_2MB.build.partitions=zigbee_zczr_2MB
464+
esp32h2.menu.PartitionScheme.zigbee_zczr_2MB.upload.maximum_size=1310720
459465
esp32h2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
460466
esp32h2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
461467
esp32h2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
468+
esp32h2.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
469+
esp32h2.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
470+
esp32h2.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
462471
esp32h2.menu.PartitionScheme.custom=Custom
463472
esp32h2.menu.PartitionScheme.custom.build.partitions=
464473
esp32h2.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -645,15 +654,24 @@ esp32c6.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656
645654
esp32c6.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
646655
esp32c6.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
647656
esp32c6.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
648-
esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
649-
esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
650-
esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
651657
esp32c6.menu.PartitionScheme.zigbee_2MB=Zigbee 2MB with spiffs
652658
esp32c6.menu.PartitionScheme.zigbee_2MB.build.partitions=zigbee_2MB
653659
esp32c6.menu.PartitionScheme.zigbee_2MB.upload.maximum_size=1310720
660+
esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
661+
esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
662+
esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
663+
esp32c6.menu.PartitionScheme.zigbee_8MB=Zigbee 8MB with spiffs
664+
esp32c6.menu.PartitionScheme.zigbee_8MB.build.partitions=zigbee_8MB
665+
esp32c6.menu.PartitionScheme.zigbee_8MB.upload.maximum_size=3407872
666+
esp32c6.menu.PartitionScheme.zigbee_zczr_2MB=Zigbee ZCZR 2MB with spiffs
667+
esp32c6.menu.PartitionScheme.zigbee_zczr_2MB.build.partitions=zigbee_zczr_2MB
668+
esp32c6.menu.PartitionScheme.zigbee_zczr_2MB.upload.maximum_size=1310720
654669
esp32c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
655670
esp32c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
656671
esp32c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
672+
esp32c6.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
673+
esp32c6.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
674+
esp32c6.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
657675
esp32c6.menu.PartitionScheme.custom=Custom
658676
esp32c6.menu.PartitionScheme.custom.build.partitions=
659677
esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -35193,6 +35211,184 @@ XIAO_ESP32S3.menu.EraseFlash.all.upload.erase_cmd=-e
3519335211

3519435212
##############################################################
3519535213

35214+
XIAO_ESP32S3_Plus.name=XIAO_ESP32S3_PLUS
35215+
XIAO_ESP32S3_Plus.vid.0=0x2886
35216+
XIAO_ESP32S3_Plus.pid.0=0x0063
35217+
XIAO_ESP32S3_Plus.vid.1=0x2886
35218+
XIAO_ESP32S3_Plus.pid.1=0x8063
35219+
35220+
XIAO_ESP32S3_Plus.bootloader.tool=esptool_py
35221+
XIAO_ESP32S3_Plus.bootloader.tool.default=esptool_py
35222+
35223+
XIAO_ESP32S3_Plus.upload.tool=esptool_py
35224+
XIAO_ESP32S3_Plus.upload.tool.default=esptool_py
35225+
XIAO_ESP32S3_Plus.upload.tool.network=esp_ota
35226+
35227+
XIAO_ESP32S3_Plus.upload.maximum_size=1310720
35228+
XIAO_ESP32S3_Plus.upload.maximum_data_size=327680
35229+
XIAO_ESP32S3_Plus.upload.flags=
35230+
XIAO_ESP32S3_Plus.upload.extra_flags=
35231+
XIAO_ESP32S3_Plus.upload.use_1200bps_touch=false
35232+
XIAO_ESP32S3_Plus.upload.wait_for_upload_port=false
35233+
35234+
XIAO_ESP32S3_Plus.serial.disableDTR=false
35235+
XIAO_ESP32S3_Plus.serial.disableRTS=false
35236+
35237+
XIAO_ESP32S3_Plus.build.tarch=xtensa
35238+
XIAO_ESP32S3_Plus.build.bootloader_addr=0x0
35239+
XIAO_ESP32S3_Plus.build.target=esp32s3
35240+
XIAO_ESP32S3_Plus.build.mcu=esp32s3
35241+
XIAO_ESP32S3_Plus.build.core=esp32
35242+
XIAO_ESP32S3_Plus.build.variant=XIAO_ESP32S3_Plus
35243+
XIAO_ESP32S3_Plus.build.board=XIAO_ESP32S3_PLUS
35244+
35245+
XIAO_ESP32S3_Plus.build.usb_mode=0
35246+
XIAO_ESP32S3_Plus.build.cdc_on_boot=1
35247+
XIAO_ESP32S3_Plus.build.msc_on_boot=0
35248+
XIAO_ESP32S3_Plus.build.dfu_on_boot=0
35249+
XIAO_ESP32S3_Plus.build.f_cpu=240000000L
35250+
XIAO_ESP32S3_Plus.build.flash_size=8MB
35251+
XIAO_ESP32S3_Plus.build.flash_freq=80m
35252+
XIAO_ESP32S3_Plus.build.flash_mode=dio
35253+
XIAO_ESP32S3_Plus.build.boot=qio
35254+
XIAO_ESP32S3_Plus.build.boot_freq=80m
35255+
XIAO_ESP32S3_Plus.build.partitions=default_8MB
35256+
XIAO_ESP32S3_Plus.build.defines=
35257+
XIAO_ESP32S3_Plus.build.loop_core=
35258+
XIAO_ESP32S3_Plus.build.event_core=
35259+
XIAO_ESP32S3_Plus.build.psram_type=qspi
35260+
XIAO_ESP32S3_Plus.build.memory_type={build.boot}_{build.psram_type}
35261+
35262+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.default=Disabled
35263+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.default.build.copy_jtag_files=0
35264+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.builtin=Integrated USB JTAG
35265+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
35266+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
35267+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.external=FTDI Adapter
35268+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
35269+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.external.build.copy_jtag_files=1
35270+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.bridge=ESP USB Bridge
35271+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
35272+
XIAO_ESP32S3_Plus.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
35273+
35274+
XIAO_ESP32S3_Plus.menu.PSRAM.disabled=Disabled
35275+
XIAO_ESP32S3_Plus.menu.PSRAM.disabled.build.defines=
35276+
XIAO_ESP32S3_Plus.menu.PSRAM.disabled.build.psram_type=qspi
35277+
XIAO_ESP32S3_Plus.menu.PSRAM.opi=OPI PSRAM
35278+
XIAO_ESP32S3_Plus.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
35279+
XIAO_ESP32S3_Plus.menu.PSRAM.opi.build.psram_type=opi
35280+
35281+
XIAO_ESP32S3_Plus.menu.FlashMode.qio=QIO 80MHz
35282+
XIAO_ESP32S3_Plus.menu.FlashMode.qio.build.flash_mode=dio
35283+
XIAO_ESP32S3_Plus.menu.FlashMode.qio.build.boot=qio
35284+
XIAO_ESP32S3_Plus.menu.FlashMode.qio.build.boot_freq=80m
35285+
XIAO_ESP32S3_Plus.menu.FlashMode.qio.build.flash_freq=80m
35286+
XIAO_ESP32S3_Plus.menu.FlashMode.dio=DIO 80MHz
35287+
XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.flash_mode=dio
35288+
XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.boot=dio
35289+
XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.boot_freq=80m
35290+
XIAO_ESP32S3_Plus.menu.FlashMode.dio.build.flash_freq=80m
35291+
35292+
XIAO_ESP32S3_Plus.menu.FlashSize.8M=8MB (64Mb)
35293+
XIAO_ESP32S3_Plus.menu.FlashSize.8M.build.flash_size=8MB
35294+
35295+
XIAO_ESP32S3_Plus.menu.LoopCore.1=Core 1
35296+
XIAO_ESP32S3_Plus.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
35297+
XIAO_ESP32S3_Plus.menu.LoopCore.0=Core 0
35298+
XIAO_ESP32S3_Plus.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
35299+
35300+
XIAO_ESP32S3_Plus.menu.EventsCore.1=Core 1
35301+
XIAO_ESP32S3_Plus.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
35302+
XIAO_ESP32S3_Plus.menu.EventsCore.0=Core 0
35303+
XIAO_ESP32S3_Plus.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
35304+
35305+
XIAO_ESP32S3_Plus.menu.USBMode.hwcdc=Hardware CDC and JTAG
35306+
XIAO_ESP32S3_Plus.menu.USBMode.hwcdc.build.usb_mode=1
35307+
XIAO_ESP32S3_Plus.menu.USBMode.default=USB-OTG (TinyUSB)
35308+
XIAO_ESP32S3_Plus.menu.USBMode.default.build.usb_mode=0
35309+
35310+
XIAO_ESP32S3_Plus.menu.CDCOnBoot.default=Enabled
35311+
XIAO_ESP32S3_Plus.menu.CDCOnBoot.default.build.cdc_on_boot=1
35312+
XIAO_ESP32S3_Plus.menu.CDCOnBoot.cdc=Disabled
35313+
XIAO_ESP32S3_Plus.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
35314+
35315+
XIAO_ESP32S3_Plus.menu.MSCOnBoot.default=Disabled
35316+
XIAO_ESP32S3_Plus.menu.MSCOnBoot.default.build.msc_on_boot=0
35317+
XIAO_ESP32S3_Plus.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
35318+
XIAO_ESP32S3_Plus.menu.MSCOnBoot.msc.build.msc_on_boot=1
35319+
35320+
XIAO_ESP32S3_Plus.menu.DFUOnBoot.default=Disabled
35321+
XIAO_ESP32S3_Plus.menu.DFUOnBoot.default.build.dfu_on_boot=0
35322+
XIAO_ESP32S3_Plus.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
35323+
XIAO_ESP32S3_Plus.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
35324+
35325+
XIAO_ESP32S3_Plus.menu.UploadMode.default=UART0 / Hardware CDC
35326+
XIAO_ESP32S3_Plus.menu.UploadMode.default.upload.use_1200bps_touch=false
35327+
XIAO_ESP32S3_Plus.menu.UploadMode.default.upload.wait_for_upload_port=false
35328+
XIAO_ESP32S3_Plus.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
35329+
XIAO_ESP32S3_Plus.menu.UploadMode.cdc.upload.use_1200bps_touch=true
35330+
XIAO_ESP32S3_Plus.menu.UploadMode.cdc.upload.wait_for_upload_port=true
35331+
35332+
XIAO_ESP32S3_Plus.menu.PartitionScheme.default_8MB=Default with spiffs (3MB APP/1.5MB SPIFFS)
35333+
XIAO_ESP32S3_Plus.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
35334+
XIAO_ESP32S3_Plus.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
35335+
XIAO_ESP32S3_Plus.menu.PartitionScheme.max_app_8MB=Maximum APP (7.9MB APP No OTA/No FS)
35336+
XIAO_ESP32S3_Plus.menu.PartitionScheme.max_app_8MB.build.partitions=max_app_8MB
35337+
XIAO_ESP32S3_Plus.menu.PartitionScheme.max_app_8MB.upload.maximum_size=8257536
35338+
XIAO_ESP32S3_Plus.menu.PartitionScheme.tinyuf2=TinyUF2 8MB (2MB APP/3.7MB FFAT)
35339+
XIAO_ESP32S3_Plus.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
35340+
XIAO_ESP32S3_Plus.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-8MB
35341+
XIAO_ESP32S3_Plus.menu.PartitionScheme.tinyuf2.upload.maximum_size=2097152
35342+
XIAO_ESP32S3_Plus.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x410000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
35343+
35344+
XIAO_ESP32S3_Plus.menu.CPUFreq.240=240MHz (WiFi)
35345+
XIAO_ESP32S3_Plus.menu.CPUFreq.240.build.f_cpu=240000000L
35346+
XIAO_ESP32S3_Plus.menu.CPUFreq.160=160MHz (WiFi)
35347+
XIAO_ESP32S3_Plus.menu.CPUFreq.160.build.f_cpu=160000000L
35348+
XIAO_ESP32S3_Plus.menu.CPUFreq.80=80MHz (WiFi)
35349+
XIAO_ESP32S3_Plus.menu.CPUFreq.80.build.f_cpu=80000000L
35350+
XIAO_ESP32S3_Plus.menu.CPUFreq.40=40MHz
35351+
XIAO_ESP32S3_Plus.menu.CPUFreq.40.build.f_cpu=40000000L
35352+
XIAO_ESP32S3_Plus.menu.CPUFreq.20=20MHz
35353+
XIAO_ESP32S3_Plus.menu.CPUFreq.20.build.f_cpu=20000000L
35354+
XIAO_ESP32S3_Plus.menu.CPUFreq.10=10MHz
35355+
XIAO_ESP32S3_Plus.menu.CPUFreq.10.build.f_cpu=10000000L
35356+
35357+
XIAO_ESP32S3_Plus.menu.UploadSpeed.921600=921600
35358+
XIAO_ESP32S3_Plus.menu.UploadSpeed.921600.upload.speed=921600
35359+
XIAO_ESP32S3_Plus.menu.UploadSpeed.115200=115200
35360+
XIAO_ESP32S3_Plus.menu.UploadSpeed.115200.upload.speed=115200
35361+
XIAO_ESP32S3_Plus.menu.UploadSpeed.256000.windows=256000
35362+
XIAO_ESP32S3_Plus.menu.UploadSpeed.256000.upload.speed=256000
35363+
XIAO_ESP32S3_Plus.menu.UploadSpeed.230400.windows.upload.speed=256000
35364+
XIAO_ESP32S3_Plus.menu.UploadSpeed.230400=230400
35365+
XIAO_ESP32S3_Plus.menu.UploadSpeed.230400.upload.speed=230400
35366+
XIAO_ESP32S3_Plus.menu.UploadSpeed.460800.linux=460800
35367+
XIAO_ESP32S3_Plus.menu.UploadSpeed.460800.macosx=460800
35368+
XIAO_ESP32S3_Plus.menu.UploadSpeed.460800.upload.speed=460800
35369+
XIAO_ESP32S3_Plus.menu.UploadSpeed.512000.windows=512000
35370+
XIAO_ESP32S3_Plus.menu.UploadSpeed.512000.upload.speed=512000
35371+
35372+
XIAO_ESP32S3_Plus.menu.DebugLevel.none=None
35373+
XIAO_ESP32S3_Plus.menu.DebugLevel.none.build.code_debug=0
35374+
XIAO_ESP32S3_Plus.menu.DebugLevel.error=Error
35375+
XIAO_ESP32S3_Plus.menu.DebugLevel.error.build.code_debug=1
35376+
XIAO_ESP32S3_Plus.menu.DebugLevel.warn=Warn
35377+
XIAO_ESP32S3_Plus.menu.DebugLevel.warn.build.code_debug=2
35378+
XIAO_ESP32S3_Plus.menu.DebugLevel.info=Info
35379+
XIAO_ESP32S3_Plus.menu.DebugLevel.info.build.code_debug=3
35380+
XIAO_ESP32S3_Plus.menu.DebugLevel.debug=Debug
35381+
XIAO_ESP32S3_Plus.menu.DebugLevel.debug.build.code_debug=4
35382+
XIAO_ESP32S3_Plus.menu.DebugLevel.verbose=Verbose
35383+
XIAO_ESP32S3_Plus.menu.DebugLevel.verbose.build.code_debug=5
35384+
35385+
XIAO_ESP32S3_Plus.menu.EraseFlash.none=Disabled
35386+
XIAO_ESP32S3_Plus.menu.EraseFlash.none.upload.erase_cmd=
35387+
XIAO_ESP32S3_Plus.menu.EraseFlash.all=Enabled
35388+
XIAO_ESP32S3_Plus.menu.EraseFlash.all.upload.erase_cmd=-e
35389+
35390+
##############################################################
35391+
3519635392
connaxio_espoir.name=Connaxio's Espoir
3519735393
connaxio_espoir.vid.0=0x10C4
3519835394
connaxio_espoir.pid.0=0x8D9A

‎cores/esp32/Arduino.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,17 @@
3333
#include "freertos/FreeRTOS.h"
3434
#include "freertos/task.h"
3535
#include "freertos/semphr.h"
36-
#include "esp32-hal.h"
3736
#include "esp8266-compat.h"
3837
#include "soc/gpio_reg.h"
3938

4039
#include "stdlib_noniso.h"
4140
#include "binary.h"
4241
#include "extra_attr.h"
4342

43+
#include "pins_arduino.h"
44+
#include "io_pin_remap.h"
45+
#include "esp32-hal.h"
46+
4447
#define PI 3.1415926535897932384626433832795
4548
#define HALF_PI 1.5707963267948966192313216916398
4649
#define TWO_PI 6.283185307179586476925286766559
@@ -248,8 +251,4 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
248251
void noTone(uint8_t _pin);
249252

250253
#endif /* __cplusplus */
251-
252-
#include "pins_arduino.h"
253-
#include "io_pin_remap.h"
254-
255254
#endif /* _ESP32_CORE_ARDUINO_H_ */

‎cores/esp32/FirmwareMSC.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "esp_partition.h"
2020
#include "esp_ota_ops.h"
2121
#include "esp_image_format.h"
22-
#include "esp32-hal.h"
2322
#include "pins_arduino.h"
23+
#include "esp32-hal.h"
2424
#include "firmware_msc_fat.h"
2525
#include "spi_flash_mmap.h"
2626

‎cores/esp32/esp32-hal-gpio.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
extern "C" {
2525
#endif
2626

27+
#include "pins_arduino.h"
2728
#include "esp32-hal.h"
2829
#include "soc/soc_caps.h"
29-
#include "pins_arduino.h"
3030
#include "driver/gpio.h"
3131

3232
#if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)

‎cores/esp32/esp32-hal-misc.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,13 @@ void enableCore0WDT() {
156156
}
157157
}
158158

159-
void disableCore0WDT() {
159+
bool disableCore0WDT() {
160160
TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCore(0);
161-
if (idle_0 == NULL || esp_task_wdt_delete(idle_0) != ESP_OK) {
161+
if (idle_0 == NULL || esp_task_wdt_status(idle_0) || esp_task_wdt_delete(idle_0) != ESP_OK) {
162162
log_e("Failed to remove Core 0 IDLE task from WDT");
163+
return false;
163164
}
165+
return true;
164166
}
165167

166168
#ifndef CONFIG_FREERTOS_UNICORE
@@ -171,11 +173,13 @@ void enableCore1WDT() {
171173
}
172174
}
173175

174-
void disableCore1WDT() {
176+
bool disableCore1WDT() {
175177
TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCore(1);
176-
if (idle_1 == NULL || esp_task_wdt_delete(idle_1) != ESP_OK) {
178+
if (idle_1 == NULL || esp_task_wdt_status(idle_1) || esp_task_wdt_delete(idle_1) != ESP_OK) {
177179
log_e("Failed to remove Core 1 IDLE task from WDT");
180+
return false;
178181
}
182+
return true;
179183
}
180184
#endif
181185

‎cores/esp32/esp32-hal.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ void feedLoopWDT();
121121

122122
//enable/disable WDT for the IDLE task on Core 0 (SYSTEM)
123123
void enableCore0WDT();
124-
void disableCore0WDT();
124+
bool disableCore0WDT();
125125
#ifndef CONFIG_FREERTOS_UNICORE
126126
//enable/disable WDT for the IDLE task on Core 1 (Arduino)
127127
void enableCore1WDT();
128-
void disableCore1WDT();
128+
bool disableCore1WDT();
129129
#endif
130130

131131
//if xCoreID < 0 or CPU is unicore, it will use xTaskCreate, else xTaskCreatePinnedToCore

‎docs/en/getting_started.rst

+5-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ Here are some community channels where you may find information and ask for some
102102
- `ESP32 Forum`_: Official Espressif Forum.
103103
- `ESP32 Forum - Arduino`_: Official Espressif Forum for Arduino related discussions.
104104
- `ESP32 Forum - Hardware`_: Official Espressif Forum for Hardware related discussions.
105-
- `Gitter`_
105+
- `Espressif Developer Portal`_: Official Espressif Developer Portal with tutorials, examples, workshops, and more.
106+
- `Arduino Core for Espressif (Discord)`_: Official Espressif Discord channel for the Arduino Core.
106107
- `Espressif MCUs (Discord)`_
107108
- `ESP32 on Reddit`_
108109

@@ -148,12 +149,13 @@ Resources
148149

149150
.. _Espressif Systems: https://www.espressif.com
150151
.. _Espressif Product Selector: https://products.espressif.com/
152+
.. _Espressif Developer Portal: https://developer.espressif.com/
151153
.. _Arduino.cc: https://www.arduino.cc/en/Main/Software
152154
.. _Arduino Reference: https://www.arduino.cc/reference/en/
153155
.. _ESP32 Forum: https://esp32.com
154156
.. _ESP32 Forum - Arduino: https://esp32.com/viewforum.php?f=19
155157
.. _ESP32 Forum - Hardware: https://esp32.com/viewforum.php?f=12
156-
.. _Gitter: https://gitter.im/espressif/arduino-esp32
158+
.. _Arduino Core for Espressif (Discord): https://discord.gg/8xY6e9crwv
157159
.. _Adafruit (Discord): https://discord.gg/adafruit
158-
.. _Espressif MCUs (Discord): https://discord.gg/nKxMTnkD
160+
.. _Espressif MCUs (Discord): https://discord.com/invite/XqnZPbF
159161
.. _ESP32 on Reddit: https://www.reddit.com/r/esp32

0 commit comments

Comments
 (0)