Skip to content

Commit 6eaf6cf

Browse files
authored
Merge pull request #142 from espressif/master
update 31052022
2 parents 0baeb19 + 33011ed commit 6eaf6cf

Some content is hidden

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

43 files changed

+575
-168
lines changed

boards.txt

Lines changed: 288 additions & 156 deletions
Large diffs are not rendered by default.

cores/esp32/esp32-hal-uart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void uartSetPins(uart_t* uart, int8_t rxPin, int8_t txPin, int8_t ctsPin, int8_t
115115
}
116116
UART_MUTEX_LOCK();
117117
// IDF uart_set_pin() will issue necessary Error Message and take care of all GPIO Number validation.
118-
uart_set_pin(uart->num, txPin, rxPin, ctsPin, rtsPin);
118+
uart_set_pin(uart->num, txPin, rxPin, rtsPin, ctsPin);
119119
UART_MUTEX_UNLOCK();
120120
}
121121

Lines changed: 188 additions & 0 deletions

tools/partitions/bare_minimum_2MB.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 36K, 20K,
3+
factory, app, factory, 64K, 1900K,
64 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)