andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reducing confusion?

This commit is contained in:
rusefi 2020-05-04 20:52:32 -04:00
parent e6e5d99303
commit 0efcb8f7c1
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/config/boards/skeleton/efifeatures.h
View File

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

3
firmware/config/stm32f7ems/efifeatures.h
View File

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

3
firmware/console/binary/tunerstudio_io.cpp
View File

@ -87,6 +87,9 @@ void startTsPort(ts_channel_s *tsChannel) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
#if defined(CONSOLE_USB_DEVICE) #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"); print("TunerStudio over USB serial");
/** /**
* This method contains a long delay, that's the reason why this is not done on the main thread * This method contains a long delay, that's the reason why this is not done on the main thread