Default binary should have more relaxed pinout: serial fix #4998

we can now simplify code a bit
This commit is contained in:
rusefillc 2023-01-23 08:10:23 -05:00
parent 40520de120
commit 91923771d7
13 changed files with 3 additions and 36 deletions

View File

@ -11,9 +11,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DFIRMWARE_ID=\"hellenE67\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
# No hardware serial TS
DDEFS += -DTS_NO_PRIMARY=1
include $(BOARDS_DIR)/hellen/hellen-common144.mk

View File

@ -11,9 +11,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen-honda-k\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -11,9 +11,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen121nissan\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -11,9 +11,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -13,9 +13,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -11,8 +11,8 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE)

View File

@ -11,9 +11,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellenNA6\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -13,9 +13,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -6,9 +6,6 @@ BOARDINC = $(BOARDS_DIR)/hellen/hellen81
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen81\"
#DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE

View File

@ -12,9 +12,6 @@ endif
DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card
DDEFS += -DTS_NO_PRIMARY=1
# Add them all together
DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE)

View File

@ -24,7 +24,7 @@ DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::B10 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::B
# on MRE 0.6.0 we have SD card on SPI2 which shared channel 3 with USART3
# todo: enable serial which would not DMA thus not conflict?
DDEFS += -DSTM32_UART_USE_USART3=FALSE -DHAL_USE_UART=FALSE
DDEFS += -DEFI_USE_UART_DMA=FALSE -DTS_NO_PRIMARY=TRUE
DDEFS += -DEFI_USE_UART_DMA=FALSE
# maybe a way to disable SPI2 privately
#DDEFS += -DSTM32_SPI_USE_SPI2=FALSE

View File

@ -5,9 +5,6 @@ PROJECT_CPU = ARCH_STM32F4
DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::C11
# No serial ports for now
DDEFS += -DTS_NO_PRIMARY=TRUE
# No USB
DDEFS += -DEFI_USB_SERIAL=FALSE

View File

@ -43,9 +43,6 @@
#define EFI_USE_UART_DMA FALSE
// UART driver not implemented on F7
#ifndef TS_NO_PRIMARY
#define TS_NO_PRIMARY 1
#endif
#define AUX_SERIAL_DEVICE (&SD6)