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

Merge remote-tracking branch 'upstream/master' into obd2-lambda

This commit is contained in:
Matthew Kennedy 2020-07-29 14:22:38 -07:00
parent 2560d90326 950acff11b
commit 745a586284
4 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 Sat Jul 04 21:11:33 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 Wed Jul 29 15:37:24 EDT 2020
// see also gen_config_and_enums.bat
@ -587,16 +587,16 @@ const char *getEngine_load_mode_e(engine_load_mode_e value){
switch(value) {
case Force_4_bytes_size_engine_load_mode:
return "Force_4_bytes_size_engine_load_mode";
case LM_ALPHA_N_2:
return "LM_ALPHA_N_2";
case LM_MOCK:
return "LM_MOCK";
case LM_PLAIN_MAF:
return "LM_PLAIN_MAF";
case LM_REAL_MAF:
return "LM_REAL_MAF";
case LM_SPEED_DENSITY:
return "LM_SPEED_DENSITY";
case LM_ALPHA_N_2:
return "LM_ALPHA_N_2";
case LM_MOCK:
return "LM_MOCK";
}
return NULL;
}
@ -698,8 +698,10 @@ case MRE_BOARD_NEW_TEST:
return "MRE_BOARD_NEW_TEST";
case MRE_BOARD_OLD_TEST:
return "MRE_BOARD_OLD_TEST";
case MRE_MIATA_NA6:
return "MRE_MIATA_NA6";
case MRE_MIATA_NA6_MAP:
return "MRE_MIATA_NA6_MAP";
case MRE_MIATA_NA6_VAF:
return "MRE_MIATA_NA6_VAF";
case MRE_MIATA_NB2_ETB:
return "MRE_MIATA_NB2_ETB";
case MRE_MIATA_NB2_MAF:
@ -774,16 +776,16 @@ const char *getGppwm_channel_e(gppwm_channel_e value){
switch(value) {
case GPPWM_Clt:
return "GPPWM_Clt";
case GPPWM_FuelLoad:
return "GPPWM_FuelLoad";
case GPPWM_Iat:
return "GPPWM_Iat";
case GPPWM_IgnLoad:
return "GPPWM_IgnLoad";
case GPPWM_Map:
return "GPPWM_Map";
case GPPWM_Tps:
return "GPPWM_Tps";
case GPPWM_FuelLoad:
return "GPPWM_FuelLoad";
case GPPWM_IgnLoad:
return "GPPWM_IgnLoad";
}
return NULL;
}

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

@ -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 Sat Jul 04 21:11:32 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 Wed Jul 29 15:37:22 EDT 2020
// see also gen_config_and_enums.bat
@ -725,16 +725,16 @@ const char *getEngine_load_mode_e(engine_load_mode_e value){
switch(value) {
case Force_4_bytes_size_engine_load_mode:
return "Force_4_bytes_size_engine_load_mode";
case LM_ALPHA_N_2:
return "LM_ALPHA_N_2";
case LM_MOCK:
return "LM_MOCK";
case LM_PLAIN_MAF:
return "LM_PLAIN_MAF";
case LM_REAL_MAF:
return "LM_REAL_MAF";
case LM_SPEED_DENSITY:
return "LM_SPEED_DENSITY";
case LM_ALPHA_N_2:
return "LM_ALPHA_N_2";
case LM_MOCK:
return "LM_MOCK";
}
return NULL;
}
@ -836,8 +836,10 @@ case MRE_BOARD_NEW_TEST:
return "MRE_BOARD_NEW_TEST";
case MRE_BOARD_OLD_TEST:
return "MRE_BOARD_OLD_TEST";
case MRE_MIATA_NA6:
return "MRE_MIATA_NA6";
case MRE_MIATA_NA6_MAP:
return "MRE_MIATA_NA6_MAP";
case MRE_MIATA_NA6_VAF:
return "MRE_MIATA_NA6_VAF";
case MRE_MIATA_NB2_ETB:
return "MRE_MIATA_NB2_ETB";
case MRE_MIATA_NB2_MAF:
@ -912,16 +914,16 @@ const char *getGppwm_channel_e(gppwm_channel_e value){
switch(value) {
case GPPWM_Clt:
return "GPPWM_Clt";
case GPPWM_FuelLoad:
return "GPPWM_FuelLoad";
case GPPWM_Iat:
return "GPPWM_Iat";
case GPPWM_IgnLoad:
return "GPPWM_IgnLoad";
case GPPWM_Map:
return "GPPWM_Map";
case GPPWM_Tps:
return "GPPWM_Tps";
case GPPWM_FuelLoad:
return "GPPWM_FuelLoad";
case GPPWM_IgnLoad:
return "GPPWM_IgnLoad";
}
return NULL;
}

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

@ -1257,7 +1257,8 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case BMW_M73_PROTEUS:
setEngineBMW_M73_Proteus(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_MIATA_NA6:
case MRE_MIATA_NA6_VAF:
case MRE_MIATA_NA6_MAP:
setMiataNA6_VAF_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MRE_MIATA_NB2_MAP:

2
java_console/ui/src/main/java/com/rusefi/PresetsPane.java
View File

@ -25,6 +25,8 @@ public class PresetsPane {
content.add(new SetEngineTypeCommandControl(uiContext,"Frankenso Miata NA6 Stage 0", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6_VAF).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NA6 Stage 1", "/engines/miata_na.png", Fields.ET_FRANKENSO_MIATA_NA6).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "Frankenso Miata NB2", "/engines/miata_nb.png", Fields.ET_FRANKENSO_MIATA_NB2).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 MAP", "engines/miata_na.png", Fields.ET_MRE_MIATA_NA6_MAP).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NA6 VAF", "engines/miata_na.png", Fields.ET_MRE_MIATA_NA6_VAF).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAP", "engines/miata_nb.png", Fields.ET_MRE_MIATA_NB2_MAP).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata NB2 MAF", "engines/miata_nb.png", Fields.ET_MRE_MIATA_NB2_MAF).getContent());
content.add(new SetEngineTypeCommandControl(uiContext, "MRE Miata Defaults", "", Fields.ET_MRE_DEFAULTS).getContent());