reducing confusion?

firmware/config/boards/skeleton/efifeatures.h

@@ -104,9 +104,6 @@
 #endif /* EFI_ENABLE_MOCK_ADC */
 
 
-//#define EFI_UART_ECHO_TEST_MODE TRUE
-
-
 #define EFI_ICU_INPUTS TRUE
 
 #ifndef HAL_TRIGGER_USE_PAL
@@ -311,7 +308,7 @@
  */
 #define TS_UART_DMA_MODE FALSE
 
-#define TS_UART_DEVICE (&UARTD3)
+//#define TS_UART_DEVICE (&UARTD3)
 #define TS_SERIAL_DEVICE (&SD3)
 
 // todo: add DMA-mode for Console?
@@ -365,8 +362,6 @@
 #define EFI_CONSOLE_SERIAL_DEVICE (&SD1)
 //#define EFI_CONSOLE_SERIAL_DEVICE (&SDU1)
 #define EFI_UART_ECHO_TEST_MODE TRUE
-#define TS_UART_DEVICE (&UARTD3)
-#define TS_SERIAL_DEVICE (&SD3)
 
 // USART3 is Alternate Function 7, UART4 is AF8
 // todo: start using consoleSerial{Tx,Rx}Pin

firmware/config/stm32f7ems/efifeatures.h

@@ -85,7 +85,8 @@
 #define TS_UART_DMA_MODE FALSE
 
 #undef TS_UART_DEVICE
-#define TS_UART_DEVICE (&UARTD3)
+//#define TS_UART_DEVICE (&UARTD3)
+
 #undef TS_SERIAL_DEVICE
 #define TS_SERIAL_DEVICE (&SD3)
 

firmware/console/binary/tunerstudio_io.cpp

@@ -87,6 +87,9 @@ void startTsPort(ts_channel_s *tsChannel) {
 
 	#if EFI_PROD_CODE
 		#if defined(CONSOLE_USB_DEVICE)
+#if defined(TS_UART_DEVICE)
+#error 	"cannot have TS_UART_DEVICE and CONSOLE_USB_DEVICE"
+#endif
 			print("TunerStudio over USB serial");
 			/**
 			 * This method contains a long delay, that's the reason why this is not done on the main thread