diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index 4209e30178..8250ce8976 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -889,8 +889,8 @@ case MAZDA_MIATA_NB1: return "MAZDA_MIATA_NB1"; case MIATA_1990: return "MIATA_1990"; -case MIATA_1994_DEVIATOR: - return "MIATA_1994_DEVIATOR"; +case MRE_MIATA_94_MAP: + return "MRE_MIATA_94_MAP"; case MIATA_1996: return "MIATA_1996"; case MIATA_NA6_MAP: diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index b5fa89ce6a..7b2d95dfc3 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -685,8 +685,8 @@ case MAZDA_MIATA_NB1: return "MAZDA_MIATA_NB1"; case MIATA_1990: return "MIATA_1990"; -case MIATA_1994_DEVIATOR: - return "MIATA_1994_DEVIATOR"; +case MRE_MIATA_94_MAP: + return "MRE_MIATA_94_MAP"; case MIATA_1996: return "MIATA_1996"; case MIATA_NA6_MAP: diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 39b98cff0d..997d128b06 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -6,7 +6,7 @@ * http://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Protege_1993 * * MIATA_1990 = 19 (Frankenstein board) - * MIATA_1994_DEVIATOR = 20 + * MRE_MIATA_94_MAP = 20 * MIATA_1996 = 21 * set engine_type 21 * diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index f54d487692..16cf8883d2 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -458,3 +458,14 @@ void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { #endif /* BOARD_TLE8888_COUNT */ } + +void setMiata94_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setMiataNA6_MAP_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); + + engineConfiguration->injectionMode = IM_SEQUENTIAL; + engineConfiguration->specs.displacement = 1.68; + strcpy(CONFIG(engineMake), ENGINE_MAKE_MAZDA); + strcpy(CONFIG(engineCode), "94"); + +} + diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h index 7b6aa76c56..0547f23041 100644 --- a/firmware/config/engines/mazda_miata_1_6.h +++ b/firmware/config/engines/mazda_miata_1_6.h @@ -22,3 +22,5 @@ void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiata94_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE); + diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index dc84b17fa7..e535e8ab0c 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -831,8 +831,8 @@ case MAZDA_MIATA_NB1: return "MAZDA_MIATA_NB1"; case MIATA_1990: return "MIATA_1990"; -case MIATA_1994_DEVIATOR: - return "MIATA_1994_DEVIATOR"; +case MRE_MIATA_94_MAP: + return "MRE_MIATA_94_MAP"; case MIATA_1996: return "MIATA_1996"; case MIATA_NA6_MAP: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 21ffe11c29..1b81d59138 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1168,7 +1168,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case PROMETHEUS_DEFAULTS: case CHEVY_C20_1973: case ZIL_130: - case MIATA_1994_DEVIATOR: case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here // nothing to do - we do it all in setBoardConfigurationOverrides @@ -1219,6 +1218,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case MRE_MIATA_NA6_VAF: setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); break; + case MRE_MIATA_94_MAP: + setMiata94_MAP_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); + break; case MRE_MIATA_NA6_MAP: setMiataNA6_MAP_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 941c7cd854..a6b5cb8ccc 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -30,7 +30,6 @@ */ typedef enum { DEFAULT_FRANKENSO = ET_DEFAULT_FRANKENSO, - MIATA_PROTEUS_TCU = ET_MIATA_TCU_PROTEUS, /** * 1995 Dodge Neon * http://rusefi.com/forum/viewtopic.php?t=360 @@ -56,19 +55,26 @@ typedef enum { */ GY6_139QMB = 8, - MAZDA_MIATA_NB1 = 9, ROVER_V8 = ET_ROVER_V8, - MRE_MIATA_NB2_MAP = 11, - + MIATA_PROTEUS_TCU = ET_MIATA_TCU_PROTEUS, + MAZDA_MIATA_NB1 = 9, + MRE_MIATA_NB2_MAP = ET_MRE_MIATA_NB2_MAP, MRE_MIATA_NA6_VAF = ET_MRE_MIATA_NA6_VAF, - MRE_MIATA_NB2_ETB = 13, + MRE_MIATA_NA6_MAP = ET_MRE_MIATA_NA6_MAP, + MRE_MIATA_NB2_MAF = ET_MRE_MIATA_NB2_MAF, + + // Frankenstein board + MIATA_1990 = 19, + // Frankenso board + MIATA_NA6_MAP = ET_FRANKENSO_MIATA_NA6, + MRE_MIATA_94_MAP = ET_MRE_MIATA_94_MAP, + MIATA_1996 = 21, FORD_ESCORT_GT = ET_FORD_ESCORT_GT, - MRE_MIATA_NB2_MAF = ET_MRE_MIATA_NB2_MAF, MITSU_4G93 = 16, @@ -79,10 +85,6 @@ typedef enum { HONDA_ACCORD_CD_DIP = 18, - // Frankenstein board - MIATA_1990 = 19, - MIATA_1994_DEVIATOR = 20, - MIATA_1996 = 21, SUBARU_2003_WRX = 22, @@ -128,8 +130,6 @@ typedef enum { BMW_M73_F = ET_BMW_M73_F, - // Frankenso board - MIATA_NA6_MAP = ET_FRANKENSO_MIATA_NA6, ZIL_130 = 42, @@ -192,8 +192,6 @@ typedef enum { DODGE_RAM = 64, CITROEN_TU3JP = ET_CITROEN_TU3JP, - MRE_MIATA_NA6_MAP = ET_MRE_MIATA_NA6_MAP, - /** * this configuration has as few pins configured as possible diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index b541384d29..6b521f18a4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1617,6 +1617,8 @@ cmd_set_engine_type_microRusEFI_Miata_NA6_VAF = "@@TS_IO_TEST_COMMAND_char@@\x cmd_set_engine_type_microRusEFI_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MRE_MIATA_NA6_MAP_16_hex@@" +cmd_set_engine_type_microRusEFI_Miata_94_MAP = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MRE_MIATA_94_MAP_16_hex@@" + ; MRE_MIATA_NB2_MAF = 15 cmd_set_engine_type_microRusEFI_Miata_NB2_MAF = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_MRE_MIATA_NB2_MAF_16_hex@@" @@ -3213,6 +3215,7 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" commandButton = "microRusEFI Miata NA6 VAF", cmd_set_engine_type_microRusEFI_Miata_NA6_VAF@@if_show_microRusEFI_presets commandButton = "microRusEFI Miata NA6 MAP", cmd_set_engine_type_microRusEFI_Miata_NA6_MAP@@if_show_microRusEFI_presets + commandButton = "microRusEFI Miata 94/95 MAP", cmd_set_engine_type_microRusEFI_Miata_94_MAP@@if_show_microRusEFI_presets commandButton = "microRusEfi Miata NB2 MAP", cmd_set_engine_type_microRusEFI_Miata_NB2_MAP@@if_show_microRusEFI_presets commandButton = "microRusEFI Miata NB2 MAF", cmd_set_engine_type_microRusEFI_Miata_NB2_MAF@@if_show_microRusEFI_presets commandButton = "microRusEFI Defaults", cmd_set_engine_type_microRusEFI_Defaults@@if_show_microRusEFI_presets