From 5993da28c11b678b19147370ae4b0e1f5f4fc683 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 19 Aug 2015 22:01:27 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/bmw_e34.cpp | 2 ++ firmware/controllers/tachometer.cpp | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 25 +++++++++++++++++++++---- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index 89f61b1903..65fdf976d3 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -38,6 +38,8 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->ignitionMode = IM_WASTED_SPARK; engineConfiguration->useOnlyFrontForTrigger = true; + boardConfiguration->tachOutputPin = GPIOC_8; + // Trigger configuration // engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); diff --git a/firmware/controllers/tachometer.cpp b/firmware/controllers/tachometer.cpp index 8e5973740f..356e3428f7 100644 --- a/firmware/controllers/tachometer.cpp +++ b/firmware/controllers/tachometer.cpp @@ -15,7 +15,7 @@ static OutputPin tachOut; static scheduling_s tachTurnSignalOff; static void turnTachPinLow(void) { - + tachOut.setValue(false); } static void tachSignalCallback(trigger_event_e ckpSignalType, @@ -32,7 +32,7 @@ void initTachometer(void) { return; } - outputPinRegisterExt2("tach", &tachOut, boardConfiguration->tachOutputPin, &boardConfiguration->tachOutputPinMode); + outputPinRegisterExt2("analog tach output", &tachOut, boardConfiguration->tachOutputPin, &boardConfiguration->tachOutputPinMode); addTriggerEventListener(tachSignalCallback, "tach", engine); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index d3fb4279a5..a680d5e3c8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -570,7 +570,7 @@ baro_corr_table_t baroCorrTable; float[CRANKING_CURVE_SIZE] crankingTpsCoef;;"%", 1, 0, 0.0, 700.0, 2 float[CRANKING_CURVE_SIZE] crankingTpsBins;;"%", 1, 0, 0.0, 100.0, 2 - float tachPulseDuractionMs; + float tachPulseDuractionMs;;"ms", 1, 0, 0.0, 100.0, 2 int tachPulseTriggerIndex;trigger cycle index at which we start tach pulse (performance consideration);"index", 1, 0, 0.0, 360.0, 0 int[81] unused3; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 9e9e70ac3d..d6c20b2051 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -291,5 +291,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20150818; + return 20150819; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 172e75f49b..2961238753 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Tue Aug 18 23:30:03 EDT 2015 +; this section was generated by ConfigDefinition.jar on Wed Aug 19 20:32:13 EDT 2015 pageSize = 15288 page = 1 @@ -465,7 +465,7 @@ page = 1 ;skipping spi2MisoMode offset 1756 crankingTpsCoef = array, F32, 1760, [8], "%", 1, 0, 0.0, 700.0, 2 crankingTpsBins = array, F32, 1792, [8], "%", 1, 0, 0.0, 100.0, 2 -;skipping tachPulseDuractionMs offset 1824 + tachPulseDuractionMs = scalar, F32, 1824, "ms", 1, 0, 0.0, 100.0, 2 tachPulseTriggerIndex = scalar, S32, 1828, "index", 1, 0, 0.0, 360.0, 0 ;skipping unused3 offset 1832 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 @@ -719,7 +719,7 @@ fileVersion = { 20150625 } yBins = cltFuelCorr gauge = CLTGauge - curve = crankingFuelCurve, "Cranking Coolant Temp correction" + curve = crankingCltCurve, "Cranking Coolant Temp correction" columnLabel = "Coolant", "Correction" xAxis = -40, 120, 10 yAxis = 0, 5, 10 @@ -727,6 +727,14 @@ fileVersion = { 20150625 } yBins = crankingFuelCoef gauge = CLTGauge + curve = crankingTpsCurve, "Cranking TPS correction" + columnLabel = "tps", "Correction" + xAxis = -40, 120, 10 + yAxis = 0, 5, 10 + xBins = crankingTpsBins, TPS + yBins = crankingTpsCoef + gauge = throttleGauge + curve = crankingDurationCurve, "Cranking Duration correction" columnLabel = "Engine Cycle", "Correction" xAxis = 0, 1000, 10 @@ -960,6 +968,7 @@ fileVersion = { 20150625 } subMenu = egtInputs, "EGT inputs" subMenu = energySystems, "Battery and Alternator Settings" subMenu = speedSensor, "Speed Sensor Settings" + subMenu = tachSettings, "Tach output" subMenu = analogInputs, "Other inputs" subMenu = std_separator subMenu = fanSetting, "Fan Settings" @@ -973,7 +982,8 @@ fileVersion = { 20150625 } subMenu = generalSettings, "General" subMenu = std_separator subMenu = cranking, "Cranking" - subMenu = crankingFuelCurve, "Cranking Coolant Temp correction" + subMenu = crankingCltCurve, "Cranking Coolant Temp correction" + subMenu = crankingTpsCurve, "Cranking TPS correction" subMenu = crankingDurationCurve, "Cranking Duration correction" subMenu = std_separator subMenu = cltIdleCurve, "Idle warnup corection" @@ -1287,6 +1297,13 @@ fileVersion = { 20150625 } field = "MAF ADC input", mafAdcChannel field = "Baro ADC input", baroSensor_hwChannel + dialog = tachSettings, "Analog tachometer output" + field = "pin", tachOutputPin + field = "pin mode", tachOutputPinMode + field = "rise at trigger index", tachPulseTriggerIndex + field = "pulse duration", tachPulseDuractionMs + + ; Board->Connection dialog = tsPort, "TunerStudio Port" field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed