Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/console_allow_buffered_v3.2' into 'release/v3.2'

Browse source 
console example: use buffered stdout by default (backport v3.2)

See merge request idf/esp-idf!4507
This commit is contained in:
Jiang Jiang Jian 2019-03-15 14:03:29 +08:00
parent c97a05c0d5 6494927766
commit b6687e56ed
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/console/linenoise/linenoise.c
View file

@ -106,6 +106,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdio_ext.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -879,6 +880,9 @@ static int linenoiseEdit(char *buf, size_t buflen, const char *prompt)
linenoiseEditDeletePrevWord(&l); linenoiseEditDeletePrevWord(&l);
break; break;
} }
if (__fbufsize(stdout) > 0) {
fflush(stdout);
}
} }
return l.len; return l.len;
} }

3
examples/ethernet/iperf/main/iperf_example_main.c
View file

@ -56,9 +56,8 @@ static void initialize_nvs()
static void initialize_console() static void initialize_console()
{ {
/* Disable buffering on stdin and stdout */ /* Disable buffering on stdin */
setvbuf(stdin, NULL, _IONBF, 0); setvbuf(stdin, NULL, _IONBF, 0);
setvbuf(stdout, NULL, _IONBF, 0);
/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */ /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR); esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);

3
examples/peripherals/i2c/i2c_tools/main/i2ctools_example_main.c
View file

@ -56,9 +56,8 @@ static void initialize_nvs()
static void initialize_console() static void initialize_console()
{ {
/* Disable buffering on stdin and stdout */ /* Disable buffering on stdin */
setvbuf(stdin, NULL, _IONBF, 0); setvbuf(stdin, NULL, _IONBF, 0);
setvbuf(stdout, NULL, _IONBF, 0);
/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */ /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR); esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);

3
examples/system/console/main/console_example_main.c
View file

@ -59,9 +59,8 @@ static void initialize_nvs()
static void initialize_console() static void initialize_console()
{ {
/* Disable buffering on stdin and stdout */ /* Disable buffering on stdin */
setvbuf(stdin, NULL, _IONBF, 0); setvbuf(stdin, NULL, _IONBF, 0);
setvbuf(stdout, NULL, _IONBF, 0);
/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */ /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR); esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);

3
examples/wifi/iperf/main/iperf_example_main.c
View file

@ -28,9 +28,8 @@
static void initialize_console() static void initialize_console()
{ {
/* Disable buffering on stdin and stdout */ /* Disable buffering on stdin */
setvbuf(stdin, NULL, _IONBF, 0); setvbuf(stdin, NULL, _IONBF, 0);
setvbuf(stdout, NULL, _IONBF, 0);
/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */ /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR); esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);

3
examples/wifi/simple_sniffer/main/simple_sniffer_example_main.c
View file

@ -75,9 +75,8 @@ static void initialize_wifi()
/* Initialize console component */ /* Initialize console component */
static void initialize_console() static void initialize_console()
{ {
/* Disable buffering on stdin and stdout */ /* Disable buffering on stdin */
setvbuf(stdin, NULL, _IONBF, 0); setvbuf(stdin, NULL, _IONBF, 0);
setvbuf(stdout, NULL, _IONBF, 0);
/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */ /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR); esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);