Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 357db7c

Browse files
authoredJul 31, 2024··
Merge branch 'master' into c6h2_lightsleep_uart_issue
2 parents 6cf3d68 + ad5aaf8 commit 357db7c

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed
 

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
22

3-
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
3+
[![Build Status](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml/badge.svg?branch=master&event=push)](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
44

55
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
66

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ static bool ledcDetachBus(void *bus) {
5252
bool channel_found = false;
5353
// Check if more pins are attached to the same ledc channel
5454
for (uint8_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
55-
if (!perimanPinIsValid(i)) {
56-
continue; //invalid pin, skip
55+
if (!perimanPinIsValid(i) || i == handle->pin) {
56+
continue; //invalid pin or same pin
5757
}
5858
peripheral_bus_type_t type = perimanGetPinBusType(i);
5959
if (type == ESP32_BUS_TYPE_LEDC) {

‎libraries/Network/src/NetworkUdp.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,14 @@ int NetworkUDP::parsePacket() {
296296
}
297297
struct sockaddr_storage si_other_storage; // enough storage for v4 and v6
298298
socklen_t slen = sizeof(sockaddr_storage);
299-
int len;
299+
int len = 0;
300+
if (ioctl(udp_server, FIONREAD, &len) == -1) {
301+
log_e("could not check for data in buffer length: %d", errno);
302+
return 0;
303+
}
304+
if (!len) {
305+
return 0;
306+
}
300307
char *buf = (char *)malloc(1460);
301308
if (!buf) {
302309
return 0;

0 commit comments

Comments
 (0)
Please sign in to comment.