From a09fcb0292203f1e30c4523cb223d7b20968fbf3 Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Wed, 19 Jul 2023 08:45:16 -0500 Subject: [PATCH] bug(cli): fix conversion error * Updated cli component so that CONFIG_ESP_CONSOLE_UART_NUM is cast to uart_port_t to prevent compiler warning that is treated as an error with latest esp-idf master branch. --- components/cli/include/cli.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/components/cli/include/cli.hpp b/components/cli/include/cli.hpp index 1a26dd590..e1ac48f78 100644 --- a/components/cli/include/cli.hpp +++ b/components/cli/include/cli.hpp @@ -79,14 +79,17 @@ class Cli : private cli::CliSession { #endif }; /* Install UART driver for interrupt-driven reads and writes */ - ESP_ERROR_CHECK(uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0)); - ESP_ERROR_CHECK(uart_param_config(CONFIG_ESP_CONSOLE_UART_NUM, &uart_config)); + ESP_ERROR_CHECK( + uart_driver_install((uart_port_t)CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0)); + ESP_ERROR_CHECK(uart_param_config((uart_port_t)CONFIG_ESP_CONSOLE_UART_NUM, &uart_config)); /* Tell VFS to use UART driver */ - esp_vfs_dev_uart_use_driver(CONFIG_ESP_CONSOLE_UART_NUM); + esp_vfs_dev_uart_use_driver((uart_port_t)CONFIG_ESP_CONSOLE_UART_NUM); /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */ - esp_vfs_dev_uart_port_set_rx_line_endings(CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CR); + esp_vfs_dev_uart_port_set_rx_line_endings((uart_port_t)CONFIG_ESP_CONSOLE_UART_NUM, + ESP_LINE_ENDINGS_CR); /* Move the caret to the beginning of the next line on '\n' */ - esp_vfs_dev_uart_port_set_tx_line_endings(CONFIG_ESP_CONSOLE_UART_NUM, ESP_LINE_ENDINGS_CRLF); + esp_vfs_dev_uart_port_set_tx_line_endings((uart_port_t)CONFIG_ESP_CONSOLE_UART_NUM, + ESP_LINE_ENDINGS_CRLF); #else // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG usb_serial_jtag_driver_config_t cfg = USB_SERIAL_JTAG_DRIVER_CONFIG_DEFAULT(); usb_serial_jtag_driver_install(&cfg);