diff --git a/firmware/controllers/algo/auto_generated_commonenum.cpp b/firmware/controllers/algo/auto_generated_commonenum.cpp index 3651731756..2304103d9a 100644 --- a/firmware/controllers/algo/auto_generated_commonenum.cpp +++ b/firmware/controllers/algo/auto_generated_commonenum.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "rusefi_enums.h" -// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Sat Sep 11 23:26:26 EDT 2021 +// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Fri Sep 17 23:02:58 EDT 2021 // see also gen_config_and_enums.bat @@ -428,8 +428,12 @@ case HELLEN_121_VAG_V6_CYL: return "HELLEN_121_VAG_V6_CYL"; case HELLEN_121_VAG_VR6_CYL: return "HELLEN_121_VAG_VR6_CYL"; -case HELLEN_128_MERCEDES: - return "HELLEN_128_MERCEDES"; +case HELLEN_128_MERCEDES_4_CYL: + return "HELLEN_128_MERCEDES_4_CYL"; +case HELLEN_128_MERCEDES_6_CYL: + return "HELLEN_128_MERCEDES_6_CYL"; +case HELLEN_128_MERCEDES_8_CYL: + return "HELLEN_128_MERCEDES_8_CYL"; case HELLEN_134_BMW: return "HELLEN_134_BMW"; case HELLEN_154_HYUNDAI: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index a3ce762218..76012cf6ee 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -858,7 +858,9 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e // todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT? case PROTEUS_DEFAULTS: case PROMETHEUS_DEFAULTS: - case HELLEN_128_MERCEDES: + case HELLEN_128_MERCEDES_4_CYL: + case HELLEN_128_MERCEDES_6_CYL: + case HELLEN_128_MERCEDES_8_CYL: 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 setBoardDefaultConfiguration diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 738c1f9b12..d9ab4ab345 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -112,7 +112,7 @@ typedef enum { CAMARO_4 = ET_CAMARO, - HELLEN_128_MERCEDES = ET_HELLEN_128_MERCEDES, + HELLEN_128_MERCEDES_4_CYL = ET_HELLEN_128_MERCEDES_4_CYL, MRE_SUBARU_EJ18 = ET_MRE_SUBARU_EJ18, @@ -212,6 +212,11 @@ typedef enum { HELLEN_NB2_36 = ET_HELLEN_NB2_36, + HELLEN_128_MERCEDES_6_CYL = ET_HELLEN_128_MERCEDES_6_CYL, + + HELLEN_128_MERCEDES_8_CYL = ET_HELLEN_128_MERCEDES_8_CYL, + + /** * this configuration has as few pins configured as possible */ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 5749a139b7..3821d2be6a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -492,7 +492,6 @@ end_struct #define ET_VW_ABA 32 #define ET_HELLEN_NA6 34 #define ET_CAMARO 35 -#define ET_HELLEN_128_MERCEDES 36 #define ET_HELLEN_128_MERCEDES_4_CYL 36 #define ET_MRE_SUBARU_EJ18 37