Skip to content

Commit 319a8b5

Browse files
Jerry-ESPmarciogranzottorestyled-commits
authored
Fix streamer_esp32.cpp for current esp-idf master branch (project-chip#29814) (project-chip#32940)
* Fix streamer_esp32.cpp for current esp-idf main branch * Restyled by clang-format --------- Co-authored-by: Marcio Granzotto Rodrigues <oscensores@gmail.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 8956bbb commit 319a8b5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/lib/shell/streamer_esp32.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ int streamer_esp32_init(streamer_t * streamer)
5656
fsync(fileno(stdout));
5757
setvbuf(stdin, NULL, _IONBF, 0);
5858
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
59-
esp_vfs_dev_uart_port_set_rx_line_endings(CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CR);
60-
esp_vfs_dev_uart_port_set_tx_line_endings(CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CRLF);
61-
if (!uart_is_driver_installed(CONFIG_ESP_CONSOLE_UART_NUM))
59+
esp_vfs_dev_uart_port_set_rx_line_endings((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CR);
60+
esp_vfs_dev_uart_port_set_tx_line_endings((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CRLF);
61+
if (!uart_is_driver_installed((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM))
6262
{
63-
ESP_ERROR_CHECK(uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0));
63+
ESP_ERROR_CHECK(uart_driver_install((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0));
6464
}
6565
uart_config_t uart_config = {
6666
.baud_rate = CONFIG_ESP_CONSOLE_UART_BAUDRATE,
@@ -75,7 +75,7 @@ int streamer_esp32_init(streamer_t * streamer)
7575
.source_clk = UART_SCLK_APB,
7676
#endif
7777
};
78-
ESP_ERROR_CHECK(uart_param_config(CONFIG_ESP_CONSOLE_UART_NUM, &uart_config));
78+
ESP_ERROR_CHECK(uart_param_config((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, &uart_config));
7979
esp_vfs_dev_uart_use_driver(0);
8080
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
8181

@@ -122,7 +122,7 @@ ssize_t streamer_esp32_read(streamer_t * streamer, char * buf, size_t len)
122122
ssize_t streamer_esp32_write(streamer_t * streamer, const char * buf, size_t len)
123123
{
124124
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
125-
return uart_write_bytes(CONFIG_ESP_CONSOLE_UART_NUM, buf, len);
125+
return uart_write_bytes((uart_port_t) CONFIG_ESP_CONSOLE_UART_NUM, buf, len);
126126
#endif
127127
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
128128
return usb_serial_jtag_write_bytes(buf, len, 0);

0 commit comments

Comments
 (0)