From e5f7da0802c70fc4c196c28c6367bff498fa4734 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 14 Mar 2022 12:04:38 +0100 Subject: [PATCH] Start VCP serial according to config --- radio/src/main.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/radio/src/main.cpp b/radio/src/main.cpp index d99b76f4f..ba551d95e 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -94,9 +94,11 @@ void onUSBConnectMenu(const char *result) else if (result == STR_USB_JOYSTICK) { setSelectedUsbMode(USB_JOYSTICK_MODE); } +#if defined(USB_SERIAL) else if (result == STR_USB_SERIAL) { setSelectedUsbMode(USB_SERIAL_MODE); } +#endif else if (result == STR_EXIT) { _usbDisabled = true; } @@ -159,15 +161,7 @@ void handleUsbConnection() } #if defined(USB_SERIAL) else if (getSelectedUsbMode() == USB_SERIAL_MODE) { - // TODO: query USB serial mode - // -> for now, only CLI / DEBUG / LUA -#if defined(CLI) - serialInit(SP_VCP, UART_MODE_CLI); -#elif defined(DEBUG) - serialInit(SP_VCP, UART_MODE_DEBUG); -#elif defined(LUA) - serialInit(SP_VCP, UART_MODE_LUA); -#endif + serialInit(SP_VCP, serialGetMode(SP_VCP)); } #endif