Skip to content
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

Support for CONSOLE_USB_CDC and CONSOLE_USB_SERIAL_JTAG in modem_console example. (IDFGH-13937) #675

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for CONSOLE_USB_CDC and CONSOLE_USB_SERIAL_JTAG in modem_console example. (IDFGH-13937) #675

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
6 changes: 5 additions & 1 deletion components/esp_modem/examples/modem_console/main/console_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ void ConsoleCommand::RegisterCommand(const char *command, const char *help, cons
.help = help,
.hint = nullptr,
.func = command_func_pts[last_command],
.argtable = &arg_table[0]
.argtable = &arg_table[0],
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
.func_w_context = nullptr,
.context = nullptr
#endif
};
ESP_ERROR_CHECK(esp_console_cmd_register(&command_def));
last_command++;
Expand Down
16 changes: 16 additions & 0 deletions components/esp_modem/examples/modem_console/main/modem_console_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,25 @@ extern "C" void app_main(void)

// init console REPL environment
esp_console_repl_config_t repl_config = ESP_CONSOLE_REPL_CONFIG_DEFAULT();
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
#if defined(CONFIG_ESP_CONSOLE_UART_DEFAULT) || defined(CONFIG_ESP_CONSOLE_UART_CUSTOM)
#endif

esp_console_dev_uart_config_t uart_config = ESP_CONSOLE_DEV_UART_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_console_new_repl_uart(&uart_config, &repl_config, &s_repl));

#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
#elif defined(CONFIG_ESP_CONSOLE_USB_CDC)
esp_console_dev_usb_cdc_config_t hw_config = ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_console_new_repl_usb_cdc(&hw_config, &repl_config, &s_repl));
#elif defined(CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
esp_console_dev_usb_serial_jtag_config_t hw_config = ESP_CONSOLE_DEV_USB_SERIAL_JTAG_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_console_new_repl_usb_serial_jtag(&hw_config, &repl_config, &s_repl));
#else
#error Unsupported console type
#endif
#endif // ESP_IDF_VERSION

switch (esp_sleep_get_wakeup_cause()) {
case ESP_SLEEP_WAKEUP_TIMER:
if (esp_modem::modem_mode::CMUX_MODE == mode_rtc) {
Expand Down
Loading