From 82e788ef3a8e0991036c45313ddea2fd3a59ed29 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 21 May 2020 20:44:14 -0400 Subject: [PATCH] MRE pre-sets --- .../config/controllers/algo/auto_generated_enums.cpp | 12 +++++++----- firmware/config/engines/mazda_miata_vvt.cpp | 11 +++++++---- firmware/config/engines/mazda_miata_vvt.h | 3 ++- firmware/controllers/algo/auto_generated_enums.cpp | 12 +++++++----- firmware/controllers/algo/engine_configuration.cpp | 9 ++++++--- firmware/controllers/algo/firing_order.h | 4 +++- firmware/controllers/algo/rusefi_enums.h | 7 ++++--- firmware/controllers/math/engine_math.cpp | 4 ++++ firmware/controllers/settings.cpp | 4 ---- 9 files changed, 40 insertions(+), 26 deletions(-) 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 e3a9158465..9ac38db392 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 @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu May 21 18:17:55 EDT 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu May 21 20:39:11 EDT 2020 // see also gen_config_and_enums.bat @@ -675,10 +675,12 @@ case MRE_BOARD_OLD_TEST: return "MRE_BOARD_OLD_TEST"; case MRE_MIATA_NA6: return "MRE_MIATA_NA6"; -case MRE_MIATA_NB2: - return "MRE_MIATA_NB2"; -case MRE_MIATA_NB2_MTB: - return "MRE_MIATA_NB2_MTB"; +case MRE_MIATA_NB2_ETB: + return "MRE_MIATA_NB2_ETB"; +case MRE_MIATA_NB2_MAF: + return "MRE_MIATA_NB2_MAF"; +case MRE_MIATA_NB2_MAP: + return "MRE_MIATA_NB2_MAP"; case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 73fb4bbbbd..651f49a870 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -3,7 +3,7 @@ * * Miata NB2, also known as MX-5 Mk2.5 * - * MAZDA_MIATA_2003 + * Frankenso MAZDA_MIATA_2003 * set engine_type 47 * * coil1/4 (p1 +5 VP) GPIOE_14 @@ -666,9 +666,10 @@ void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { } /** + * Normal mechanical throttle body * set engine_type 11 */ -void setMiataNB2_MRE_MTB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { +void setMiataNB2_MRE_MAP(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setMiataNB2_MRE_common(PASS_CONFIG_PARAMETER_SIGNATURE); // somehow MRE72 adapter 0.2 has TPS routed to pin 26? @@ -677,6 +678,8 @@ void setMiataNB2_MRE_MTB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // 1K pull-down to read current from this MAF engineConfiguration->mafAdcChannel = EFI_ADC_13; // J30 AV5 - - +} + +void setMiataNB2_MRE_MAF(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + setMiataNB2_MRE_MAP(PASS_CONFIG_PARAMETER_SIGNATURE); } diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h index af111a67de..0dd5f7e1ae 100644 --- a/firmware/config/engines/mazda_miata_vvt.h +++ b/firmware/config/engines/mazda_miata_vvt.h @@ -33,4 +33,5 @@ void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE); * OEM mechanical throttle body * set engine_type 11 */ -void setMiataNB2_MRE_MTB(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNB2_MRE_MAP(DECLARE_CONFIG_PARAMETER_SIGNATURE); +void setMiataNB2_MRE_MAF(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 7be6a6c573..fd5ccb04eb 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "rusefi_enums.h" #include "rusefi_hw_enums.h" -// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu May 21 18:17:54 EDT 2020 +// was generated automatically by rusEfi tool from rusefi_hw_enums.h // was generated automatically by rusEfi tool from rusefi_enums.h // by enum2string.jar tool on Thu May 21 20:39:10 EDT 2020 // see also gen_config_and_enums.bat @@ -813,10 +813,12 @@ case MRE_BOARD_OLD_TEST: return "MRE_BOARD_OLD_TEST"; case MRE_MIATA_NA6: return "MRE_MIATA_NA6"; -case MRE_MIATA_NB2: - return "MRE_MIATA_NB2"; -case MRE_MIATA_NB2_MTB: - return "MRE_MIATA_NB2_MTB"; +case MRE_MIATA_NB2_ETB: + return "MRE_MIATA_NB2_ETB"; +case MRE_MIATA_NB2_MAF: + return "MRE_MIATA_NB2_MAF"; +case MRE_MIATA_NB2_MAP: + return "MRE_MIATA_NB2_MAP"; case NISSAN_PRIMERA: return "NISSAN_PRIMERA"; case PROMETHEUS_DEFAULTS: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index fc939dbc2b..aea25c0ac7 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1237,10 +1237,13 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case MRE_MIATA_NA6: setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case MRE_MIATA_NB2_MTB: - setMiataNB2_MRE_MTB(PASS_CONFIG_PARAMETER_SIGNATURE); + case MRE_MIATA_NB2_MAP: + setMiataNB2_MRE_MAP(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case MRE_MIATA_NB2: + case MRE_MIATA_NB2_MAF: + setMiataNB2_MRE_MAF(PASS_CONFIG_PARAMETER_SIGNATURE); + break; + case MRE_MIATA_NB2_ETB: setMiataNB2_MRE_ETB(PASS_CONFIG_PARAMETER_SIGNATURE); break; case DODGE_NEON_1995: diff --git a/firmware/controllers/algo/firing_order.h b/firmware/controllers/algo/firing_order.h index e69b74e031..136e64809f 100644 --- a/firmware/controllers/algo/firing_order.h +++ b/firmware/controllers/algo/firing_order.h @@ -55,12 +55,14 @@ typedef enum { FO_1_7_5_11_3_9_6_12_2_8_4_10 = 15, // bmw M70 & M73 etc FO_1_7_4_10_2_8_6_12_3_9_5_11 = 16, // lamborghini, typical rusEfi use-case FO_1_12_5_8_3_10_6_7_2_11_4_9 = 18, // VAG W12 + FO_1_2_3_4_5_6_7_8_9_10_11_12 = 23, // mostly for hardware testing purposes + // 16 cylinder // unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10 = 22, // WR16 - // max used = 22 + // max used = 23 Force_4b_firing_order = ENUM_32_BITS, } firing_order_e; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 7054751a6a..18bc3a4592 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -60,15 +60,15 @@ typedef enum { ROVER_V8 = 10, - MRE_MIATA_NB2_MTB = 11, + MRE_MIATA_NB2_MAP = 11, MRE_MIATA_NA6 = 12, - MRE_MIATA_NB2 = 13, + MRE_MIATA_NB2_ETB = 13, FORD_ESCORT_GT = 14, - CITROEN_TU3JP = 15, + MRE_MIATA_NB2_MAF = 15, MITSU_4G93 = 16, @@ -187,6 +187,7 @@ typedef enum { BMW_M73_PROTEUS = 63, DODGE_RAM = 64, + CITROEN_TU3JP = 65, /** * this configuration has as few pins configured as possible diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index 0ee52ed627..4a36e73000 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -302,6 +302,7 @@ static const int order_1_10_9_4_3_6_5_8_7_2[] = {1, 10, 9, 4, 3, 6, 5, 8, 7, 2}; static const int order_1_7_5_11_3_9_6_12_2_8_4_10[] = {1, 7, 5, 11, 3, 9, 6, 12, 2, 8, 4, 10}; static const int order_1_7_4_10_2_8_6_12_3_9_5_11[] = {1, 7, 4, 10, 2, 8, 6, 12, 3, 9, 5, 11}; static const int order_1_12_5_8_3_10_6_7_2_11_4_9[] = {1, 12, 5, 8, 3, 10, 6, 7, 2, 11, 4, 9}; +static const int order_1_2_3_4_5_6_7_8_9_10_11_12[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}; // no comments static const int order_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10[] = {1, 14, 9, 4, 7, 12, 15, 6, 13, 8, 3, 16, 11, 2, 5, 10}; @@ -354,6 +355,7 @@ static int getFiringOrderLength(DECLARE_ENGINE_PARAMETER_SIGNATURE) { case FO_1_7_5_11_3_9_6_12_2_8_4_10: case FO_1_7_4_10_2_8_6_12_3_9_5_11: case FO_1_12_5_8_3_10_6_7_2_11_4_9: + case FO_1_2_3_4_5_6_7_8_9_10_11_12: return 12; case FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10: @@ -448,6 +450,8 @@ int getCylinderId(int index DECLARE_ENGINE_PARAMETER_SUFFIX) { return order_1_7_4_10_2_8_6_12_3_9_5_11[index]; case FO_1_12_5_8_3_10_6_7_2_11_4_9: return order_1_12_5_8_3_10_6_7_2_11_4_9[index]; + case FO_1_2_3_4_5_6_7_8_9_10_11_12: + return order_1_2_3_4_5_6_7_8_9_10_11_12[index]; // do not ask case FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10: diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 2a37eb3bdb..415d8f6b34 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -154,10 +154,6 @@ const char* getConfigurationName(engine_type_e engineType) { return "Gy6139"; case MAZDA_MIATA_NB1: return "MiataNB1"; - case MRE_MIATA_NA6: - return "MRE Miata 1.6"; - case MRE_MIATA_NB2: - return "MRE_MIATA_NB2"; case FORD_ESCORT_GT: return "EscrtGT"; case CITROEN_TU3JP: