diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp index a92b93803b..b7390d5583 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp @@ -859,8 +859,6 @@ case FORD_ASPIRE_1996: return "FORD_ASPIRE_1996"; case FORD_ESCORT_GT: return "FORD_ESCORT_GT"; -case FORD_FIESTA: - return "FORD_FIESTA"; case FORD_INLINE_6_1995: return "FORD_INLINE_6_1995"; case FRANKENSO_QA_ENGINE: diff --git a/firmware/config/boards/hellen/cypress/efifeatures.h b/firmware/config/boards/hellen/cypress/efifeatures.h index 43af94b228..1b03bc5677 100644 --- a/firmware/config/boards/hellen/cypress/efifeatures.h +++ b/firmware/config/boards/hellen/cypress/efifeatures.h @@ -214,7 +214,6 @@ */ #define EFI_SUPPORT_DODGE_NEON FALSE #define EFI_SUPPORT_FORD_ASPIRE FALSE -#define EFI_SUPPORT_FORD_FIESTA FALSE #define EFI_SUPPORT_NISSAN_PRIMERA FALSE #define EFI_SUPPORT_1995_FORD_INLINE_6 FALSE diff --git a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp index d0ae114ebe..de585818e1 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp +++ b/firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp @@ -655,8 +655,6 @@ case FORD_ASPIRE_1996: return "FORD_ASPIRE_1996"; case FORD_ESCORT_GT: return "FORD_ESCORT_GT"; -case FORD_FIESTA: - return "FORD_FIESTA"; case FORD_INLINE_6_1995: return "FORD_INLINE_6_1995"; case FRANKENSO_QA_ENGINE: diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 11792807bd..71757edbb6 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -14,7 +14,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata_custom_hunchback.cpp \ $(PROJECT_DIR)/config/engines/citroenBerlingoTU3JP.cpp \ $(PROJECT_DIR)/config/engines/dodge_neon.cpp \ - $(PROJECT_DIR)/config/engines/ford_fiesta.cpp \ $(PROJECT_DIR)/config/engines/ford_1995_inline_6.cpp \ $(PROJECT_DIR)/config/engines/nissan_primera.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata_nb.cpp \ diff --git a/firmware/config/engines/ford_fiesta.cpp b/firmware/config/engines/ford_fiesta.cpp deleted file mode 100644 index 1dba680d14..0000000000 --- a/firmware/config/engines/ford_fiesta.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @file ford_fiesta.cpp - * @brief European 1990 Ford Fiesta - * - * FORD_FIESTA = 4 - * set engine_type 4 - * - * @date Nov 22, 2013 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "global.h" - -#include "ford_fiesta.h" -#include "engine_math.h" - -EXTERN_CONFIG; - -void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - engineConfiguration->rpmHardLimit = 7000; - setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); - - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1; - - engineConfiguration->ignitionMode = IM_WASTED_SPARK; - engineConfiguration->specs.firingOrder = FO_1_3_4_2; - engineConfiguration->afr.hwChannel = EFI_ADC_NONE; - engineConfiguration->mafAdcChannel = EFI_ADC_14; -// engineConfiguration->mafAdcChannel = EFI_ADC_NONE; this would kill functional tests -} diff --git a/firmware/config/engines/ford_fiesta.h b/firmware/config/engines/ford_fiesta.h deleted file mode 100644 index 4d0eaacc7a..0000000000 --- a/firmware/config/engines/ford_fiesta.h +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @file ford_fiesta.h - * - * @date Nov 22, 2013 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once - -#include "engine_configuration.h" - -void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 94717c9c09..db35368275 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -801,8 +801,6 @@ case FORD_ASPIRE_1996: return "FORD_ASPIRE_1996"; case FORD_ESCORT_GT: return "FORD_ESCORT_GT"; -case FORD_FIESTA: - return "FORD_FIESTA"; case FORD_INLINE_6_1995: return "FORD_INLINE_6_1995"; case FRANKENSO_QA_ENGINE: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index aa096439b0..21c11c5cb6 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -45,7 +45,6 @@ #include "dodge_ram.h" #include "ford_aspire.h" -#include "ford_fiesta.h" #include "ford_1995_inline_6.h" #include "nissan_primera.h" @@ -1250,9 +1249,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case FORD_ASPIRE_1996: setFordAspireEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case FORD_FIESTA: - setFordFiestaDefaultEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); - break; case NISSAN_PRIMERA: setNissanPrimeraEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 38230a2a67..92a4566e89 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -40,11 +40,7 @@ typedef enum { * http://rusefi.com/forum/viewtopic.php?t=375 */ FORD_ASPIRE_1996 = ET_FORD_ASPIRE, - /** - * 36-1 toothed wheel engine - * http://rusefi.com/forum/viewtopic.php?t=282 - */ - FORD_FIESTA = ET_FORD_FIESTA, + NISSAN_PRIMERA = 5, HONDA_ACCORD_CD = 6, FORD_INLINE_6_1995 = 7, diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 051df66134..f4cf1f33c5 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -118,8 +118,6 @@ const char* getConfigurationName(engine_type_e engineType) { return "Neon95"; case FORD_ASPIRE_1996: return "Aspire"; - case FORD_FIESTA: - return "Fiesta"; case NISSAN_PRIMERA: return "Primera"; case HONDA_ACCORD_CD: diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index d6f89b6db0..27056ac126 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -433,7 +433,6 @@ end_struct ! todo https://github.com/rusefi/rusefi/issues/2102 #define ET_DODGE_NEON_1995 2 #define ET_FORD_ASPIRE 3 -#define ET_FORD_FIESTA 4 #define ET_FORD_INLINE_6 7 #define ET_FORD_ESCORT_GT 14 #define ET_BMW_E34 25 diff --git a/java_console/autotest/src/com/rusefi/FunctionalTest.java b/java_console/autotest/src/com/rusefi/FunctionalTest.java index da65f50299..3ec04b6342 100644 --- a/java_console/autotest/src/com/rusefi/FunctionalTest.java +++ b/java_console/autotest/src/com/rusefi/FunctionalTest.java @@ -293,21 +293,6 @@ public class FunctionalTest { assertWaveFall(msg, chart, EngineChart.INJECTOR_4, 0.493, x + 540); } - @Test - public void testFordFiesta() { - ecu.setEngineType(ET_FORD_FIESTA); - EngineChart chart; - ecu.changeRpm(2000); - chart = nextChart(); - - String msg = "Fiesta"; - double x = 312; - assertWave("wasted spark #1 with Fiesta", chart, EngineChart.SPARK_1, 0.1333333, x, x + 360); - assertWaveNull(chart, EngineChart.SPARK_2); - assertWave("wasted spark #3 with Fiesta", chart, EngineChart.SPARK_3, 0.1333333, x + 180, x + 540); - assertWaveNull(msg, chart, EngineChart.SPARK_4); - } - @Test public void testFord6() { ecu.setEngineType(ET_FORD_INLINE_6);