From 0f39f37bba24b143942b946c36c40d1911775b0a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 26 Nov 2020 21:07:34 -0500 Subject: [PATCH] dead engine config --- .../config/engines/chevrolet_c20_1973.cpp | 46 ------------- firmware/config/engines/chevrolet_c20_1973.h | 13 ---- firmware/config/engines/engines.mk | 2 - firmware/config/engines/nissan_primera.cpp | 14 ---- firmware/config/engines/nissan_primera.h | 1 - firmware/config/engines/zil130.cpp | 69 ------------------- firmware/config/engines/zil130.h | 13 ---- .../controllers/algo/engine_configuration.cpp | 14 +--- 8 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 firmware/config/engines/chevrolet_c20_1973.cpp delete mode 100644 firmware/config/engines/chevrolet_c20_1973.h delete mode 100644 firmware/config/engines/zil130.cpp delete mode 100644 firmware/config/engines/zil130.h diff --git a/firmware/config/engines/chevrolet_c20_1973.cpp b/firmware/config/engines/chevrolet_c20_1973.cpp deleted file mode 100644 index dae009f231..0000000000 --- a/firmware/config/engines/chevrolet_c20_1973.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * @file chevrolet_c20_1973.cpp - * - * most stuff is from a 1991 - * 5.7L SBC - * 4 wire IAC - * 8 pin HEI module - * - * set engine_type 37 - * - * - * @date Dec 20, 2015 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "chevrolet_c20_1973.h" -#include "engine_math.h" - -EXTERN_CONFIG; - -void set1973c20(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - - engineConfiguration->specs.displacement = 5.7; - engineConfiguration->specs.cylindersCount = 8; - - setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); - - engineConfiguration->ignitionMode = IM_ONE_COIL; - engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2; - engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; - engineConfiguration->injectionMode = IM_SIMULTANEOUS; - - /** - * 8/0 toothed wheel - */ - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; - engineConfiguration->trigger.customTotalToothCount = 8; - engineConfiguration->trigger.customSkippedToothCount = 0; - - engineConfiguration->rpmHardLimit = 5000; - setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX); - - -} - - diff --git a/firmware/config/engines/chevrolet_c20_1973.h b/firmware/config/engines/chevrolet_c20_1973.h deleted file mode 100644 index c91cb0255f..0000000000 --- a/firmware/config/engines/chevrolet_c20_1973.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * @file chevrolet_c20_1973.h - * - * @date Dec 20, 2015 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once - -#include "engine_configuration.h" - -void set1973c20(DECLARE_CONFIG_PARAMETER_SIGNATURE); - diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index c0049aebf7..d42e3adba8 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -30,10 +30,8 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/vw.cpp \ $(PROJECT_DIR)/config/engines/vw_b6.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_camaro_4.cpp \ - $(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp \ $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ $(PROJECT_DIR)/config/engines/lada_kalina.cpp \ - $(PROJECT_DIR)/config/engines/zil130.cpp \ $(PROJECT_DIR)/config/engines/honda_600.cpp \ $(PROJECT_DIR)/config/engines/me7pnp.cpp \ $(PROJECT_DIR)/config/engines/ford_festiva.cpp \ diff --git a/firmware/config/engines/nissan_primera.cpp b/firmware/config/engines/nissan_primera.cpp index 0df1bfc048..573179f0d2 100644 --- a/firmware/config/engines/nissan_primera.cpp +++ b/firmware/config/engines/nissan_primera.cpp @@ -14,20 +14,6 @@ EXTERN_CONFIG; -void setNissanPrimeraEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); - - engineConfiguration->trigger.type = TT_NISSAN_SR20VE; - - engineConfiguration->ignitionPins[0] = GPIOD_7; - engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; - engineConfiguration->ignitionPins[2] = GPIOD_6; - - - engineConfiguration->auxValves[0] = GPIOE_14; - engineConfiguration->auxValves[1] = GPIOE_12; -} - void setNissanPrimeraEngineConfiguration_360(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->trigger.type = TT_NISSAN_SR20VE_360; } diff --git a/firmware/config/engines/nissan_primera.h b/firmware/config/engines/nissan_primera.h index 93ea1d1546..e9a9f57ccf 100644 --- a/firmware/config/engines/nissan_primera.h +++ b/firmware/config/engines/nissan_primera.h @@ -9,5 +9,4 @@ #include "engine_configuration.h" -void setNissanPrimeraEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setNissanPrimeraEngineConfiguration_360(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/config/engines/zil130.cpp b/firmware/config/engines/zil130.cpp deleted file mode 100644 index a2c59de6d1..0000000000 --- a/firmware/config/engines/zil130.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - * @file zil130.cpp - * - * http://rusefi.com/forum/viewtopic.php?f=15&t=644 - * - * set engine_type 42 - * - * @date May 4, 2016 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "engine_template.h" -#include "custom_engine.h" - -EXTERN_CONFIG; - -void setZil130(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); - - engineConfiguration->specs.cylindersCount = 8; - - engineConfiguration->specs.displacement = 5.9; - engineConfiguration->specs.firingOrder = FO_1_5_4_2_6_3_7_8; - engineConfiguration->injectionMode = IM_BATCH; - engineConfiguration->ignitionMode = IM_WASTED_SPARK; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; - engineConfiguration->trigger.customTotalToothCount = 30; - engineConfiguration->trigger.customSkippedToothCount = 1; - - - - engineConfiguration->malfunctionIndicatorPin = GPIO_UNASSIGNED; -// engineConfiguration->twoWireBatchInjection = true; - engineConfiguration->injectionPinMode = OM_INVERTED; - engineConfiguration->injectionPins[0] = GPIOB_8; // #1 - engineConfiguration->injectionPins[1] = GPIOE_2; // #2 - engineConfiguration->injectionPins[2] = GPIOE_3; // #3 - engineConfiguration->injectionPins[3] = GPIOE_4; // #4 - engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED; // #5 - engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED; // #6 - engineConfiguration->injectionPins[6] = GPIO_UNASSIGNED; - engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED; - - engineConfiguration->ignitionPins[0] = GPIOB_5; // #1 - engineConfiguration->ignitionPins[1] = GPIOB_6; // #2 - engineConfiguration->ignitionPins[2] = GPIO_UNASSIGNED; // #3 - engineConfiguration->ignitionPins[3] = GPIOB_7; // #4 - engineConfiguration->ignitionPins[4] = GPIOC_7; // #5 - - // fuel pump - engineConfiguration->fuelPumpPin = GPIOD_4; - - // idle - engineConfiguration->idle.solenoidPin = GPIOC_14; - engineConfiguration->idle.solenoidPinMode = OM_INVERTED; - engineConfiguration->idle.solenoidFrequency = 300; - engineConfiguration->manIdlePosition = 50; // set_idle_pwm 50 - - // disable sd_card - engineConfiguration->sdCardCsPin = GPIO_UNASSIGNED; - engineConfiguration->is_enabled_spi_2 = false; - engineConfiguration->is_enabled_spi_3 = false; - engineConfiguration->max31855spiDevice = SPI_NONE; - - engineConfiguration->fanPin = GPIO_UNASSIGNED; - -} diff --git a/firmware/config/engines/zil130.h b/firmware/config/engines/zil130.h deleted file mode 100644 index 1380681eff..0000000000 --- a/firmware/config/engines/zil130.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * @file engine_template.h - * - * @date May 4, 2016 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once - -#include "engine_configuration.h" - -void setZil130(DECLARE_CONFIG_PARAMETER_SIGNATURE); - diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 6e543e7a67..86847bf21b 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -69,11 +69,9 @@ #include "me7pnp.h" #include "vw_b6.h" #include "chevrolet_camaro_4.h" -#include "chevrolet_c20_1973.h" #include "toyota_jzs147.h" #include "ford_festiva.h" #include "lada_kalina.h" -#include "zil130.h" #include "honda_600.h" #include "boost_control.h" #if EFI_IDLE_CONTROL @@ -1168,6 +1166,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb // todo: is it time to replace MICRO_RUS_EFI, PROTEUS, PROMETHEUS_DEFAULTS with MINIMAL_PINS? maybe rename MINIMAL_PINS to DEFAULT? case PROTEUS: case PROMETHEUS_DEFAULTS: + case NISSAN_PRIMERA: + case CHEVY_C20_1973: + case ZIL_130: case MIATA_1994_DEVIATOR: case MINIMAL_PINS: // all basic settings are already set in prepareVoidConfiguration(), no need to set anything here @@ -1249,15 +1250,9 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case FORD_FIESTA: setFordFiestaDefaultEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); break; - case NISSAN_PRIMERA: - setNissanPrimeraEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case HONDA_ACCORD_CD: setHondaAccordConfigurationThreeWires(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case ZIL_130: - setZil130(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case MIATA_NA6_MAP: setMiataNA6_MAP_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE); break; @@ -1357,9 +1352,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case CAMARO_4: setCamaro4(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case CHEVY_C20_1973: - set1973c20(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case TOYOTA_2JZ_GTE_VVTi: setToyota_2jz_vics(PASS_CONFIG_PARAMETER_SIGNATURE); break;