diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index 3aa108edd7..3fdd905976 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -28,14 +28,13 @@ static void setInjectorPins() { engineConfiguration->injectionPins[1] = GPIOG_8; engineConfiguration->injectionPins[2] = GPIOD_11; engineConfiguration->injectionPins[3] = GPIOD_10; - - //engineConfiguration->injectionPins[4] = GPIOD_9; - //engineConfiguration->injectionPins[5] = GPIOF_12; - //engineConfiguration->injectionPins[6] = GPIOF_13; - //engineConfiguration->injectionPins[7] = GPIOF_14; + engineConfiguration->injectionPins[4] = GPIOD_9; + engineConfiguration->injectionPins[5] = GPIOF_12; + engineConfiguration->injectionPins[6] = GPIOF_13; + engineConfiguration->injectionPins[7] = GPIOF_14; // Disable remainder - for (int i = 4; i < INJECTION_PIN_COUNT;i++) { + for (int i = 8; i < INJECTION_PIN_COUNT;i++) { engineConfiguration->injectionPins[i] = GPIO_UNASSIGNED; } @@ -43,18 +42,17 @@ static void setInjectorPins() { } static void setIgnitionPins() { - engineConfiguration->ignitionPins[0] = GPIOI_8; // 3F - IGN_1 (1&4) - engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED ; // GPIOE_4 - engineConfiguration->ignitionPins[2] = GPIOE_5; // 3I - IGN_2 (2&3) - engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; // GPIOE_3 - - //engineConfiguration->ignitionPins[4] = GPIOE_2; - //engineConfiguration->ignitionPins[5] = GPIOI_5; - //engineConfiguration->ignitionPins[6] = GPIOI_6; - //engineConfiguration->ignitionPins[7] = GPIOI_7; + engineConfiguration->ignitionPins[0] = GPIOI_8; + engineConfiguration->ignitionPins[1] = GPIOE_5; + engineConfiguration->ignitionPins[2] = GPIOE_4; + engineConfiguration->ignitionPins[3] = GPIOE_3; + engineConfiguration->ignitionPins[4] = GPIOE_2; + engineConfiguration->ignitionPins[5] = GPIOI_5; + engineConfiguration->ignitionPins[6] = GPIOI_6; + engineConfiguration->ignitionPins[7] = GPIOI_7; // disable remainder - for (int i = 4; i < IGNITION_PIN_COUNT; i++) { + for (int i = 8; i < IGNITION_PIN_COUNT; i++) { engineConfiguration->ignitionPins[i] = GPIO_UNASSIGNED; } @@ -165,10 +163,14 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; + engineConfiguration->specs.displacement = 2.295f; engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; // IM_WASTED_SPARK - engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; - engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL; + engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL; + engineConfiguration->injectionMode = IM_SEQUENTIAL;//IM_BATCH;// IM_SEQUENTIAL; + + strcpy(CONFIG(engineMake), ENGINE_MAKE_MERCEDES); + strcpy(CONFIG(engineCode), ""); } /** diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index be18d6766a..68aa48a4a9 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -859,6 +859,7 @@ 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 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 @@ -946,7 +947,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e case HELLEN_121_NISSAN: setHellen121nissan(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case HELLEN_128_MERCEDES: case HELLEN_121_VAG: case HELLEN_55_BMW: case HELLEN_88_BMW: