Skip to content

Commit 7beab8e

Browse files
authored
Merge branch 'master' into esp-idf-v5.1-libs
2 parents 388106f + df287cc commit 7beab8e

30 files changed

+1265
-73
lines changed

.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v2.0.14
45+
- v2.0.13
46+
- v2.0.12
4447
- v2.0.11
4548
- v2.0.10
4649
- v2.0.9

boards.txt

Lines changed: 816 additions & 50 deletions
Large diffs are not rendered by default.

cores/esp32/HardwareSerial.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,8 @@ void HardwareSerial::end(bool fullyTerminate)
456456
// do not invalidate callbacks, detach pins, invalidate DBG output
457457
uart_driver_delete(_uart_nr);
458458
}
459+
460+
uartEnd(_uart);
459461
_uart = 0;
460462
_destroyEventTask();
461463
}

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), "%ld", 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)

libraries/WiFi/src/WiFiClient.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class WiFiClientSocketHandle {
182182
}
183183
};
184184

185-
WiFiClient::WiFiClient():_connected(false),_timeout(WIFI_CLIENT_DEF_CONN_TIMEOUT_MS),next(NULL)
185+
WiFiClient::WiFiClient():_rxBuffer(nullptr),_connected(false),_timeout(WIFI_CLIENT_DEF_CONN_TIMEOUT_MS),next(NULL)
186186
{
187187
}
188188

@@ -508,7 +508,9 @@ int WiFiClient::available()
508508
// Though flushing means to send all pending data,
509509
// seems that in Arduino it also means to clear RX
510510
void WiFiClient::flush() {
511-
_rxBuffer->flush();
511+
if (_rxBuffer != nullptr) {
512+
_rxBuffer->flush();
513+
}
512514
}
513515

514516
uint8_t WiFiClient::connected()

0 commit comments

Comments
 (0)