From 4ac178e4bf68bcd57ca923e9cfa318cce74f0e7f Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 22 Nov 2014 17:04:49 -0600 Subject: [PATCH] auto-sync --- firmware/config/engines/bmw_e34.cpp | 17 +++++++++++++++-- .../controllers/algo/engine_configuration.cpp | 12 ++++++------ firmware/controllers/algo/signal_executor.c | 4 ++-- unit_tests/test_util.cpp | 1 + 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index 5da5108450..05cbfe2d0f 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -50,8 +50,21 @@ void setBmwE34(engine_configuration_s *engineConfiguration) { bc->injectionPinMode = OM_INVERTED; - // emulating this 60-0 takes some resources, let's keep it slow by default - // rpm 200 + bc->injectionPins[0] = GPIOB_9; // #1 + bc->injectionPins[1] = GPIOB_8; // #2 + /** + * this is a relatively dirty performance hack: with unassigned pin we + * have less stuff to put into wave chart + */ + bc->injectionPins[2] = GPIO_UNASSIGNED; // #3 + bc->injectionPins[3] = GPIO_UNASSIGNED; // #4 + bc->injectionPins[4] = GPIO_UNASSIGNED; // #5 + bc->injectionPins[5] = GPIO_UNASSIGNED; // #6 + + /** + * emulating the 60-0 trigger takes some resources, let's keep it slow by default + * rpm 200 + */ bc->triggerSimulatorFrequency = 200; engineConfiguration->map.sensor.sensorType = MT_MPX4250; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 636e670486..ccaf8add77 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -346,12 +346,12 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_ boardConfiguration->electronicThrottlePin1 = GPIOC_9; boardConfiguration->o2heaterPin = GPIO_UNASSIGNED; - boardConfiguration->injectionPins[0] = GPIOB_9; - boardConfiguration->injectionPins[1] = GPIOB_8; - boardConfiguration->injectionPins[2] = GPIOE_3; - boardConfiguration->injectionPins[3] = GPIOE_5; - boardConfiguration->injectionPins[4] = GPIOE_6; - boardConfiguration->injectionPins[5] = GPIOC_12; + boardConfiguration->injectionPins[0] = GPIOB_9; // #1 + boardConfiguration->injectionPins[1] = GPIOB_8; // #2 + boardConfiguration->injectionPins[2] = GPIOE_3; // #3 + boardConfiguration->injectionPins[3] = GPIOE_5; // #4 + boardConfiguration->injectionPins[4] = GPIOE_6; // #5 + boardConfiguration->injectionPins[5] = GPIOC_12; // #6 boardConfiguration->injectionPins[6] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[7] = GPIO_UNASSIGNED; boardConfiguration->injectionPins[8] = GPIO_UNASSIGNED; diff --git a/firmware/controllers/algo/signal_executor.c b/firmware/controllers/algo/signal_executor.c index 0b170d5ee1..2aa6f90c7a 100644 --- a/firmware/controllers/algo/signal_executor.c +++ b/firmware/controllers/algo/signal_executor.c @@ -78,11 +78,11 @@ void turnPinHigh(io_pin_e pin) { #if EFI_WAVE_CHART // this is a performance optimization - array index is cheaper then invoking a method with 'switch' const char *pinName = namedPinsArray[pin]; - dbgDurr = hal_lld_get_counter_value() - dbgStart; +// dbgDurr = hal_lld_get_counter_value() - dbgStart; addWaveChartEvent(pinName, WC_UP); #endif /* EFI_WAVE_ANALYZER */ - dbgDurr = hal_lld_get_counter_value() - dbgStart; +// dbgDurr = hal_lld_get_counter_value() - dbgStart; } void turnPinLow(io_pin_e pin) { diff --git a/unit_tests/test_util.cpp b/unit_tests/test_util.cpp index 70b2d431c2..e741b7932b 100644 --- a/unit_tests/test_util.cpp +++ b/unit_tests/test_util.cpp @@ -20,6 +20,7 @@ #include "crc.h" #include "fl_stack.h" #include "io_pins.h" +#include "efiGpio.h" void testCrc(void) { assertEquals(4, efiRound(4.4, 1));