Skip to content

fix(cli): Fix deprecation warning #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
finger563 merged 1 commit into from
Feb 6, 2025
Merged

fix(cli): Fix deprecation warning #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ endif()
idf_component_register(
INCLUDE_DIRS ${CLI_INCLUDES}
SRC_DIRS "src"
REQUIRES driver vfs logger)
REQUIRES driver esp_driver_uart esp_driver_usb_serial_jtag vfs logger)
15 changes: 9 additions & 6 deletions components/cli/include/cli.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
#define __linux__

#include "driver/uart.h"
#include "driver/uart_vfs.h"
#include "driver/usb_serial_jtag.h"
#include "driver/usb_serial_jtag_vfs.h"
#include "esp_err.h"
#include "esp_system.h"

#include "esp_vfs_dev.h"
#include "esp_vfs_usb_serial_jtag.h"

Expand Down Expand Up @@ -135,11 +138,11 @@ class Cli : private cli::CliSession {
ESP_ERROR_CHECK(uart_driver_install(port, 256, 0, 0, NULL, 0));
ESP_ERROR_CHECK(uart_param_config(port, &uart_config));
/* Tell VFS to use UART driver */
esp_vfs_dev_uart_use_driver(port);
uart_vfs_dev_use_driver(port);
/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
esp_vfs_dev_uart_port_set_rx_line_endings(port, ESP_LINE_ENDINGS_CR);
uart_vfs_dev_port_set_rx_line_endings(port, 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(port, ESP_LINE_ENDINGS_CRLF);
uart_vfs_dev_port_set_tx_line_endings(port, ESP_LINE_ENDINGS_CRLF);

fflush(stdout);
fsync(fileno(stdout));
Expand Down Expand Up @@ -171,9 +174,9 @@ class Cli : private cli::CliSession {

usb_serial_jtag_driver_config_t cfg = USB_SERIAL_JTAG_DRIVER_CONFIG_DEFAULT();
usb_serial_jtag_driver_install(&cfg);
esp_vfs_usb_serial_jtag_use_driver();
esp_vfs_dev_usb_serial_jtag_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
esp_vfs_dev_usb_serial_jtag_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
usb_serial_jtag_vfs_use_driver();
usb_serial_jtag_vfs_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
usb_serial_jtag_vfs_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);

fflush(stdout);
fsync(fileno(stdout));
Expand Down