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

MRE pre-sets

This commit is contained in:
rusefi 2020-05-21 20:44:14 -04:00
parent aac7712df5
commit 82e788ef3a
9 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "rusefi_enums.h" #include "rusefi_enums.h"
#include "rusefi_hw_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 // see also gen_config_and_enums.bat
@ -675,10 +675,12 @@ case MRE_BOARD_OLD_TEST:
return "MRE_BOARD_OLD_TEST"; return "MRE_BOARD_OLD_TEST";
case MRE_MIATA_NA6: case MRE_MIATA_NA6:
return "MRE_MIATA_NA6"; return "MRE_MIATA_NA6";
case MRE_MIATA_NB2: case MRE_MIATA_NB2_ETB:
return "MRE_MIATA_NB2"; return "MRE_MIATA_NB2_ETB";
case MRE_MIATA_NB2_MTB: case MRE_MIATA_NB2_MAF:
return "MRE_MIATA_NB2_MTB"; return "MRE_MIATA_NB2_MAF";
case MRE_MIATA_NB2_MAP:
return "MRE_MIATA_NB2_MAP";
case NISSAN_PRIMERA: case NISSAN_PRIMERA:
return "NISSAN_PRIMERA"; return "NISSAN_PRIMERA";
case PROMETHEUS_DEFAULTS: case PROMETHEUS_DEFAULTS:

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

@ -3,7 +3,7 @@
* *
* Miata NB2, also known as MX-5 Mk2.5 * Miata NB2, also known as MX-5 Mk2.5
* *
* MAZDA_MIATA_2003 * Frankenso MAZDA_MIATA_2003
* set engine_type 47 * set engine_type 47
* *
* coil1/4 (p1 +5 VP) GPIOE_14 * 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 * 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); setMiataNB2_MRE_common(PASS_CONFIG_PARAMETER_SIGNATURE);
// somehow MRE72 adapter 0.2 has TPS routed to pin 26? // 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 // 1K pull-down to read current from this MAF
engineConfiguration->mafAdcChannel = EFI_ADC_13; // J30 AV5 engineConfiguration->mafAdcChannel = EFI_ADC_13; // J30 AV5
}
void setMiataNB2_MRE_MAF(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setMiataNB2_MRE_MAP(PASS_CONFIG_PARAMETER_SIGNATURE);
} }

3
firmware/config/engines/mazda_miata_vvt.h
View File

@ -33,4 +33,5 @@ void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE);
* OEM mechanical throttle body * OEM mechanical throttle body
* set engine_type 11 * 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);

12
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "rusefi_enums.h" #include "rusefi_enums.h"
#include "rusefi_hw_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 // see also gen_config_and_enums.bat
@ -813,10 +813,12 @@ case MRE_BOARD_OLD_TEST:
return "MRE_BOARD_OLD_TEST"; return "MRE_BOARD_OLD_TEST";
case MRE_MIATA_NA6: case MRE_MIATA_NA6:
return "MRE_MIATA_NA6"; return "MRE_MIATA_NA6";
case MRE_MIATA_NB2: case MRE_MIATA_NB2_ETB:
return "MRE_MIATA_NB2"; return "MRE_MIATA_NB2_ETB";
case MRE_MIATA_NB2_MTB: case MRE_MIATA_NB2_MAF:
return "MRE_MIATA_NB2_MTB"; return "MRE_MIATA_NB2_MAF";
case MRE_MIATA_NB2_MAP:
return "MRE_MIATA_NB2_MAP";
case NISSAN_PRIMERA: case NISSAN_PRIMERA:
return "NISSAN_PRIMERA"; return "NISSAN_PRIMERA";
case PROMETHEUS_DEFAULTS: case PROMETHEUS_DEFAULTS:

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

@ -1237,10 +1237,13 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case MRE_MIATA_NA6: case MRE_MIATA_NA6:
setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE); setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MRE_MIATA_NB2_MTB: case MRE_MIATA_NB2_MAP:
setMiataNB2_MRE_MTB(PASS_CONFIG_PARAMETER_SIGNATURE); setMiataNB2_MRE_MAP(PASS_CONFIG_PARAMETER_SIGNATURE);
break; 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); setMiataNB2_MRE_ETB(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case DODGE_NEON_1995: case DODGE_NEON_1995:

4
firmware/controllers/algo/firing_order.h
View File

@ -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_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_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_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 // 16 cylinder
// unfortunately not supported by default firmware because INJECTION_PIN_COUNT=IGNITION_PIN_COUNT=12 by default // 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 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, Force_4b_firing_order = ENUM_32_BITS,
} firing_order_e; } firing_order_e;

7
firmware/controllers/algo/rusefi_enums.h
View File

@ -60,15 +60,15 @@ typedef enum {
ROVER_V8 = 10, ROVER_V8 = 10,
MRE_MIATA_NB2_MTB = 11, MRE_MIATA_NB2_MAP = 11,
MRE_MIATA_NA6 = 12, MRE_MIATA_NA6 = 12,
MRE_MIATA_NB2 = 13, MRE_MIATA_NB2_ETB = 13,
FORD_ESCORT_GT = 14, FORD_ESCORT_GT = 14,
CITROEN_TU3JP = 15, MRE_MIATA_NB2_MAF = 15,
MITSU_4G93 = 16, MITSU_4G93 = 16,
@ -187,6 +187,7 @@ typedef enum {
BMW_M73_PROTEUS = 63, BMW_M73_PROTEUS = 63,
DODGE_RAM = 64, DODGE_RAM = 64,
CITROEN_TU3JP = 65,
/** /**
* this configuration has as few pins configured as possible * this configuration has as few pins configured as possible

4
firmware/controllers/math/engine_math.cpp
View File

@ -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_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_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_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 // 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}; 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_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_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_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; return 12;
case FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10: 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]; 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: 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]; 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 // do not ask
case FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10: case FO_1_14_9_4_7_12_15_6_13_8_3_16_11_2_5_10:

4
firmware/controllers/settings.cpp
View File

@ -154,10 +154,6 @@ const char* getConfigurationName(engine_type_e engineType) {
return "Gy6139"; return "Gy6139";
case MAZDA_MIATA_NB1: case MAZDA_MIATA_NB1:
return "MiataNB1"; return "MiataNB1";
case MRE_MIATA_NA6:
return "MRE Miata 1.6";
case MRE_MIATA_NB2:
return "MRE_MIATA_NB2";
case FORD_ESCORT_GT: case FORD_ESCORT_GT:
return "EscrtGT"; return "EscrtGT";
case CITROEN_TU3JP: case CITROEN_TU3JP: