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 b7390d5583..7f4aeab2e6 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 @@ -829,8 +829,6 @@ case LM_SPEED_DENSITY: } const char *getEngine_type_e(engine_type_e value){ switch(value) { -case BMW_E34: - return "BMW_E34"; case BMW_M73_F: return "BMW_M73_F"; case BMW_M73_M: 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 de585818e1..fb6dc8270f 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 @@ -625,8 +625,6 @@ case LM_SPEED_DENSITY: } const char *getEngine_type_e(engine_type_e value){ switch(value) { -case BMW_E34: - return "BMW_E34"; case BMW_M73_F: return "BMW_M73_F"; case BMW_M73_M: diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp deleted file mode 100644 index 0d1ec0bf42..0000000000 --- a/firmware/config/engines/bmw_e34.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/** - * @file bmw_e34.cpp - * - * set engine_type 25 - * - * Coil pairs: 1-6, 2-5, 3-4 - * - * Injector groups: 1,2,3 & 4,5,6 - * - * @date Nov 5, 2014 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#include "global.h" -#include "bmw_e34.h" -#include "thermistors.h" -#include "engine_math.h" - -EXTERN_CONFIG -; - -void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); - // chartsize 450 - engineConfiguration->engineChartSize = 450; - -// setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); -// engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2; -// engineConfiguration->injectionMode = IM_SEQUENTIAL; -// engineConfiguration->triggerInputPins[0] = GPIOC_6; -// engineConfiguration->triggerInputPins[1] = GPIOA_5; - -//Base engine setting - engineConfiguration->specs.cylindersCount = 6; - engineConfiguration->specs.displacement = 2.91; - engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4; - engineConfiguration->injectionMode = IM_BATCH; - engineConfiguration->twoWireBatchInjection = true; - engineConfiguration->ignitionMode = IM_WASTED_SPARK; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - - engineConfiguration->tachOutputPin = GPIOC_8; - - // Trigger configuration -// engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); - // set global_trigger_offset_angle 84 - engineConfiguration->globalTriggerAngleOffset = 84; - - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; - engineConfiguration->trigger.customTotalToothCount = 30; - engineConfiguration->trigger.customSkippedToothCount = 1; - - - // Injection settings - setFlatInjectorLag(1.15 PASS_CONFIG_PARAMETER_SUFFIX); - - engineConfiguration->injector.flow = 750; - - // General settings - engineConfiguration->tunerStudioSerialSpeed = 57600; - engineConfiguration->rpmHardLimit = 7000; - setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX); - - // for best performance at high RPM, we need to turn off 'Engine Sniffer' and 'Sensor Sniffer' - engineConfiguration->sensorChartMode = SC_OFF; - engineConfiguration->isEngineChartEnabled = false; - - engineConfiguration->isCylinderCleanupEnabled = false; - engineConfiguration->isInjectionEnabled = true; - engineConfiguration->isIgnitionEnabled = true; - - setConstantDwell(3 PASS_CONFIG_PARAMETER_SUFFIX); // a bit shorter dwell - engineConfiguration->ignMathCalculateAtIndex = 14; - - engineConfiguration->mapAveragingSchedulingAtIndex = 6; - - // Cranking - engineConfiguration->cranking.rpm = 600; - engineConfiguration->crankingInjectionMode = IM_BATCH; - // enable constant_dwell - engineConfiguration->useConstantDwellDuringCranking = true; - engineConfiguration->ignitionDwellForCrankingMs = 6; - - // Inputs configuration - engineConfiguration->analogInputDividerCoefficient = 1.52; - engineConfiguration->vbattDividerCoeff = 5.33; - engineConfiguration->vbattAdcChannel = EFI_ADC_15; // PC5 - - engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; - - - engineConfiguration->triggerInputPins[0] = GPIOA_5; - engineConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; - - setWholeTimingTable(25); - - engineConfiguration->malfunctionIndicatorPin = GPIO_UNASSIGNED; - -/* - * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up - 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] = GPIOE_5; // #5 - engineConfiguration->injectionPins[5] = GPIOE_6; // #6 - - /* - * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up - engineConfiguration->ignitionPinMode = OM_INVERTED; -*/ - - engineConfiguration->ignitionPins[0] = GPIOB_5; // #1 - engineConfiguration->ignitionPins[2] = GPIOB_6; // #3 - engineConfiguration->ignitionPins[4] = GPIOB_7; // #5 - - engineConfiguration->canRxPin = GPIO_UNASSIGNED; - engineConfiguration->canTxPin = GPIO_UNASSIGNED; - - engineConfiguration->triggerErrorPin = GPIO_UNASSIGNED; - - // clutch up - engineConfiguration->clutchUpPin = GPIOD_3; - engineConfiguration->clutchUpPinMode = PI_PULLUP; - - // fuel pump - engineConfiguration->fuelPumpPin = GPIOD_4; - - // idle - engineConfiguration->idle.solenoidPin = GPIOC_14; - /* - * this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up - 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; - - // turbocharger boost control solenoid: TODO output: GPIOE_6 - // water injection #1 TODO GPIOD_7 - // water injection #2 TODO GPIOE_2 - - /** - * emulating the 60-0 trigger takes some resources, let's keep it slow by default - * rpm 200 - */ - engineConfiguration->triggerSimulatorFrequency = 200; - - // Configurating sensors: - - // map - engineConfiguration->map.sensor.type = MT_MPX4250; - - // thermistors - engineConfiguration->clt.config = {-10, 20, 80, 9300, 2500, 335, 2200}; - engineConfiguration->iat.config = {-10, 20, 80, 9300, 2500, 335, 2200}; - -// /** -// * This saves a couple of ticks in trigger emulation methods -// * TODO: add some smart logic to detect unneeded trigger simulation pins? -// * TODO: but probably not worth it -// */ -// bc->triggerSimulatorPins[1] = GPIO_UNASSIGNED; - - engineConfiguration->triggerSimulatorPins[0] = GPIOD_1; - engineConfiguration->triggerSimulatorPins[1] = GPIOD_2; - engineConfiguration->triggerSimulatorPins[2] = GPIO_UNASSIGNED; -} diff --git a/firmware/config/engines/bmw_e34.h b/firmware/config/engines/bmw_e34.h deleted file mode 100644 index e7800f99f1..0000000000 --- a/firmware/config/engines/bmw_e34.h +++ /dev/null @@ -1,13 +0,0 @@ -/** - * @file bmw_e34.h - * - * @date Nov 5, 2014 - * @author Andrey Belomutskiy, (c) 2012-2020 - */ - -#pragma once - -#include "engine_configuration.h" - -void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE); - diff --git a/firmware/config/engines/engines.mk b/firmware/config/engines/engines.mk index 71757edbb6..2231f533f9 100644 --- a/firmware/config/engines/engines.mk +++ b/firmware/config/engines/engines.mk @@ -3,7 +3,6 @@ ENGINES_SRC = ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \ $(PROJECT_DIR)/config/engines/custom_engine.cpp \ - $(PROJECT_DIR)/config/engines/bmw_e34.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73.cpp \ $(PROJECT_DIR)/config/engines/bmw_m73_mre.cpp \ $(PROJECT_DIR)/config/engines/mazda_miata.cpp \ diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index db35368275..792b73a763 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -771,8 +771,6 @@ case LM_SPEED_DENSITY: } const char *getEngine_type_e(engine_type_e value){ switch(value) { -case BMW_E34: - return "BMW_E34"; case BMW_M73_F: return "BMW_M73_F"; case BMW_M73_M: diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 1b8b9fe12b..38b8067f8b 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -38,7 +38,6 @@ #include "custom_engine.h" #include "engine_template.h" -#include "bmw_e34.h" #include "bmw_m73.h" #include "dodge_neon.h" @@ -1320,9 +1319,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb case SUBARU_2003_WRX: setSubaru2003Wrx(PASS_CONFIG_PARAMETER_SIGNATURE); break; - case BMW_E34: - setBmwE34(PASS_CONFIG_PARAMETER_SIGNATURE); - break; case DODGE_RAM: setDodgeRam1996(PASS_CONFIG_PARAMETER_SIGNATURE); break; diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 92a4566e89..9912a71694 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -87,8 +87,6 @@ typedef enum { MRE_BODY_CONTROL = ET_MRE_BODY_CONTROL, BMW_M73_M = 24, - BMW_E34 = ET_BMW_E34, - TEST_ENGINE = 26, // used by unit test diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index f4cf1f33c5..1fa15d166b 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -144,8 +144,6 @@ const char* getConfigurationName(engine_type_e engineType) { return "MX590"; case MIATA_1996: return "MX596"; - case BMW_E34: - return "BMWe34"; default: return getEngine_type_e(engineType); } diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 27056ac126..fcdaa08555 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -435,7 +435,6 @@ end_struct #define ET_FORD_ASPIRE 3 #define ET_FORD_INLINE_6 7 #define ET_FORD_ESCORT_GT 14 -#define ET_BMW_E34 25 #define ET_SACHS 29 #define ET_VW_ABA 32 #define ET_CAMARO 35 diff --git a/java_console/autotest/src/com/rusefi/FunctionalTest.java b/java_console/autotest/src/com/rusefi/FunctionalTest.java index f977b10531..796d00f96c 100644 --- a/java_console/autotest/src/com/rusefi/FunctionalTest.java +++ b/java_console/autotest/src/com/rusefi/FunctionalTest.java @@ -132,31 +132,6 @@ public class FunctionalTest { // todo: add more content } - @Test - @Ignore("this configuration does scary things to SPI") - public void testBmwE34() { - ecu.setEngineType(ET_BMW_E34); - ecu.sendCommand("chart 1"); - String msg = "BMW"; - EngineChart chart; - ecu.changeRpm(200); - chart = nextChart(); - double x = 173.988; - // something is wrong here - it's a 6 cylinder here, why 4 cylinder cycle? - assertWave(msg, chart, EngineChart.SPARK_1, 0.0199666, x, x + 180, x + 360, x + 540); - - ecu.changeRpm(1200); - chart = nextChart(); - - x = 688.464; - // something is wrong here - it's a 6 cylinder here, why 4 cylinder cycle? - assertWave(msg, chart, EngineChart.SPARK_1, 0.0597999999, x, x + 180, x + 360, x + 540); - - x = 101; - // 6 cylinder - assertWave(msg, chart, EngineChart.MAP_AVERAGING, 0.139, x, x + 120, x + 240, x + 360, x + 480, x + 600); - } - @Test public void testCitroenBerlingo() { ecu.setEngineType(ET_CITROEN_TU3JP); diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index 2a35c4f101..4c033e9b17 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -485,10 +485,6 @@ TEST(misc, testTriggerDecoder) { testTriggerDecoder2("dodge ram", DODGE_RAM, 16, 0.5000, 0.06); - //testTriggerDecoder2("bmw", BMW_E34, 0, 0.9750, 0.5167); - testTriggerDecoder2("bmw", BMW_E34, 0, 0.4667, 0.0); - - testTriggerDecoder2("Miata NB", MAZDA_MIATA_NB1, 12, 0.0833, 0.0444); printf("====================================================================================== testTriggerDecoder part 3\r\n");