feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

unity: unity_gets remove unnecessary UINT8_MAX clamp + extra comments

Browse Source
This commit is contained in:
MacDue
2022-02-03 10:09:32 +00:00
parent f19f43dce1
commit ef25590277
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/unity/unity_port_esp32.c
View File

@@ -42,18 +42,20 @@ static void esp_unity_readline(char* dst, size_t len)
continue; continue;
} }
if (c == '\r' || c == '\n') { if (c == '\r' || c == '\n') {
/* Add null terminator and return on newline */
unity_putc('\n'); unity_putc('\n');
dst[write_index] = '\0'; dst[write_index] = '\0';
return; return;
} else if (c == '\b') { } else if (c == '\b') {
if (write_index > 0) { if (write_index > 0) {
/* Delete previously entered character */
write_index--; write_index--;
// Delete previously entered character
esp_rom_uart_tx_one_char('\b'); esp_rom_uart_tx_one_char('\b');
esp_rom_uart_tx_one_char(' '); esp_rom_uart_tx_one_char(' ');
esp_rom_uart_tx_one_char('\b'); esp_rom_uart_tx_one_char('\b');
} }
} else if (write_index < len - 1 && !iscontrol(c)) { } else if (len > 0 && write_index < len - 1 && !iscontrol(c)) {
/* Write a max of len - 1 characters to allow for null terminator */
unity_putc(c); unity_putc(c);
dst[write_index++] = c; dst[write_index++] = c;
} }
@@ -79,14 +81,9 @@ void unity_gets(char *dst, size_t len)
memset(unity_input_from_gdb, 0, sizeof(unity_input_from_gdb)); memset(unity_input_from_gdb, 0, sizeof(unity_input_from_gdb));
return; return;
} }
/* esp_rom_uart_rx_string length argument is uint8_t */
if (len >= UINT8_MAX) {
len = UINT8_MAX;
}
/* Flush anything already in the RX buffer */ /* Flush anything already in the RX buffer */
uint8_t ignore; uint8_t ignore;
while (esp_rom_uart_rx_one_char(&ignore) == 0) { while (esp_rom_uart_rx_one_char(&ignore) == 0) { }
}
/* Read input */ /* Read input */
esp_unity_readline(dst, len); esp_unity_readline(dst, len);
} }