Skip to content

Commit 6916ea4

Browse files
Jason2866Jason2866
authored
Merge branch 'espressif:release/v2.x' into release/v2.x
2 parents ef1a8f4 + a17c673 commit 6916ea4

File tree

760 files changed

+8655
-2419
lines changed

Some content is hidden

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

760 files changed

+8655
-2419
lines changed

‎boards.txt‎

Lines changed: 779 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/source/contributing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ Legal Part
135135

136136
Before a contribution can be accepted, you will need to sign our contributor agreement. You will be prompted for this automatically as part of the Pull Request process.
137137

138-
.. _Arduino style guide: https://www.arduino.cc/en/Reference/StyleGuide
138+
.. _Arduino style guide: https://docs.arduino.cc/learn/contributions/arduino-writing-style-guide

‎docs/source/installing.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ 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>`_.
77+
7678
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>`_.
7779

7880
PlatformIO can be used in two flavors:

‎docs/source/ota_web_update.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ OTAWebUpdate is done with a web browser that can be useful in the following typi
88
- after deployment if user is unable to expose Firmware for OTA from external update server
99
- provide updates after deployment to small quantity of modules when setting an update server is not practicable
1010

11+
For more information about the update process, please refer to the `OTA API reference <https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/ota.html>`_
12+
section of the ESP-IDF documentation.
13+
1114
Requirements
1215
------------
1316

