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

export board-specific macro for stm32 pins based on board yaml #3298

This commit is contained in:
rusefi 2023-09-02 21:22:55 -04:00 committed by Andrey
parent 7b65642c9a
commit 186be0c777
6 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/hellen/alphax-4chan/board.mk
View File

@ -36,3 +36,5 @@ else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
else else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)]) $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif endif
DDEFS += -DHW_HELLEN_4CHAN=1

1
firmware/config/boards/hellen/alphax-8chan/board.mk
View File

@ -29,3 +29,4 @@ $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif endif
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN DDEFS += -DSHORT_BOARD_NAME=alphax-8chan -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DHW_HELLEN_8CHAN=1

2
firmware/config/boards/hellen/hellen-nb1/board.mk
View File

@ -19,3 +19,5 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2) DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSHORT_BOARD_NAME=hellen-nb1 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1 DDEFS += -DSHORT_BOARD_NAME=hellen-nb1 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
DDEFS += -DHW_HELLEN_NB1=1

1
firmware/config/boards/hellen/hellen72/board.mk
View File

@ -18,3 +18,4 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSHORT_BOARD_NAME=hellen72 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72 DDEFS += -DSHORT_BOARD_NAME=hellen72 -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_72
include $(BOARDS_DIR)/hellen/hellen-common176.mk include $(BOARDS_DIR)/hellen/hellen-common176.mk
DDEFS += -DHW_HELLEN_NB2=1

26
firmware/controllers/algo/engine_configuration.cpp
View File

@ -831,22 +831,37 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
break; break;
#endif #endif
#if HW_HELLEN #if HW_HELLEN_4CHAN
case engine_type_e::HELLEN_4CHAN_STIM_QC: case engine_type_e::HELLEN_4CHAN_STIM_QC:
alphax4chanStimQc(); alphax4chanStimQc();
break; break;
#endif
#if HW_HELLEN_8CHAN
case engine_type_e::ALPHAX_8CHAN_SBC:
set8chanSbc();
break;
#endif
#if HW_HELLEN_NB1
case engine_type_e::HELLEN_NB1:
setHellenNB1();
break;
#endif
#if HW_HELLEN_NB2
case engine_type_e::HELLEN_NB2: case engine_type_e::HELLEN_NB2:
setMiataNB2_Hellen72(); setMiataNB2_Hellen72();
break; break;
case engine_type_e::HELLEN_NB2_36: case engine_type_e::HELLEN_NB2_36:
setMiataNB2_Hellen72_36(); setMiataNB2_Hellen72_36();
break; break;
#endif
#if HW_HELLEN
case engine_type_e::HELLEN_NA8_96: case engine_type_e::HELLEN_NA8_96:
setHellenMiata96(); setHellenMiata96();
break; break;
case engine_type_e::HELLEN_NB1:
setHellenNB1();
break;
case engine_type_e::HELLEN_121_VAG_5_CYL: case engine_type_e::HELLEN_121_VAG_5_CYL:
setHellen121Vag_5_cyl(); setHellen121Vag_5_cyl();
break; break;
@ -868,9 +883,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
case engine_type_e::HELLEN_NA94: case engine_type_e::HELLEN_NA94:
setHellenNA94(); setHellenNA94();
break; break;
case engine_type_e::ALPHAX_8CHAN_SBC:
set8chanSbc();
break;
case engine_type_e::HELLEN_HONDA_BCM: case engine_type_e::HELLEN_HONDA_BCM:
setHondaCivicBcm(); setHondaCivicBcm();
break; break;

1
unit_tests/unit_test_rules.mk
View File

@ -55,6 +55,7 @@ USE_OPT += -DEFI_UNIT_TEST=1 -DEFI_PROD_CODE=0 -DEFI_SIMULATOR=0
# Pretend we are all different hardware so that all canned engine configs are included # Pretend we are all different hardware so that all canned engine configs are included
USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1 -DHW_FRANKENSO=1 -DHW_HELLEN=1 -DHW_HELLEN_NISSAN=1 USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1 -DHW_FRANKENSO=1 -DHW_HELLEN=1 -DHW_HELLEN_NISSAN=1
USE_OPT += -DHW_HELLEN_NB1=1 -DHW_HELLEN_NB2=1
DDEFS += -DSHORT_BOARD_NAME=f407-discovery DDEFS += -DSHORT_BOARD_NAME=f407-discovery