From 1dda1338291a5edfc0b8caa05289acd670dc9c96 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 8 Apr 2015 16:07:26 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/bmw_e34.cpp | 14 ++++++++++---- unit_tests/test_trigger_decoder.cpp | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index 33464ee107..8c68300d5e 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -34,17 +34,23 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->tunerStudioSerialSpeed = 38400; engineConfiguration->rpmHardLimit = 6000; +// setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); +// engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2; +// engineConfiguration->injectionMode = IM_SEQUENTIAL; +// boardConfiguration->triggerInputPins[0] = GPIOC_6; +// boardConfiguration->triggerInputPins[1] = GPIOA_5; + setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); - engineConfiguration->trigger.type = TT_ONE_PLUS_TOOTHED_WHEEL_60_2; + engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + engineConfiguration->injectionMode = IM_BATCH; + boardConfiguration->triggerInputPins[0] = GPIOA_5; + boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; engineConfiguration->specs.cylindersCount = 6; engineConfiguration->specs.displacement = 2.91; engineConfiguration->specs.firingOrder = FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4; - engineConfiguration->injectionMode = IM_SEQUENTIAL; engineConfiguration->ignitionMode = IM_WASTED_SPARK; - boardConfiguration->triggerInputPins[0] = GPIOC_6; - boardConfiguration->triggerInputPins[1] = GPIOA_5; engineConfiguration->ignMathCalculateAtIndex = 15; diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index 8176cbd407..8f4d32601a 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -510,7 +510,8 @@ void testTriggerDecoder(void) { // lame duty cycle implementation! testTriggerDecoder2("ford aspire", FORD_ASPIRE_1996, 4, 0.5, 0.3841); - testTriggerDecoder2("bmw", BMW_E34, 0, 0.9750, 0.5167); + //testTriggerDecoder2("bmw", BMW_E34, 0, 0.9750, 0.5167); + testTriggerDecoder2("bmw", BMW_E34, 0, 0.4833, 0.0); test1995FordInline6TriggerDecoder(); testMazdaMianaNbDecoder();