‎libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ bool BTAdvertisedDeviceSet::haveRSSI() const { return m_haveRSSI; }
4141
std::string BTAdvertisedDeviceSet::toString() {
4242
std::string res = "Name: " + getName() + ", Address: " + std::string(getAddress().toString().c_str(), getAddress().toString().length());
4343
if (haveCOD()) {
44-
char val[6];
45-
snprintf(val, sizeof(val), "%d", getCOD());
46-
res += ", cod: ";
44+
char val[7]; //6 hex digits + null
45+
snprintf(val, sizeof(val), "%06x", getCOD() & 0xFFFFFF);
46+
res += ", cod: 0x";
4747
res += val;
4848
}
4949
if (haveRSSI()) {

‎libraries/SD/README.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,12 @@ Some ESP32 modules have different pin outs!
1818
## Default SPI pins:
1919
Note that SPI pins can be configured by using `SPI.begin(sck, miso, mosi, cs);` alternatively, you can change only the CS pin with `SD.begin(CSpin)`
2020

21-
+--------------+---------+-------+----------+----------+----------+
2221
| SPI Pin Name | ESP8266 | ESP32 | ESP32-S2 | ESP32-C3 | ESP32-S3 |
23-
+==============+=========+=======+==========+==========+==========+
22+
|--------------|---------|-------|----------|----------|----------|
2423
| CS (SS) | GPIO15 | GPIO5 | GPIO5 | GPIO13 | GPIO13 |
25-
+--------------+---------+-------+----------+----------+----------+
2624
| DI (MOSI) | GPIO13 | GPIO23| GPIO24 | GPIO14 | GPIO14 |
27-
+--------------+---------+-------+----------+----------+----------+
2825
| DO (MISO) | GPIO12 | GPIO19| GPIO25 | GPIO15 | GPIO15 |
29-
+--------------+---------+-------+----------+----------+----------+
3026
| SCK (SCLK) | GPIO14 | GPIO18| GPIO19 | GPIO16 | GPIO16 |
31-
+--------------+---------+-------+----------+----------+----------+
3227

3328
## FAQ:
3429

‎libraries/SD_MMC/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Image source: [Wikipedia](https://upload.wikimedia.org/wikipedia/commons/thumb/a
1515
Image source: [Wikipedia](https://commons.wikimedia.org/wiki/File:15-04-29-MMC-Karte-dscf4734-e.jpg)
1616

1717
pin number (refer to the picture) | micro SD - SD mode | micro SD - SPI mode | mini SD - SD mode | mini SD - SPI mode | SD - SD mode | SD - SPI mode | MMC (MMC3) - MMC mode | MMC (MMC3) - SPI mode | MMCplus / MMCmobile (MMC4) - MMC mode | MMCplus / MMCmobile (MMC4) - SPI mode
18-
----------------------------------|--------------------|---------------------|-------------------|--------------------|--------------|---------------|-----------------------|-----------------------|---------------------------------------|
18+
----------------------------------|--------------------|---------------------|-------------------|--------------------|--------------|---------------|-----------------------|-----------------------|-----------------------------------------|--------------------------------------
1919
1 | D2 | not used | D3 | CS | D3 | CS | RES | CS | D3 | CS
2020
2 | D3 | CS | CMD | DI | CMD | DI | CMD | DI | CMD | DI
2121
3 | CMD | DI | VSS1 (GND) | VSS1 (GND) | VSS1 (GND) | VSS1 (GND) | VSS1 (GND) | VSS1 (GND) | VSS1 (GND) | VSS1 (GND)

‎package/package_esp32_index.template.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{
7373
"packager": "esp32",
7474
"name": "openocd-esp32",
75-
"version": "v0.11.0-esp32-20221026"
75+
"version": "v0.12.0-esp32-20230419"
7676
},
7777
{
7878
"packager": "esp32",
@@ -472,56 +472,56 @@
472472
},
473473
{
474474
"name": "openocd-esp32",
475-
"version": "v0.11.0-esp32-20221026",
475+
"version": "v0.12.0-esp32-20230419",
476476
"systems": [
477477
{
478478
"host": "x86_64-pc-linux-gnu",
479-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz",
480-
"archiveFileName": "openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz",
481-
"checksum": "SHA-256:ce63e9b1dfab60cc62da5dc2abcc22ba7036c42afe74671c787eb026744e7d0b",
482-
"size": "2051435"
479+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz",
480+
"archiveFileName": "openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz",
481+
"checksum": "SHA-256:5144e7516cd75a2152b35ecae0a400f7d3d4424c2488fbacc49433564f54c70d",
482+
"size": 2126949
483483
},
484484
{
485485
"host": "aarch64-linux-gnu",
486-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-arm64-0.11.0-esp32-20221026.tar.gz",
487-
"archiveFileName": "openocd-esp32-linux-arm64-0.11.0-esp32-20221026.tar.gz",
488-
"checksum": "SHA-256:fe60a3a603e8c6bee47367e40fcb8c0da3a38e01163e9674ebc919b067700506",
489-
"size": "1993843"
486+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-arm64-0.12.0-esp32-20230419.tar.gz",
487+
"archiveFileName": "openocd-esp32-linux-arm64-0.12.0-esp32-20230419.tar.gz",
488+
"checksum": "SHA-256:1c4d900c738fe00730c6033abb6cf1cc6587717dbeee291d5908272d153d329a",
489+
"size": 1989161
490490
},
491491
{
492492
"host": "arm-linux-gnueabihf",
493-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-armel-0.11.0-esp32-20221026.tar.gz",
494-
"archiveFileName": "openocd-esp32-linux-armel-0.11.0-esp32-20221026.tar.gz",
495-
"checksum": "SHA-256:6ef76101cca196a4be30fc74f191eff34abb423e32930a383012b866c9b76135",
496-
"size": "2092111"
493+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-armel-0.12.0-esp32-20230419.tar.gz",
494+
"archiveFileName": "openocd-esp32-linux-armel-0.12.0-esp32-20230419.tar.gz",
495+
"checksum": "SHA-256:293258fd67618dd352e1096137ad9f2b801926eaf74ffcd570540ae94ad8ee5c",
496+
"size": 2129727
497497
},
498498
{
499499
"host": "x86_64-apple-darwin",
500-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-macos-0.11.0-esp32-20221026.tar.gz",
501-
"archiveFileName": "openocd-esp32-macos-0.11.0-esp32-20221026.tar.gz",
502-
"checksum": "SHA-256:8edc666a0a230432554b73df7c62e0b5ec21fb018e7fda13b11a7ca8b6c1763b",
503-
"size": "2199855"
500+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-macos-0.12.0-esp32-20230419.tar.gz",
501+
"archiveFileName": "openocd-esp32-macos-0.12.0-esp32-20230419.tar.gz",
502+
"checksum": "SHA-256:621aad7d011c6817cde9570dfea42c7bcc699458bf43c37706cb4c2f6475a247",
503+
"size": 2237976
504504
},
505505
{
506506
"host": "arm64-apple-darwin",
507-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-macos-arm64-0.11.0-esp32-20221026.tar.gz",
508-
"archiveFileName": "openocd-esp32-macos-arm64-0.11.0-esp32-20221026.tar.gz",
509-
"checksum": "SHA-256:c426c0158ba6488e2f432f7c5b22e79155b5b0fae6d1ad5bbd7894723b43aa12",
510-
"size": "2247179"
507+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-macos-arm64-0.12.0-esp32-20230419.tar.gz",
508+
"archiveFileName": "openocd-esp32-macos-arm64-0.12.0-esp32-20230419.tar.gz",
509+
"checksum": "SHA-256:3af7eac3a7de3939731ec4c13fb5d72a8e6ce5e5d274bb9697f5d93039561e42",
510+
"size": 2270699
511511
},
512512
{
513513
"host": "i686-mingw32",
514-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-win32-0.11.0-esp32-20221026.zip",
515-
"archiveFileName": "openocd-esp32-win32-0.11.0-esp32-20221026.zip",
516-
"checksum": "SHA-256:e0e789d35308c029c6b53457cf4a42a5620cb1a3014740026c089c2ed4fd77b2",
517-
"size": "2493214"
514+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-win32-0.12.0-esp32-20230419.zip",
515+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230419.zip",
516+
"checksum": "SHA-256:f2cb3d9cacfe789c20d3272af846d726a062ce8f2e4ee142bddb27501d7dd7a7",
517+
"size": 2619680
518518
},
519519
{
520520
"host": "x86_64-mingw32",
521-
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-win32-0.11.0-esp32-20221026.zip",
522-
"archiveFileName": "openocd-esp32-win32-0.11.0-esp32-20221026.zip",
523-
"checksum": "SHA-256:e0e789d35308c029c6b53457cf4a42a5620cb1a3014740026c089c2ed4fd77b2",
524-
"size": "2493214"
521+
"url": "https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-win32-0.12.0-esp32-20230419.zip",
522+
"archiveFileName": "openocd-esp32-win32-0.12.0-esp32-20230419.zip",
523+
"checksum": "SHA-256:f2cb3d9cacfe789c20d3272af846d726a062ce8f2e4ee142bddb27501d7dd7a7",
524+
"size": 2619680
525525
}
526526
]
527527
},

0 commit comments

Comments
 (0)