Allow use of usb_serial_debug even if usb_serial is not used.

paparazzi · Jan 30, 2023 · d33579f · d33579f
1 parent 31a1465
commit d33579f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sw/airborne/arch/chibios/halconf.h b/sw/airborne/arch/chibios/halconf.h
@@ -173,7 +173,7 @@
  * @brief   Enables the SERIAL over USB subsystem.
  */
 #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#if USE_USB_SERIAL
+#if USE_USB_SERIAL || USE_USB_SERIAL_DEBUG
 #define HAL_USE_SERIAL_USB                  TRUE
 #else
 #define HAL_USE_SERIAL_USB                  FALSE

diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c
@@ -54,7 +54,8 @@
 #if USE_ADC
 #include "mcu_periph/adc.h"
 #endif
-#if USE_USB_SERIAL
+#if USE_USB_SERIAL || USE_USB_SERIAL_DEBUG
+#define USING_USB_SERIAL 1
 #include "mcu_periph/usb_serial.h"
 #endif
 #ifdef USE_UDP
@@ -197,7 +198,7 @@ void mcu_init(void)
 #if USE_ADC
   adc_init();
 #endif
-#if USE_USB_SERIAL
+#if USING_USB_SERIAL
   VCOM_init();
 #endif
 
@@ -272,7 +273,7 @@ void mcu_event(void)
   softi2c_event();
 #endif
 
-#if USE_USB_SERIAL
+#if USING_USB_SERIAL
   VCOM_event();
 #endif
 }