Skip to content

Commit 93d8ad2

Browse files
me-no-devme-no-dev
committed
Merge branch 'master' into release/v2.x
2 parents d8706e6 + c156b89 commit 93d8ad2

File tree

12 files changed

+553
-16
lines changed

12 files changed

+553
-16
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/Issue-report.yml

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v2.0.13
45+
- v2.0.12
4446
- v2.0.11
4547
- v2.0.10
4648
- v2.0.9

Diff for: ‎boards.txt

+394
Large diffs are not rendered by default.

Diff for: ‎docs/source/contributing.rst

+1-1
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

Diff for: ‎docs/source/installing.rst

+2
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:

Diff for: ‎docs/source/ota_web_update.rst

+3
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

Diff for: ‎libraries/BluetoothSerial/src/BTAdvertisedDeviceSet.cpp

+3-3
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()) {

Diff for: ‎libraries/SD/README.md

+1-6
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

Diff for: ‎libraries/SD_MMC/README.md

+1-1
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)

Diff for: ‎libraries/WiFi/src/WiFiClient.cpp

+4-2
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()

Diff for: ‎variants/atd147_s3/pins_arduino.h

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
#include "soc/soc_caps.h"
6+
7+
#define USB_VID 0x303a
8+
#define USB_PID 0x1001
9+
10+
#define EXTERNAL_NUM_INTERRUPTS 46
11+
#define NUM_DIGITAL_PINS 48
12+
#define NUM_ANALOG_INPUTS 20
13+
14+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
15+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
16+
#define digitalPinHasPWM(p) (p < 46)
17+
18+
static const uint8_t TX = 43;
19+
static const uint8_t RX = 44;
20+
21+
static const uint8_t SDA = 8;
22+
static const uint8_t SCL = 9;
23+
24+
static const uint8_t SS = 10;
25+
static const uint8_t MOSI = 11;
26+
static const uint8_t MISO = 13;
27+
static const uint8_t SCK = 12;
28+
29+
#define LCD_CS SS
30+
#define LCD_SCK SCK
31+
#define LCD_SDA MOSI
32+
static const uint8_t LCD_DC = 21;
33+
static const uint8_t LCD_RES = 14;
34+
35+
static const uint8_t BTN_A = 4;
36+
static const uint8_t BTN_B = 5;
37+
static const uint8_t BTN_C = 45;
38+
#define KEY_BUILTIN BTN_A
39+
40+
static const uint8_t A0 = 1;
41+
static const uint8_t A1 = 2;
42+
static const uint8_t A2 = 3;
43+
static const uint8_t A3 = 4;
44+
static const uint8_t A4 = 5;
45+
static const uint8_t A5 = 6;
46+
static const uint8_t A6 = 7;
47+
static const uint8_t A7 = 8;
48+
static const uint8_t A8 = 9;
49+
static const uint8_t A9 = 10;
50+
static const uint8_t A10 = 11;
51+
static const uint8_t A11 = 12;
52+
static const uint8_t A12 = 13;
53+
static const uint8_t A13 = 14;
54+
static const uint8_t A14 = 15;
55+
static const uint8_t A15 = 16;
56+
static const uint8_t A16 = 17;
57+
static const uint8_t A17 = 18;
58+
static const uint8_t A18 = 19;
59+
static const uint8_t A19 = 20;
60+
61+
static const uint8_t T1 = 1;
62+
static const uint8_t T2 = 2;
63+
static const uint8_t T3 = 3;
64+
static const uint8_t T4 = 4;
65+
static const uint8_t T5 = 5;
66+
static const uint8_t T6 = 6;
67+
static const uint8_t T7 = 7;
68+
static const uint8_t T8 = 8;
69+
static const uint8_t T9 = 9;
70+
static const uint8_t T10 = 10;
71+
static const uint8_t T11 = 11;
72+
static const uint8_t T12 = 12;
73+
static const uint8_t T13 = 13;
74+
static const uint8_t T14 = 14;
75+
76+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/ioxesp32/pins_arduino.h

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
static const uint8_t LED_BUILTIN = 5;
15+
#define BUILTIN_LED LED_BUILTIN // backward compatibility
16+
#define LED_BUILTIN LED_BUILTIN
17+
18+
static const uint8_t KEY_BUILTIN = 0;
19+
20+
static const uint8_t TX = 1;
21+
static const uint8_t RX = 3;
22+
23+
static const uint8_t SDA = 21;
24+
static const uint8_t SCL = 22;
25+
26+
static const uint8_t SS = 5;
27+
static const uint8_t MOSI = 23;
28+
static const uint8_t MISO = 19;
29+
static const uint8_t SCK = 18;
30+
31+
static const uint8_t A0 = 36;
32+
static const uint8_t A3 = 39;
33+
static const uint8_t A4 = 32;
34+
static const uint8_t A5 = 33;
35+
static const uint8_t A6 = 34;
36+
static const uint8_t A7 = 35;
37+
static const uint8_t A10 = 4;
38+
static const uint8_t A11 = 0;
39+
static const uint8_t A12 = 2;
40+
static const uint8_t A13 = 15;
41+
static const uint8_t A14 = 13;
42+
static const uint8_t A15 = 12;
43+
static const uint8_t A16 = 14;
44+
static const uint8_t A17 = 27;
45+
static const uint8_t A18 = 25;
46+
static const uint8_t A19 = 26;
47+
48+
static const uint8_t T0 = 4;
49+
static const uint8_t T1 = 0;
50+
static const uint8_t T2 = 2;
51+
static const uint8_t T3 = 15;
52+
static const uint8_t T4 = 13;
53+
static const uint8_t T5 = 12;
54+
static const uint8_t T6 = 14;
55+
static const uint8_t T7 = 27;
56+
static const uint8_t T8 = 33;
57+
static const uint8_t T9 = 32;
58+
59+
static const uint8_t DAC1 = 25;
60+
static const uint8_t DAC2 = 26;
61+
62+
#endif /* Pins_Arduino_h */

Diff for: ‎variants/lolin_s3/pins_arduino.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define Pins_Arduino_h
33

44
#include <stdint.h>
5+
#include "soc/soc_caps.h"
56

67
#define USB_VID 0x303a
78
#define USB_PID 0x1001
@@ -11,14 +12,14 @@
1112
#define NUM_ANALOG_INPUTS 18
1213

1314

14-
static const uint8_t LED_BUILTIN = 38;
15+
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+38;
1516
#define BUILTIN_LED LED_BUILTIN // backward compatibility
1617
#define LED_BUILTIN LED_BUILTIN
1718
#define RGB_BUILTIN LED_BUILTIN
1819
#define RGB_BRIGHTNESS 64
1920

20-
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
21-
#define digitalPinToInterrupt(p) (((p)<49)?(p):-1)
21+
#define analogInputToDigitalPin(p) (((p)<18)?(analogChannelToDigitalPin(p)):-1)
22+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
2223
#define digitalPinHasPWM(p) (p < 46)
2324

2425
static const uint8_t TX = 43;

0 commit comments

Comments
 (0)