From 3851b37be6e58e51ea1140ff305246ee37316905 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 31 Aug 2019 18:36:44 -0400 Subject: [PATCH] NB2 MRE --- firmware/config/boards/microrusefi/!compile-mre.bat | 2 +- firmware/config/engines/custom_engine.cpp | 2 +- firmware/config/engines/mazda_miata_vvt.cpp | 9 ++++++++- firmware/config/engines/mazda_miata_vvt.h | 2 ++ firmware/controllers/algo/engine_configuration.cpp | 2 ++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/firmware/config/boards/microrusefi/!compile-mre.bat b/firmware/config/boards/microrusefi/!compile-mre.bat index d40b0cb29c..8d98b1165c 100644 --- a/firmware/config/boards/microrusefi/!compile-mre.bat +++ b/firmware/config/boards/microrusefi/!compile-mre.bat @@ -5,7 +5,7 @@ set LDSCRIPT = config/boards/NUCLEO_F767/STM32F76xxI.ld set PROJECT_BOARD=microrusefi set PROJECT_CPU=ARCH_STM32F7 -set EXTRA_PARAMS=-DDUMMY -DDEFAULT_ENGINE_TYPE=MICRO_RUS_EFI +set EXTRA_PARAMS=-DDUMMY -DDEFAULT_ENGINE_TYPE=MICRO_RUS_EFI call config/boards/common_make.bat diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 3d82df208e..4f4a80657a 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -287,7 +287,7 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /** * remember that some H-bridges require 5v control lines, not just 3v logic outputs we have on stm32 */ - CONFIGB(etb1.directionPin1) = GPIOC_7; + CONFIGB(etb1.directionPin1) = GPIOC_7; // Frankenso high-side in order to get 5v control CONFIGB(etb1.directionPin2) = GPIOC_9; CONFIGB(etb1.controlPin1) = GPIOE_14; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 6b39fba7d6..16a24d81d5 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -484,7 +484,7 @@ void setMazdaMiata2003EngineConfigurationNaFuelRail(DECLARE_CONFIG_PARAMETER_SIG /** * red car setting with default 1991/1995 miata harness - * board #70 - closer to default miata harness + * board #70 - closer to default miata NA6 harness * */ void setMazdaMiata2003EngineConfigurationBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { @@ -497,3 +497,10 @@ void setMazdaMiata2003EngineConfigurationBoardTest(DECLARE_CONFIG_PARAMETER_SIGN engineConfiguration->mafAdcChannel = EFI_ADC_4; // PA4 - W47 top <>W47 } + +/** + * Pretty OEM 2003 Miata with ETB + */ +void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + +} diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index be82446f71..bdc5e0f170 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -19,4 +19,6 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setMazdaMiata2003EngineConfigurationNaFuelRail(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setMazdaMiata2003EngineConfigurationBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE); + #endif /* CONFIG_ENGINES_MAZDA_MIATA_VVT_H_ */ diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 45a1626dc8..f83aa26c54 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1060,6 +1060,8 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE); break; case MRE_MIATA_NB2: + setMiataNB2_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); + break; case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here break;