Skip to content

Commit 9eece7c

Browse files
authored
Merge branch 'espressif:master' into main
2 parents 990fac2 + 76782f2 commit 9eece7c

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed

cores/esp32/Esp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte)
500500
#endif
501501
}
502502

503+
503504
FlashMode_t EspClass::magicFlashChipMode(uint8_t byte)
504505
{
505506
FlashMode_t mode = (FlashMode_t) byte;

docs/source/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Installing using PlatformIO
7373

7474
PlatformIO is a professional collaborative platform for embedded development. It has out-of-the-box support for ESP32 SoCs and allows working with Arduino ESP32 as well as ESP-IDF from Espressif without changing your development environment. PlatformIO includes lots of instruments for the most common development tasks such as debugging, unit testing, and static code analysis.
7575

76-
.. warning:: PlatformIO is not officially supported by Espressif. Please report any issues with PlatformIO directly to its developers on the official `PlatformIO repositories <https://github.com/platformio>`_.
76+
.. warning:: Integration of the Arduino Core ESP32 project in PlatformIO is maintained by PlatformIO developers. Arduino Core ESP32 Project Team cannot support PlatformIO-specific issues. Please report these issues in official `PlatformIO repositories <https://github.com/platformio>`_.
7777

7878
A detailed overview of the PlatformIO ecosystem and its philosophy can be found in `the official documentation <https://docs.platformio.org/en/latest/core/index.html>`_.
7979

libraries/Wire/examples/WireSlave/.skip.esp32c2

Whitespace-only changes.

0 commit comments

Comments
 (0)