From 76db44e8ce8b1f6ed2bdcb621755d0b107b7147f Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Tue, 22 Aug 2017 16:27:57 -0400 Subject: [PATCH 1/2] openssl_client, openssl_server example: Fix misspelling of PRIORITY in OPENSSL_EXAMPLE_TASK_PRIORITY Merges https://github.com/espressif/esp-idf/pull/929 --- examples/protocols/openssl_client/main/openssl_client_example.h | 2 +- .../protocols/openssl_client/main/openssl_client_example_main.c | 2 +- examples/protocols/openssl_server/main/openssl_server_example.h | 2 +- .../protocols/openssl_server/main/openssl_server_example_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/protocols/openssl_client/main/openssl_client_example.h b/examples/protocols/openssl_client/main/openssl_client_example.h index 7b6ef8d403..fbdecb0d27 100644 --- a/examples/protocols/openssl_client/main/openssl_client_example.h +++ b/examples/protocols/openssl_client/main/openssl_client_example.h @@ -33,7 +33,7 @@ #define OPENSSL_EXAMPLE_TASK_NAME "openssl_example" #define OPENSSL_EXAMPLE_TASK_STACK_WORDS 10240 -#define OPENSSL_EXAMPLE_TASK_PRORIOTY 8 +#define OPENSSL_EXAMPLE_TASK_PRIORITY 8 #define OPENSSL_EXAMPLE_RECV_BUF_LEN 1024 diff --git a/examples/protocols/openssl_client/main/openssl_client_example_main.c b/examples/protocols/openssl_client/main/openssl_client_example_main.c index cf9d14d41c..691dbde37c 100644 --- a/examples/protocols/openssl_client/main/openssl_client_example_main.c +++ b/examples/protocols/openssl_client/main/openssl_client_example_main.c @@ -169,7 +169,7 @@ static void openssl_example_client_init(void) OPENSSL_EXAMPLE_TASK_NAME, OPENSSL_EXAMPLE_TASK_STACK_WORDS, NULL, - OPENSSL_EXAMPLE_TASK_PRORIOTY, + OPENSSL_EXAMPLE_TASK_PRIORITY, &openssl_handle); if (ret != pdPASS) { diff --git a/examples/protocols/openssl_server/main/openssl_server_example.h b/examples/protocols/openssl_server/main/openssl_server_example.h index bdb84bae5c..8097b2b741 100755 --- a/examples/protocols/openssl_server/main/openssl_server_example.h +++ b/examples/protocols/openssl_server/main/openssl_server_example.h @@ -23,7 +23,7 @@ #define OPENSSL_EXAMPLE_TASK_NAME "openssl_example" #define OPENSSL_EXAMPLE_TASK_STACK_WORDS 10240 -#define OPENSSL_EXAMPLE_TASK_PRORIOTY 8 +#define OPENSSL_EXAMPLE_TASK_PRIORITY 8 #define OPENSSL_EXAMPLE_RECV_BUF_LEN 1024 diff --git a/examples/protocols/openssl_server/main/openssl_server_example_main.c b/examples/protocols/openssl_server/main/openssl_server_example_main.c index 00d5c5ba75..a765c35522 100755 --- a/examples/protocols/openssl_server/main/openssl_server_example_main.c +++ b/examples/protocols/openssl_server/main/openssl_server_example_main.c @@ -203,7 +203,7 @@ static void openssl_server_init(void) OPENSSL_EXAMPLE_TASK_NAME, OPENSSL_EXAMPLE_TASK_STACK_WORDS, NULL, - OPENSSL_EXAMPLE_TASK_PRORIOTY, + OPENSSL_EXAMPLE_TASK_PRIORITY, &openssl_handle); if (ret != pdPASS) { From 45ad0cdda25db970c7ee8ad61b8def0a603679c6 Mon Sep 17 00:00:00 2001 From: Simon Werner Date: Fri, 8 Sep 2017 11:08:34 +1200 Subject: [PATCH 2/2] Improved `uart_flush()` documentation. Improved `uart_flush()` documentation based on this discussion: https://esp32.com/viewtopic.php?f=13&t=2804&p=13377&hilit=uart_flush#p13373 Merges https://github.com/espressif/esp-idf/pull/970 --- components/driver/include/driver/uart.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/driver/include/driver/uart.h b/components/driver/include/driver/uart.h index de1b619f93..5cf3d08ec0 100644 --- a/components/driver/include/driver/uart.h +++ b/components/driver/include/driver/uart.h @@ -601,7 +601,7 @@ int uart_write_bytes_with_break(uart_port_t uart_num, const char* src, size_t si int uart_read_bytes(uart_port_t uart_num, uint8_t* buf, uint32_t length, TickType_t ticks_to_wait); /** - * @brief UART ring buffer flush + * @brief UART ring buffer flush. This will discard all data in the UART RX buffer. * * @param uart_num UART_NUM_0, UART_NUM_1 or UART_NUM_2 *