espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/linenoise_probe' into 'master'

Browse Source 
console: fix linenoiseProbe never timing out

Closes IDFCI-387

See merge request espressif/esp-idf!12012
This commit is contained in:
Ivan Grokhotkov
2021-01-15 19:31:14 +08:00
parent c0d6b18e88 9b2b86b7d9
commit 9cb3ac94c4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/console/linenoise/linenoise.c
View File

@@ -935,13 +935,17 @@ int linenoiseProbe(void) {
/* Try to read response */ /* Try to read response */
int timeout_ms = 200; int timeout_ms = 200;
const int retry_ms = 10;
size_t read_bytes = 0; size_t read_bytes = 0;
while (timeout_ms > 0 && read_bytes < 4) { // response is ESC[0n or ESC[3n while (timeout_ms > 0 && read_bytes < 4) { // response is ESC[0n or ESC[3n
usleep(10000); usleep(retry_ms * 1000);
timeout_ms -= retry_ms;
char c; char c;
int cb = read(stdin_fileno, &c, 1); int cb = read(stdin_fileno, &c, 1);
if (cb < 0) {
continue;
}
read_bytes += cb; read_bytes += cb;
timeout_ms--;
} }
/* Restore old mode */ /* Restore old mode */
flags &= ~O_NONBLOCK; flags &= ~O_NONBLOCK;