From 5945e5fc193936dfccedb1d12066b8dc549c58f8 Mon Sep 17 00:00:00 2001 From: Jasper Koolhaas Date: Thu, 31 Oct 2024 14:21:21 +0100 Subject: [PATCH] feat(modem): Updated console example to support other console types, fixed warning --- .../modem_console/main/console_helper.cpp | 6 +++++- .../modem_console/main/modem_console_main.cpp | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/components/esp_modem/examples/modem_console/main/console_helper.cpp b/components/esp_modem/examples/modem_console/main/console_helper.cpp index be8d369c69..500d12bd3c 100644 --- a/components/esp_modem/examples/modem_console/main/console_helper.cpp +++ b/components/esp_modem/examples/modem_console/main/console_helper.cpp @@ -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++; diff --git a/components/esp_modem/examples/modem_console/main/modem_console_main.cpp b/components/esp_modem/examples/modem_console/main/modem_console_main.cpp index ac4b8f604c..4779679867 100644 --- a/components/esp_modem/examples/modem_console/main/modem_console_main.cpp +++ b/components/esp_modem/examples/modem_console/main/modem_console_main.cpp @@ -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) {