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

Refactoring: less confusion macro names around serial/uart/etc in connectivity fix #4999

This commit is contained in:
rusefillc 2023-01-23 05:26:59 -05:00
parent 083bafb3ba
commit c1fea618f9
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/cypress/efifeatures.h
View File

@ -272,7 +272,7 @@
#define TS_CAN_DEVICE_SHORT_PACKETS_IN_ONE_FRAME
#undef TS_PRIMARY_UxART_PORT
#undef TS_SECONDARY_PORT
#undef TS_SECONDARY_UxART_PORT
#define EFI_USB_SERIAL TRUE
#define EFI_CONSOLE_USB_DEVICE SDU1

2
firmware/config/boards/kinetis/efifeatures.h
View File

@ -260,7 +260,7 @@
#define EFI_USE_UART_DMA FALSE
#define TS_PRIMARY_UxART_PORT UARTD2
#undef TS_SECONDARY_PORT
#undef TS_SECONDARY_UxART_PORT
#define EFI_CONSOLE_TX_BRAIN_PIN Gpio::A10
#define EFI_CONSOLE_RX_BRAIN_PIN Gpio::A11

2
firmware/config/boards/prometheus/efifeatures.h
View File

@ -40,7 +40,7 @@
#undef EFI_UART_GPS
#define EFI_UART_GPS FALSE
#undef TS_SECONDARY_PORT
#undef TS_SECONDARY_UxART_PORT
#undef EFI_BLUETOOTH_SETUP
#define EFI_BLUETOOTH_SETUP TRUE

2
firmware/config/boards/subaru_eg33/efifeatures.h
View File

@ -25,7 +25,7 @@
#define TS_PRIMARY_UxART_PORT SD1
// no secondary channel
#undef TS_SECONDARY_PORT
#undef TS_SECONDARY_UxART_PORT
/* Knock detection */
#undef EFI_HIP_9011

2
firmware/config/stm32f4ems/efifeatures.h
View File

@ -398,7 +398,7 @@
#define TS_PRIMARY_UxART_PORT UARTD3
#endif
#undef TS_SECONDARY_PORT
#undef TS_SECONDARY_UxART_PORT
#define AUX_SERIAL_DEVICE (&SD6)

2
firmware/console/binary/tunerstudio_io.h
View File

@ -16,7 +16,7 @@
#define HAS_UxART_PRIMARY false
#endif
#if (!TS_NO_SECONDARY && defined(TS_SECONDARY_PORT))
#if (!TS_NO_SECONDARY && defined(TS_SECONDARY_UxART_PORT))
#define HAS_UxART_SECONDARY true
#else
#define HAS_UxART_SECONDARY false

8
firmware/console/binary/tunerstudio_io_serial_ports.cpp
View File

@ -59,16 +59,16 @@ class SerialTsChannel;
#endif // HAS_UxART_PRIMARY
#if HAS_UxART_SECONDARY
#ifdef TS_SECONDARY_PORT
#ifdef TS_SECONDARY_UxART_PORT
std::conditional_t<
std::is_same_v<decltype(TS_SECONDARY_PORT), UARTDriver>,
std::is_same_v<decltype(TS_SECONDARY_UxART_PORT), UARTDriver>,
#if EFI_USE_UART_DMA
UartDmaTsChannel,
#else // EFI_USE_UART_DMA
UartTsChannel,
#endif // EFI_USE_UART_DMA
SerialTsChannel> secondaryChannel(TS_SECONDARY_PORT);
#endif // TS_SECONDARY_PORT
SerialTsChannel> secondaryChannel(TS_SECONDARY_UxART_PORT);
#endif // TS_SECONDARY_UxART_PORT
struct SecondaryChannelThread : public TunerstudioThread {

2
simulator/simulator/efifeatures.h
View File

@ -9,7 +9,7 @@
// see SIM_SD1_PORT and SIM_SD2_PORT
#define TS_PRIMARY_UxART_PORT SD1
#define TS_SECONDARY_PORT SD2
#define TS_SECONDARY_UxART_PORT SD2
#define EFI_ENABLE_ASSERTS TRUE
#define EFI_LAUNCH_CONTROL TRUE