diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 28b8144d1a..8839b8945c 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -394,10 +394,9 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { /** * This configuration is used for MRE board Quality Assurance validation - * set engine_type 30 - * MRE_BOARD_TEST + * todo: inline */ -void mreBoardOldTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { +static void mreBoardOldTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { #if (BOARD_TLE8888_COUNT > 0) engineConfiguration->debugMode = DBG_TLE8888; diff --git a/firmware/config/engines/custom_engine.h b/firmware/config/engines/custom_engine.h index c8cc45d6c4..15098a7905 100644 --- a/firmware/config/engines/custom_engine.h +++ b/firmware/config/engines/custom_engine.h @@ -20,7 +20,6 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setIssue898(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setTestQuadCam(DECLARE_CONFIG_PARAMETER_SIGNATURE); -void mreBoardOldTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); void mreBoardNewTest(DECLARE_CONFIG_PARAMETER_SIGNATURE); void mreBCM(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index bc131fdb76..ee15d9ba3d 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -35,7 +35,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/vw_b6.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ - $(PROJECT_DIR)/config/engines/lada_kalina.cpp \ $(PROJECT_DIR)/config/engines/me7pnp.cpp \ $(PROJECT_DIR)/config/engines/ford_festiva.cpp \ diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp deleted file mode 100644 index 5f557a8276..0000000000 --- a/firmware/config/engines/lada_kalina.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * @file lada_kalina.cpp - * - * set engine_type 39 - * - * @date Jan 21, 2016 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "pch.h" - -#include "lada_kalina.h" -#include "custom_engine.h" -#include "fsio_impl.h" - -#if (BOARD_TLE8888_COUNT > 0) -void setLadaKalina(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - /* MRE uses TLE8888_PIN_21 for fuel pump */ - engineConfiguration->fuelPumpPin = GPIO_UNASSIGNED; - /* PRE uses TLE8888_PIN_22 for fan */ - engineConfiguration->fanPin = GPIO_UNASSIGNED; - // TLE8888 two bridge drivers for stepper - engineConfiguration->stepperDcIo[0].directionPin1 = TLE8888_PIN_21; - engineConfiguration->stepperDcIo[0].directionPin2 = TLE8888_PIN_22; - engineConfiguration->stepperDcIo[1].directionPin1 = TLE8888_PIN_23; - engineConfiguration->stepperDcIo[1].directionPin2 = TLE8888_PIN_24; - /* IDLE configuration */ - engineConfiguration->useStepperIdle = true; - engineConfiguration->useHbridgesToDriveIdleStepper = true; - engineConfiguration->idleMode = IM_AUTO; - engineConfiguration->useTLE8888_stepper = true; -} - -#else - -void setLadaKalina(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); - disableLCD(engineConfiguration); - - setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - - engineConfiguration->triggerInputPins[0] = GPIOA_5; - engineConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; - - engineConfiguration->globalTriggerAngleOffset = 114; - - engineConfiguration->ignitionPins[0] = GPIOE_14; - engineConfiguration->ignitionPins[1] = GPIOC_7; - engineConfiguration->ignitionPins[2] = GPIOC_9; - engineConfiguration->ignitionPins[3] = GPIOE_12; - - engineConfiguration->useStepperIdle = true; - engineConfiguration->fuelPumpPin = GPIOC_13; - engineConfiguration->mainRelayPin = GPIOD_7; - - engineConfiguration->idle.stepperDirectionPin = GPIOE_15; - engineConfiguration->idle.stepperStepPin = GPIOE_13; - engineConfiguration->stepperEnablePin = GPIOE_11; - - - - // starter relay solenoid -#if EFI_FSIO - /** - * to test - * set_fsio_setting 1 5000 - */ - engineConfiguration->fsio_setting[0] = 500; - // set_rpn_expression 1 "rpm 0 fsio_setting <" - setFsioExt(0, GPIOE_3, RPM_BELOW_USER_SETTING_1, 0 PASS_CONFIG_PARAMETER_SUFFIX); -#endif /* EFI_FSIO */ -} -#endif diff --git a/firmware/config/engines/lada_kalina.h b/firmware/config/engines/lada_kalina.h deleted file mode 100644 index 9e376a607e..0000000000 --- a/firmware/config/engines/lada_kalina.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * @file lada_kalina.h - * - * @date Jan 21, 2016 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once -#include "engine_configuration.h" - -void setLadaKalina(DECLARE_CONFIG_PARAMETER_SIGNATURE); -