diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index f83ff040c4..3801df7aed 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -21,7 +21,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/subaru.cpp \ $(PROJECT_DIR)/config/engines/GY6_139QMB.cpp \ $(PROJECT_DIR)/config/engines/rover_v8.cpp \ - $(PROJECT_DIR)/config/engines/mazda_323.cpp \ $(PROJECT_DIR)/config/engines/mazda_626.cpp \ $(PROJECT_DIR)/config/engines/sachs.cpp \ $(PROJECT_DIR)/config/engines/test_engine.cpp \ diff --git a/firmware/config/engines/mazda_323.cpp b/firmware/config/engines/mazda_323.cpp deleted file mode 100644 index 08056574d5..0000000000 --- a/firmware/config/engines/mazda_323.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file mazda_323.cpp - * - * @date Mar 8, 2014 - * @author Andrey Belomutskiy, (c) 2012-2018 - */ - -#include "mazda_323.h" - -EXTERN_CONFIG; - -void setMazda323EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - engineConfiguration->specs.cylindersCount = 4; - engineConfiguration->specs.displacement = 1.6; - - engineConfiguration->ignitionMode = IM_ONE_COIL; - - /** - * We treat the trigger as 4/0 toothed wheel - */ -// setToothedWheelConfiguration(engineConfiguration, 4, 0); -} diff --git a/firmware/config/engines/mazda_323.h b/firmware/config/engines/mazda_323.h deleted file mode 100644 index ff614afc87..0000000000 --- a/firmware/config/engines/mazda_323.h +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @file mazda_323.h - * - * 90-94 Mazda 323 (1.6l SOHC) - * 90-93 Ford Festiva (1.3l SOHC) - * - * http://rusefi.com/forum/viewtopic.php?f=3&t=498 - * - * @date Mar 8, 2014 - * @author Andrey Belomutskiy, (c) 2012-2017 - */ - -#pragma once - -#include "engine_configuration.h" - -void setMazda323EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index ec68b2f37b..9a05fd653b 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -481,11 +481,7 @@ void setMazdaMiata2003EngineConfigurationBoardTest(DECLARE_CONFIG_PARAMETER_SIGN engineConfiguration->mafAdcChannel = EFI_ADC_4; // PA4 - W47 top <>W47 } -/** - * Pretty much OEM 2003 Miata with ETB - * set engine_type 13 - */ -void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { +static void setMiataNB2_MRE_common(DECLARE_CONFIG_PARAMETER_SIGNATURE) { #if (BOARD_TLE8888_COUNT > 0) setMazdaMiataEngineNB2Defaults(PASS_CONFIG_PARAMETER_SIGNATURE); @@ -527,24 +523,8 @@ void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // TLE8888_PIN_23: "33 - GP Out 3" engineConfiguration->malfunctionIndicatorPin = TLE8888_PIN_23; - //set idle_offset 0 - engineConfiguration->idleRpmPid.offset = 0; - engineConfiguration->idleRpmPid.pFactor = 0.2; - engineConfiguration->idleRpmPid.iFactor = 0.0001; - engineConfiguration->idleRpmPid.dFactor = 5; - engineConfiguration->idleRpmPid.periodMs = 10; - engineConfiguration->isFasterEngineSpinUpEnabled = true; - engineConfiguration->etb.pFactor = 12; // a bit lower p-factor seems to work better on TLE9201? MRE? - engineConfiguration->etb.iFactor = 0; - engineConfiguration->etb.dFactor = 0; - engineConfiguration->etb.offset = 0; - - // enable ETB - // set_rpn_expression 8 "0" - setFsio(7, GPIOC_8, "0" PASS_CONFIG_PARAMETER_SUFFIX); - // set_analog_input_pin pps PA7 // EFI_ADC_7: "31 - AN volt 3" - PA7 engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_7; @@ -556,10 +536,6 @@ void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->tpsMax = 870; engineConfiguration->idleMode = IM_AUTO; - CONFIG(useETBforIdleControl) = true; - engineConfiguration->throttlePedalUpVoltage = 1; - // WAT? that's an interesting value, how come it's above 5v? - engineConfiguration->throttlePedalWOTVoltage = 5.47; // set vbatt_divider 11 // 0.3#4 has wrong R139 as well? @@ -567,3 +543,40 @@ void setMiataNB2_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->vbattDividerCoeff = (66.0f / 10.0f) * engineConfiguration->analogInputDividerCoefficient; #endif /* BOARD_TLE8888_COUNT */ } + + +/** + * Pretty much OEM 2003 Miata with ETB + * set engine_type 13 + */ +void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setMiataNB2_MRE_common(PASS_CONFIG_PARAMETER_SIGNATURE); + + // enable ETB + // set_rpn_expression 8 "0" + setFsio(7, GPIOC_8, "0" PASS_CONFIG_PARAMETER_SUFFIX); + + //set idle_offset 0 + engineConfiguration->idleRpmPid.offset = 0; + engineConfiguration->idleRpmPid.pFactor = 0.2; + engineConfiguration->idleRpmPid.iFactor = 0.0001; + engineConfiguration->idleRpmPid.dFactor = 5; + engineConfiguration->idleRpmPid.periodMs = 10; + + CONFIG(useETBforIdleControl) = true; + engineConfiguration->throttlePedalUpVoltage = 1; + // WAT? that's an interesting value, how come it's above 5v? + engineConfiguration->throttlePedalWOTVoltage = 5.47; + + engineConfiguration->etb.pFactor = 12; // a bit lower p-factor seems to work better on TLE9201? MRE? + engineConfiguration->etb.iFactor = 0; + engineConfiguration->etb.dFactor = 0; + engineConfiguration->etb.offset = 0; +} + + + +void setMiataNB2_MRE_MTB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setMiataNB2_MRE_common(PASS_CONFIG_PARAMETER_SIGNATURE); + +} diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index a5acf6b878..aa8af923c3 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -18,4 +18,5 @@ 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); +void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNB2_MRE_MTB(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 9612068455..8cffe770b9 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -733,8 +733,8 @@ case HONDA_ACCORD_CD_TWO_WIRES: return "HONDA_ACCORD_CD_TWO_WIRES"; case LADA_KALINA: return "LADA_KALINA"; -case MAZDA_323: - return "MAZDA_323"; +case MRE_MIATA_NB2_MTB: + return "MRE_MIATA_NB2_MTB"; case MAZDA_626: return "MAZDA_626"; case MAZDA_MIATA_2003: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 1e6a17db6e..e26c18c861 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -57,7 +57,6 @@ #include "mazda_miata_na8.h" #include "mazda_miata_nb.h" #include "mazda_miata_vvt.h" -#include "mazda_323.h" #include "mazda_626.h" #include "citroenBerlingoTU3JP.h" @@ -1115,8 +1114,11 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case ISSUE_898: setIssue898(PASS_CONFIG_PARAMETER_SIGNATURE); break; + case MRE_MIATA_NB2_MTB: + setMiataNB2_MRE_MTB(PASS_CONFIG_PARAMETER_SIGNATURE); + break; case MRE_MIATA_NB2: - setMiataNB2_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); + setMiataNB2_MRE_ETB(PASS_CONFIG_PARAMETER_SIGNATURE); break; case PROMETHEUS_DEFAULTS: case MINIMAL_PINS: @@ -1210,9 +1212,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case MAZDA_MIATA_NB1: setMazdaMiataNb1EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case MAZDA_323: - setMazda323EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case MAZDA_626: setMazda626EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 8d913fa55e..8852bdba57 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -68,7 +68,7 @@ typedef enum { ROVER_V8 = 10, - MAZDA_323 = 11, + MRE_MIATA_NB2_MTB = 11, MRE_MIATA_NA6 = 12, diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index abec4ac2fc..714043da3b 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -161,8 +161,6 @@ const char* getConfigurationName(engine_type_e engineType) { return "Gy6139"; case MAZDA_MIATA_NB1: return "MiataNB1"; - case MAZDA_323: - return "M323"; case MRE_MIATA_NA6: return "MRE Miata 1.6"; case MRE_MIATA_NB2: