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

only build in config for the correct board (#2088) 

* only build in config for the correct board

* undo

* undo

* undo

* only touch proteus config

* include configs in tests
This commit is contained in:
Matthew Kennedy 2020-12-17 14:12:24 -08:00 committed by GitHub
parent 2f690ca6b2
commit 1838beadfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,3 +40,5 @@ EFI_CONSOLE_TTL_PINS = -DEFI_CONSOLE_TX_BRAIN_PIN=GPIOB_10 -DEFI_CONSOLE_RX_BRAI
# Add them all together
DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"microRusEFI\" $(DEFAULT_ENGINE_TYPE) $(LED_CRITICAL_ERROR_BRAIN_PIN) $(EFI_CONSOLE_TTL_PINS) -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
# We are running on microRusEFI hardware!
DDEFS += -DHW_MICRO_RUSEFI=1

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

@ -24,6 +24,9 @@ endif
# Override DEFAULT_ENGINE_TYPE
DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"proteus\" -DDEFAULT_ENGINE_TYPE=PROTEUS -DSTM32_ADC_USE_ADC3=TRUE -DEFI_INCLUDE_ENGINE_PRESETS=FALSE -DEFI_ICU_INPUTS=FALSE -DHAL_TRIGGER_USE_PAL=TRUE -DEFI_VEHICLE_SPEED=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEFI_SOFTWARE_KNOCK=TRUE -DEFI_CONSOLE_TX_BRAIN_PIN=GPIO_UNASSIGNED -DEFI_CONSOLE_RX_BRAIN_PIN=GPIO_UNASSIGNED
# We are running on Proteus hardware!
DDEFS += -DHW_PROTEUS=1
# Proteus <=v0.2 needs ADC hack - vbatt is on ADC3
ifeq ($(PROTEUS_LEGACY),TRUE)
DDEFS += -DUSE_ADC3_VBATT_HACK

6
firmware/config/engines/bmw_m73.cpp
View File

@ -278,6 +278,7 @@ static void toyota89281_33010_pedal_position_sensor(DECLARE_CONFIG_PARAMETER_SIG
* white#24: red : TPS#1
*
*/
#if HW_PROTEUS
void setEngineBMW_M73_Proteus(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
m73engine(PASS_CONFIG_PARAMETER_SIGNATURE);
@ -343,8 +344,5 @@ void setEngineBMW_M73_Proteus(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
CONFIG(tpsMax) = CONFIG(tps2Max) = 846;
CONFIG(tps1SecondaryMin) = CONFIG(tps2SecondaryMin) = 897;
CONFIG(tps1SecondaryMax) = CONFIG(tps2SecondaryMax) = 161;
}
#endif // HW_PROTEUS

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -697,6 +697,7 @@ void setMiataNB2_MRE_MAF(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
/**
* https://github.com/rusefi/rusefi/wiki/HOWTO-TCU-A42DE-on-Proteus
*/
#if HW_PROTEUS
void setMiataNB2_Proteus_TCU(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->tcuEnabled = true;
@ -751,3 +752,4 @@ void setMiataNB2_Proteus_TCU(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
}
#endif // HW_PROTEUS

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

@ -1172,12 +1172,6 @@ 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 MIATA_PROTEUS_TCU:
setMiataNB2_Proteus_TCU(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case PROTEUS_MIATA_NB2:
setMiataNB2_ProteusEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_M111:
setM111EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
@ -1205,9 +1199,17 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
#endif // EFI_UNIT_TEST
#if HW_PROTEUS
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 EFI_INCLUDE_ENGINE_PRESETS
case DEFAULT_FRANKENSO:
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);

3
unit_tests/Makefile
View File

@ -33,6 +33,9 @@ endif
# See explanation in main firmware Makefile for these three defines
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
ifeq ($(CCACHE_DIR),)
$(info No CCACHE_DIR)
else