Skip to content

Commit baf26ed

Browse files
lucasssvazlucasssvaz
authored
Merge branch 'master' into ci/release_test
2 parents 8adeb29 + 23b84e5 commit baf26ed

File tree

13 files changed

+64
-55
lines changed

13 files changed

+64
-55
lines changed

‎cores/esp32/HardwareSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void serialEventRun(void) {
9696
#endif
9797

9898
HardwareSerial::HardwareSerial(uint8_t uart_nr)
99-
: _uart_nr(uart_nr), _uart(NULL), _rxBufferSize(256), _txBufferSize(0), _onReceiveCB(NULL), _onReceiveErrorCB(NULL), _onReceiveTimeout(false), _rxTimeout(2),
99+
: _uart_nr(uart_nr), _uart(NULL), _rxBufferSize(256), _txBufferSize(0), _onReceiveCB(NULL), _onReceiveErrorCB(NULL), _onReceiveTimeout(false), _rxTimeout(1),
100100
_rxFIFOFull(0), _eventTask(NULL)
101101
#if !CONFIG_DISABLE_HAL_LOCKS
102102
,

‎cores/esp32/chip-debug-report.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ static void printChipInfo(void) {
9898
rtc_clk_cpu_freq_get_config(&conf);
9999
chip_report_printf(" CPU Frequency : %lu MHz\n", conf.freq_mhz);
100100
chip_report_printf(" XTAL Frequency : %d MHz\n", rtc_clk_xtal_freq_get());
101+
chip_report_printf(" Features Bitfield : %#010x\n", info.features);
101102
chip_report_printf(" Embedded Flash : %s\n", (info.features & CHIP_FEATURE_EMB_FLASH) ? "Yes" : "No");
102103
chip_report_printf(" Embedded PSRAM : %s\n", (info.features & CHIP_FEATURE_EMB_PSRAM) ? "Yes" : "No");
103104
chip_report_printf(" 2.4GHz WiFi : %s\n", (info.features & CHIP_FEATURE_WIFI_BGN) ? "Yes" : "No");

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,20 @@ uart_t *uartBegin(
503503
uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
504504
uart_config.rx_flow_ctrl_thresh = rxfifo_full_thrhd;
505505
uart_config.baud_rate = baudrate;
506-
// CLK_APB for ESP32|S2|S3|C3 -- CLK_PLL_F40M for C2 -- CLK_PLL_F48M for H2 -- CLK_PLL_F80M for C6
507-
uart_config.source_clk = UART_SCLK_DEFAULT;
506+
// there is an issue when returning from light sleep with the C6 and H2: the uart baud rate is not restored
507+
// therefore, uart clock source will set to XTAL for all SoC that support it. This fix solves the C6|H2 issue.
508+
#if SOC_UART_SUPPORT_XTAL_CLK
509+
uart_config.source_clk = UART_SCLK_XTAL; // valid for C2, S3, C3, C6, H2 and P4
510+
#elif SOC_UART_SUPPORT_REF_TICK
511+
if (baudrate <= 1000000) {
512+
uart_config.source_clk = UART_SCLK_REF_TICK; // valid for ESP32, S2 - MAX supported baud rate is 1MHz
513+
} else {
514+
uart_config.source_clk = UART_SCLK_APB; // baudrate may change with the APB Frequency!
515+
}
516+
#else
517+
// Default CLK Source: CLK_APB for ESP32|S2|S3|C3 -- CLK_PLL_F40M for C2 -- CLK_PLL_F48M for H2 -- CLK_PLL_F80M for C6
518+
uart_config.source_clk = UART_SCLK_DEFAULT; // baudrate may change with the APB Frequency!
519+
#endif
508520

509521
UART_MUTEX_LOCK();
510522
bool retCode = ESP_OK == uart_driver_install(uart_nr, rx_buffer_size, tx_buffer_size, 20, &(uart->uart_event_queue), 0);
@@ -778,25 +790,25 @@ void uartSetBaudRate(uart_t *uart, uint32_t baud_rate) {
778790
return;
779791
}
780792
UART_MUTEX_LOCK();
781-
uint32_t sclk_freq;
782-
if (uart_get_sclk_freq(UART_SCLK_DEFAULT, &sclk_freq) == ESP_OK) {
783-
uart_ll_set_baudrate(UART_LL_GET_HW(uart->num), baud_rate, sclk_freq);
793+
if (uart_set_baudrate(uart->num, baud_rate) == ESP_OK) {
794+
uart->_baudrate = baud_rate;
795+
} else {
796+
log_e("Setting UART%d baud rate to %d has failed.", uart->num, baud_rate);
784797
}
785-
uart->_baudrate = baud_rate;
786798
UART_MUTEX_UNLOCK();
787799
}
788800

789801
uint32_t uartGetBaudRate(uart_t *uart) {
790802
uint32_t baud_rate = 0;
791-
uint32_t sclk_freq;
792803

793804
if (uart == NULL) {
794805
return 0;
795806
}
796807

797808
UART_MUTEX_LOCK();
798-
if (uart_get_sclk_freq(UART_SCLK_DEFAULT, &sclk_freq) == ESP_OK) {
799-
baud_rate = uart_ll_get_baudrate(UART_LL_GET_HW(uart->num), sclk_freq);
809+
if (uart_get_baudrate(uart->num, &baud_rate) != ESP_OK) {
810+
log_e("Getting UART%d baud rate has failed.", uart->num);
811+
baud_rate = (uint32_t)-1; // return value when failed
800812
}
801813
UART_MUTEX_UNLOCK();
802814
return baud_rate;

‎libraries/NetworkClientSecure/src/NetworkClientSecure.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ void NetworkClientSecure::setCACert(const char *rootCA) {
339339
_use_insecure = false;
340340
}
341341

342-
void NetworkClientSecure::setCACertBundle(const uint8_t *bundle) {
343-
if (bundle != NULL) {
344-
esp_crt_bundle_set(bundle, sizeof(bundle));
342+
void NetworkClientSecure::setCACertBundle(const uint8_t *bundle, size_t size) {
343+
if (bundle != NULL && size > 0) {
344+
esp_crt_bundle_set(bundle, size);
345345
attach_ssl_certificate_bundle(sslclient.get(), true);
346346
_use_ca_bundle = true;
347347
} else {

‎libraries/NetworkClientSecure/src/NetworkClientSecure.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class NetworkClientSecure : public NetworkClient {
7373
void setCertificate(const char *client_ca);
7474
void setPrivateKey(const char *private_key);
7575
bool loadCACert(Stream &stream, size_t size);
76-
void setCACertBundle(const uint8_t *bundle);
76+
void setCACertBundle(const uint8_t *bundle, size_t size);
7777
bool loadCertificate(Stream &stream, size_t size);
7878
bool loadPrivateKey(Stream &stream, size_t size);
7979
bool verify(const char *fingerprint, const char *domain_name);

‎libraries/RainMaker/examples/RMakerCustom/RMakerCustom.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const char *service_name = "PROV_1234";
99
const char *pop = "abcd1234";
1010

1111
//GPIO for push button
12-
#if CONFIG_IDF_TARGET_ESP32C3
12+
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
1313
static int gpio_0 = 9;
1414
static int gpio_dimmer = 7;
1515
#else

‎libraries/RainMaker/examples/RMakerCustom/ci.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32c6": false,
43
"esp32h2": false
54
}
65
}

‎libraries/RainMaker/examples/RMakerCustomAirCooler/RMakerCustomAirCooler.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
const char *service_name = "PROV_1234";
1212
const char *pop = "abcd1234";
1313

14-
#if CONFIG_IDF_TARGET_ESP32C3
14+
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
1515
//GPIO for push button
1616
static int gpio_reset = 9;
1717
//GPIO for virtual device

‎libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32c6": false,
43
"esp32h2": false
54
}
65
}

‎libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32c6": false,
43
"esp32h2": false
54
}
65
}

‎libraries/RainMaker/examples/RMakerSwitch/RMakerSwitch.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const char *service_name = "PROV_1234";
99
const char *pop = "abcd1234";
1010

1111
// GPIO for push button
12-
#if CONFIG_IDF_TARGET_ESP32C3
12+
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
1313
static int gpio_0 = 9;
1414
static int gpio_switch = 7;
1515
#else

‎libraries/RainMaker/examples/RMakerSwitch/ci.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"targets": {
3-
"esp32c6": false,
43
"esp32h2": false
54
}
65
}

‎package/package_esp32_index.template.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
"packager": "esp32",
4444
"name": "esp32-arduino-libs",
45-
"version": "idf-release_v5.1-dc859c1e67"
45+
"version": "idf-release_v5.1-b6b4727c58"
4646
},
4747
{
4848
"packager": "esp32",
@@ -105,63 +105,63 @@
105105
"tools": [
106106
{
107107
"name": "esp32-arduino-libs",
108-
"version": "idf-release_v5.1-dc859c1e67",
108+
"version": "idf-release_v5.1-b6b4727c58",
109109
"systems": [
110110
{
111111
"host": "i686-mingw32",
112-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
113-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
114-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
115-
"size": "307528289"
112+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
113+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
114+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
115+
"size": "307857214"
116116
},
117117
{
118118
"host": "x86_64-mingw32",
119-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
120-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
121-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
122-
"size": "307528289"
119+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
120+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
121+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
122+
"size": "307857214"
123123
},
124124
{
125125
"host": "arm64-apple-darwin",
126-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
127-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
128-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
129-
"size": "307528289"
126+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
127+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
128+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
129+
"size": "307857214"
130130
},
131131
{
132132
"host": "x86_64-apple-darwin",
133-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
134-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
135-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
136-
"size": "307528289"
133+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
134+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
135+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
136+
"size": "307857214"
137137
},
138138
{
139139
"host": "x86_64-pc-linux-gnu",
140-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
141-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
142-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
143-
"size": "307528289"
140+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
141+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
142+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
143+
"size": "307857214"
144144
},
145145
{
146146
"host": "i686-pc-linux-gnu",
147-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
148-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
149-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
150-
"size": "307528289"
147+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
148+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
149+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
150+
"size": "307857214"
151151
},
152152
{
153153
"host": "aarch64-linux-gnu",
154-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
155-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
156-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
157-
"size": "307528289"
154+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
155+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
156+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
157+
"size": "307857214"
158158
},
159159
{
160160
"host": "arm-linux-gnueabihf",
161-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
162-
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
163-
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
164-
"size": "307528289"
161+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/9857de432bff7b2d0e1e7773fc7165e5732afa0b",
162+
"archiveFileName": "esp32-arduino-libs-9857de432bff7b2d0e1e7773fc7165e5732afa0b.zip",
163+
"checksum": "SHA-256:262cb750d87dd3a865205ce820c1f5ffdc757cef6cf71306b927c6985f5a2202",
164+
"size": "307857214"
165165
}
166166
]
167167
},

0 commit comments

Comments
 (0)