diff --git a/firmware/config/engines/mercedes.cpp b/firmware/config/engines/mercedes.cpp index fc2908fe2f..25253a653b 100644 --- a/firmware/config/engines/mercedes.cpp +++ b/firmware/config/engines/mercedes.cpp @@ -7,10 +7,15 @@ #include "pch.h" +// is this M104 or M112 or both? void setHellenMercedes128_6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - + engineConfiguration->specs.cylindersCount = 6; + // 1-4-2-5-3-6 M104 + engineConfiguration->specs.firingOrder = FO_1_4_3_6_2_5; // M112 } +// M113 void setHellenMercedes128_8_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - + engineConfiguration->specs.cylindersCount = 8; + engineConfiguration->specs.firingOrder = FO_1_5_4_2_6_3_7_8; } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 76012cf6ee..c7f0403edd 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -57,6 +57,7 @@ #include "mazda_miata_vvt.h" #include "mazda_626.h" #include "m111.h" +#include "mercedes.h" #include "citroenBerlingoTU3JP.h" #include "mitsubishi.h" @@ -859,8 +860,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case PROTEUS_DEFAULTS: case PROMETHEUS_DEFAULTS: 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 @@ -939,6 +938,12 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e #endif // HARDWARE_CI #endif // HW_PROTEUS #if HW_HELLEN + case HELLEN_128_MERCEDES_6_CYL: + setHellenMercedes128_6_cyl(PASS_CONFIG_PARAMETER_SIGNATURE); + break; + case HELLEN_128_MERCEDES_8_CYL: + setHellenMercedes128_8_cyl(PASS_CONFIG_PARAMETER_SIGNATURE); + break; case HELLEN_NB2: setMiataNB2_Hellen72(PASS_CONFIG_PARAMETER_SIGNATURE); break;