diff --git a/firmware/config/boards/hellen/alphax-2chan/board.mk b/firmware/config/boards/hellen/alphax-2chan/board.mk index 05669e1fcb..96529bd57f 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board.mk +++ b/firmware/config/boards/hellen/alphax-2chan/board.mk @@ -2,7 +2,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # This board has trigger scope hardware! DDEFS += -DTRIGGER_SCOPE diff --git a/firmware/config/boards/hellen/alphax-4K-GDI/board.mk b/firmware/config/boards/hellen/alphax-4K-GDI/board.mk index 2194646dca..8d98af7a04 100644 --- a/firmware/config/boards/hellen/alphax-4K-GDI/board.mk +++ b/firmware/config/boards/hellen/alphax-4K-GDI/board.mk @@ -5,7 +5,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp include $(PROJECT_DIR)/hw_layer/ports/stm32/2mb_flash.mk -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + DDEFS += -DEFI_MC33816=TRUE DDEFS += -DBOARD_TLE9104_COUNT=4 DDEFS += -DLUA_USER_HEAP=92000 diff --git a/firmware/config/boards/hellen/alphax-4chan/board.mk b/firmware/config/boards/hellen/alphax-4chan/board.mk index 29ba49d987..4b89b55526 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board.mk +++ b/firmware/config/boards/hellen/alphax-4chan/board.mk @@ -2,7 +2,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together diff --git a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk index e4e83dfa6d..eed28294ae 100644 --- a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk @@ -2,7 +2,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/alphax-8chan/board.mk b/firmware/config/boards/hellen/alphax-8chan/board.mk index 367da4911c..b8bb497d67 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan/board.mk @@ -2,7 +2,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/alphax-silver/board.mk b/firmware/config/boards/hellen/alphax-silver/board.mk index 1ad3eeaaaa..141558db5a 100644 --- a/firmware/config/boards/hellen/alphax-silver/board.mk +++ b/firmware/config/boards/hellen/alphax-silver/board.mk @@ -2,7 +2,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # This board has two tle9104 DDEFS += -DBOARD_TLE9104_COUNT=2 diff --git a/firmware/config/boards/hellen/hellen-112-17/board.mk b/firmware/config/boards/hellen/hellen-112-17/board.mk index 50f322d26c..1b405686c9 100644 --- a/firmware/config/boards/hellen/hellen-112-17/board.mk +++ b/firmware/config/boards/hellen/hellen-112-17/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) # VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + #no mux on mm100 diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board.mk b/firmware/config/boards/hellen/hellen-gm-e67/board.mk index b39c9b32a9..70d611e128 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/board.mk +++ b/firmware/config/boards/hellen/hellen-gm-e67/board.mk @@ -3,8 +3,6 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellenE67\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen-honda-k/board.mk b/firmware/config/boards/hellen/hellen-honda-k/board.mk index d5263a99d9..103a5cfe5b 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/board.mk +++ b/firmware/config/boards/hellen/hellen-honda-k/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) # VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + DDEFS += -DEFI_KLINE=TRUE DDEFS += -DSTM32_SERIAL_USE_USART2=TRUE diff --git a/firmware/config/boards/hellen/hellen121nissan/board.mk b/firmware/config/boards/hellen/hellen121nissan/board.mk index f068c39c41..ba46e51052 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board.mk +++ b/firmware/config/boards/hellen/hellen121nissan/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_121_NISSAN_6_CYL endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen121nissan\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk index 007afc66e9..c9fac9f0bf 100644 --- a/firmware/config/boards/hellen/hellen121vag/board.mk +++ b/firmware/config/boards/hellen/hellen121vag/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_121_VAG_4_CYL endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk index aba5b92a1c..a1848e0ec6 100644 --- a/firmware/config/boards/hellen/hellen128/board.mk +++ b/firmware/config/boards/hellen/hellen128/board.mk @@ -9,7 +9,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk index 6672150fee..7065bd2e76 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + diff --git a/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk b/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk index df56d75ed4..776ccf88aa 100644 --- a/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + DDEFS += -DBOARD_MC33810_COUNT=1 DDEFS += -DBOARD_TLE9201_COUNT=1 diff --git a/firmware/config/boards/hellen/hellen81/board.mk b/firmware/config/boards/hellen/hellen81/board.mk index f85a7bdfb5..ecebc755bb 100644 --- a/firmware/config/boards/hellen/hellen81/board.mk +++ b/firmware/config/boards/hellen/hellen81/board.mk @@ -2,7 +2,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen81\" diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk index 28723bfc2b..98de93e500 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board.mk +++ b/firmware/config/boards/hellen/hellen88bmw/board.mk @@ -8,7 +8,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellenMiataNA6/board.mk b/firmware/config/boards/hellen/hellenMiataNA6/board.mk index 40f03a1c81..606d1ed93b 100644 --- a/firmware/config/boards/hellen/hellenMiataNA6/board.mk +++ b/firmware/config/boards/hellen/hellenMiataNA6/board.mk @@ -7,7 +7,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_MIATA_NA6 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellenNA6\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellenMiataNA96/board.mk b/firmware/config/boards/hellen/hellenMiataNA96/board.mk index d0d616b4cf..c69ea8f088 100644 --- a/firmware/config/boards/hellen/hellenMiataNA96/board.mk +++ b/firmware/config/boards/hellen/hellenMiataNA96/board.mk @@ -6,7 +6,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_MIATA_NA96 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellenMiataNB1/board.mk b/firmware/config/boards/hellen/hellenMiataNB1/board.mk index 820bcd2ed3..91d3bc78f9 100644 --- a/firmware/config/boards/hellen/hellenMiataNB1/board.mk +++ b/firmware/config/boards/hellen/hellenMiataNB1/board.mk @@ -6,7 +6,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=engine_type_e::MAZDA_MIATA_NB1 endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellenMiataNB2/board.mk b/firmware/config/boards/hellen/hellenMiataNB2/board.mk index b3d3b5c66b..2a3ce6cf37 100644 --- a/firmware/config/boards/hellen/hellenMiataNB2/board.mk +++ b/firmware/config/boards/hellen/hellenMiataNB2/board.mk @@ -9,7 +9,7 @@ ifeq ($(VAR_DEF_ENGINE_TYPE),) endif -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/uaefi/board.mk b/firmware/config/boards/hellen/uaefi/board.mk index c8fddfe490..ea185052da 100644 --- a/firmware/config/boards/hellen/uaefi/board.mk +++ b/firmware/config/boards/hellen/uaefi/board.mk @@ -3,7 +3,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + #no mux on mm100 diff --git a/firmware/config/boards/hellen/uaefi121/board.mk b/firmware/config/boards/hellen/uaefi121/board.mk index c1fab49f64..0bc4b3b4c7 100644 --- a/firmware/config/boards/hellen/uaefi121/board.mk +++ b/firmware/config/boards/hellen/uaefi121/board.mk @@ -3,7 +3,7 @@ # Target ECU board design BOARDCPPSRC = $(BOARD_DIR)/board_configuration_uaefi121.cpp -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + #no mux on mm100 diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index 9d8c9f6936..61afd32d4e 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -5,6 +5,9 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp BOARDINC = $(BOARD_DIR) +# TLE8888 has it's own main relay control output, we are not involved +DDEFS += -DEFI_MAIN_RELAY_CONTROL=FALSE + # see also openblt/board.mk STATUS_LED DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::E3 diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 100e846baf..9528323954 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -10,7 +10,7 @@ DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::E3 DDEFS += -DFIRMWARE_ID=\"proteus\" DDEFS += $(VAR_DEF_ENGINE_TYPE) -DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE + DDEFS += -DEFI_HD_ACR=TRUE DDEFS += -DEFI_MAX_31855=TRUE DDEFS += -DSTM32_SPI_USE_SPI5=TRUE diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index c20e666281..3115041cf1 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -312,7 +312,7 @@ * Control the main power relay based on measured ignition voltage (Vbatt) */ #ifndef EFI_MAIN_RELAY_CONTROL -#define EFI_MAIN_RELAY_CONTROL FALSE +#define EFI_MAIN_RELAY_CONTROL TRUE #endif #ifndef EFI_VEHICLE_SPEED