From c7590aa8a4e76ddebf9fc0497394ab8790531bdf Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 29 Jul 2020 15:51:01 -0400 Subject: [PATCH 1/2] NA6 progress --- .../controllers/algo/auto_generated_enums.cpp | 24 ++++++++++--------- .../controllers/algo/auto_generated_enums.cpp | 24 ++++++++++--------- .../controllers/algo/engine_configuration.cpp | 3 ++- 3 files changed, 28 insertions(+), 23 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 6be9fd2d6e..d24acc5f88 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 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; } diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 7f068198c8..640a07f8f7 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 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; } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index a5a558e59c..75fded89f9 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -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: From 950acff11b06065d104c64579f9065d266834b16 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 29 Jul 2020 15:52:25 -0400 Subject: [PATCH 2/2] NA6 progress --- java_console/ui/src/main/java/com/rusefi/PresetsPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java_console/ui/src/main/java/com/rusefi/PresetsPane.java b/java_console/ui/src/main/java/com/rusefi/PresetsPane.java index a4924c1491..a90ae27653 100644 --- a/java_console/ui/src/main/java/com/rusefi/PresetsPane.java +++ b/java_console/ui/src/main/java/com/rusefi/PresetsPane.java @@ -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());