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

make build happy (#3067)

This commit is contained in:
Matthew Kennedy 2021-07-26 06:08:05 -07:00 committed by GitHub
parent ac508c3321
commit d2003d24a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/proteus/board.mk
View File

@ -29,9 +29,7 @@ ifneq ($(PROJECT_CPU),ARCH_STM32H7)
endif endif
# disable hardware serial ports on H7 # disable hardware serial ports on H7
ifeq ($(PROJECT_CPU),ARCH_STM32H7) ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DTS_NO_PRIMARY -DTS_NO_SECONDARY
else
# Hardware serial port on UART 2 -> PD5/PD6 # Hardware serial port on UART 2 -> PD5/PD6
DDEFS += -DSTM32_UART_USE_USART2=TRUE DDEFS += -DSTM32_UART_USE_USART2=TRUE
DDEFS += -DTS_PRIMARY_UART=UARTD2 DDEFS += -DTS_PRIMARY_UART=UARTD2

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

@ -36,10 +36,9 @@
#undef EFI_USE_UART_DMA #undef EFI_USE_UART_DMA
#define EFI_USE_UART_DMA FALSE #define EFI_USE_UART_DMA FALSE
#undef TS_PRIMARY_UART // UART driver not implemented on F7
#undef TS_SECONDARY_UART #define TS_NO_PRIMARY
#undef TS_PRIMARY_SERIAL #define TS_NO_SECONDARY
#undef TS_SECONDARY_SERIAL
#define AUX_SERIAL_DEVICE (&SD6) #define AUX_SERIAL_DEVICE (&SD6)

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

@ -9,6 +9,18 @@
#pragma once #pragma once
#include "global.h" #include "global.h"
#if (!defined(TS_NO_PRIMARY) && (defined(TS_PRIMARY_UART) || defined(TS_PRIMARY_SERIAL)))
#define HAS_PRIMARY true
#else
#define HAS_PRIMARY false
#endif
#if (!defined(TS_NO_SECONDARY) && (defined(TS_SECONDARY_UART) || defined(TS_SECONDARY_SERIAL)))
#define HAS_SECONDARY true
#else
#define HAS_SECONDARY false
#endif
#if EFI_USB_SERIAL #if EFI_USB_SERIAL
#include "usbconsole.h" #include "usbconsole.h"
#endif // EFI_USB_SERIAL #endif // EFI_USB_SERIAL

2
firmware/console/binary/tunerstudio_io_serial.cpp
View File

@ -4,6 +4,7 @@
#include "tunerstudio_io.h" #include "tunerstudio_io.h"
#if HAS_PRIMARY || HAS_PRIMARY
#if HAL_USE_SERIAL #if HAL_USE_SERIAL
void SerialTsChannel::start(uint32_t baud) { void SerialTsChannel::start(uint32_t baud) {
SerialConfig cfg = { SerialConfig cfg = {
@ -64,3 +65,4 @@ size_t UartTsChannel::readTimeout(uint8_t* buffer, size_t size, int timeout) {
return size; return size;
} }
#endif // HAL_USE_UART #endif // HAL_USE_UART
#endif // HAS_PRIMARY || HAS_PRIMARY

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

@ -4,25 +4,13 @@
* @date Mar 26, 2021 * @date Mar 26, 2021
*/ */
#include "engine.h" #include "pch.h"
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
#include "tunerstudio.h" #include "tunerstudio.h"
#include "tunerstudio_io.h" #include "tunerstudio_io.h"
#include "connector_uart_dma.h" #include "connector_uart_dma.h"
#if (!defined(TS_NO_PRIMARY) && (defined(TS_PRIMARY_UART) || defined(TS_PRIMARY_SERIAL)))
#define HAS_PRIMARY true
#else
#define HAS_PRIMARY false
#endif
#if (!defined(TS_NO_SECONDARY) && (defined(TS_SECONDARY_UART) || defined(TS_SECONDARY_SERIAL)))
#define HAS_SECONDARY true
#else
#define HAS_SECONDARY false
#endif
#if HAS_PRIMARY #if HAS_PRIMARY
#ifdef TS_PRIMARY_UART #ifdef TS_PRIMARY_UART
#if EFI_USE_UART_DMA #if EFI_USE_UART_DMA