FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partition configs by board type (#2106) 

* remove old flag

* flags

* reorder switch

* oops
This commit is contained in:
Matthew Kennedy 2020-12-22 18:54:40 -08:00 committed by GitHub
parent 4c347026ff
commit 7617b115de
7 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ endif
DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE
DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3
DDEFS += -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS_DEFAULTS
DDEFS += -DEFI_INCLUDE_ENGINE_PRESETS=FALSE
DDEFS += -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE
DDEFS += -DEFI_LOGIC_ANALYZER=FALSE
# todo: refactor HAL_VSS_USE_PAL
@ -34,7 +33,6 @@ DDEFS += -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE
DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=GPIO_UNASSIGNED -DEFI_CONSOLE_RX_BRAIN_PIN=GPIO_UNASSIGNED
# We are running on Proteus hardware!
DDEFS += -DHW_PROTEUS=1

3
firmware/config/boards/st_stm32f4/board.mk
View File

@ -8,3 +8,6 @@ BOARDINC = $(PROJECT_DIR)/config/boards/st_stm32f4
# MCU defines
DDEFS += -DSTM32F407xx
# We are running on Frankenso hardware!
DDEFS += -DHW_FRANKENSO=1

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

@ -262,13 +262,6 @@
#define EFI_CONSOLE_USB_DEVICE SDU1
/**
* Should PnP engine configurations be included in the binary?
*/
#ifndef EFI_INCLUDE_ENGINE_PRESETS
#define EFI_INCLUDE_ENGINE_PRESETS TRUE
#endif
#ifndef EFI_ENGINE_SNIFFER
#define EFI_ENGINE_SNIFFER TRUE
#endif

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

@ -1160,22 +1160,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
// all basic settings are already set in prepareVoidConfiguration(), no need to set anything here
// nothing to do - we do it all in setBoardConfigurationOverrides
break;
case MRE_M111:
setM111EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_BOARD_OLD_TEST:
mreBoardOldTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_BOARD_NEW_TEST:
mreBoardNewTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case TEST_ENGINE:
setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case SUBARUEJ20G_DEFAULTS:
case MRE_SUBARU_EJ18:
setSubaruEJ18_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#if EFI_UNIT_TEST
case TEST_ISSUE_366_BOTH:
setTestEngineIssue366both(PASS_CONFIG_PARAMETER_SIGNATURE);
@ -1187,30 +1174,19 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif // EFI_UNIT_TEST
#if HW_PROTEUS
case PROTEUS_QC_TEST_BOARD:
case BMW_M73_PROTEUS:
setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE);
#if HW_MICRO_RUSEFI
case MRE_M111:
setM111EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_PROTEUS_TCU:
setMiataNB2_Proteus_TCU(PASS_CONFIG_PARAMETER_SIGNATURE);
case SUBARUEJ20G_DEFAULTS:
case MRE_SUBARU_EJ18:
setSubaruEJ18_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case PROTEUS_MIATA_NB2:
setMiataNB2_ProteusEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
case MRE_BOARD_OLD_TEST:
mreBoardOldTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif // HW_PROTEUS
#if EFI_INCLUDE_ENGINE_PRESETS
case DEFAULT_FRANKENSO:
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case FRANKENSO_QA_ENGINE:
setFrankensoBoardTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case BMW_M73_F:
setEngineBMW_M73_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case BMW_M73_M:
setEngineBMW_M73_Manhattan(PASS_CONFIG_PARAMETER_SIGNATURE);
case MRE_BOARD_NEW_TEST:
mreBoardNewTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case BMW_M73_MRE:
case BMW_M73_MRE_SLAVE:
@ -1234,12 +1210,38 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case MRE_MIATA_NB2_ETB:
setMiataNB2_MRE_ETB(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case DODGE_NEON_1995:
setDodgeNeon1995EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_BODY_CONTROL:
mreBCM(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif // HW_MICRO_RUSEFI
#if HW_PROTEUS
case PROTEUS_QC_TEST_BOARD:
case BMW_M73_PROTEUS:
setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_PROTEUS_TCU:
setMiataNB2_Proteus_TCU(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case PROTEUS_MIATA_NB2:
setMiataNB2_ProteusEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif // HW_PROTEUS
#if HW_FRANKENSO
case DEFAULT_FRANKENSO:
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case FRANKENSO_QA_ENGINE:
setFrankensoBoardTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case BMW_M73_F:
setEngineBMW_M73_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case BMW_M73_M:
setEngineBMW_M73_Manhattan(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case DODGE_NEON_1995:
setDodgeNeon1995EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case DODGE_NEON_2003_CRANK:
setDodgeNeonNGCEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
@ -1360,7 +1362,7 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case TEST_33816:
setTest33816EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif // EFI_INCLUDE_ENGINE_PRESETS
#endif // HW_FRANKENSO
default:
firmwareError(CUSTOM_UNEXPECTED_ENGINE_TYPE, "Unexpected engine type: %d", engineType);
}

5
simulator/simulator/efifeatures.h
View File

@ -74,11 +74,6 @@
#define EFI_MAP_AVERAGING TRUE
#define EFI_ALTERNATOR_CONTROL TRUE
/**
* Should PnP engine configurations be included in the binary?
*/
#define EFI_INCLUDE_ENGINE_PRESETS TRUE
#define EFI_ENGINE_AUDI_AAN FALSE
#define EFI_ENGINE_SNOW_BLOWER FALSE

2
unit_tests/Makefile
View File

@ -34,7 +34,7 @@ endif
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
USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1
USE_OPT += -DHW_MICRO_RUSEFI=1 -DHW_PROTEUS=1 -DHW_FRANKENSO=1
ifeq ($(CCACHE_DIR),)
$(info No CCACHE_DIR)

5
unit_tests/efifeatures.h
View File

@ -54,11 +54,6 @@
#define EFI_CLI_SUPPORT FALSE
/**
* Should PnP engine configurations be included in the binary?
*/
#define EFI_INCLUDE_ENGINE_PRESETS TRUE
#define EFI_SIGNAL_EXECUTOR_ONE_TIMER FALSE
#define EFI_SIGNAL_EXECUTOR_SLEEP FALSE