From 672bcf41826e24946f6dab39e7df3b6fe31575cf Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 19 Mar 2015 08:04:46 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/bmw_e34.cpp | 2 +- firmware/config/engines/mazda_626.cpp | 1 + firmware/console/status_loop.cpp | 3 +++ firmware/controllers/trigger/main_trigger_callback.cpp | 4 +--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index b198e5f357..494bd035ce 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -24,7 +24,7 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) { // engineConfiguration->algorithm = LM_SPEED_DENSITY; engineConfiguration->injector.flow = 750; - boardConfiguration->tunerStudioSerialSpeed = 115200; + boardConfiguration->tunerStudioSerialSpeed = 38400; engineConfiguration->rpmHardLimit = 6000; setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index 7f384bd3dd..826d0d1202 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -13,6 +13,7 @@ #include "honda_accord.h" #include "custom_engine.h" #include "allsensors.h" +#include "fsio_impl.h" EXTERN_ENGINE; diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index ddb8aa2f6a..7e274a4a6c 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -584,6 +584,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ tsOutputChannels->isIatError = !isValidIntakeAirTemperature(getIntakeAirTemperature(PASS_ENGINE_PARAMETER_F)); #endif /* EFI_PROD_CODE */ + tsOutputChannels->knockNowIndicator = engine->knockNow; + tsOutputChannels->knockEverIndicator = engine->knockEver; + tsOutputChannels->clutchUpState = engine->clutchUpState; tsOutputChannels->clutchDownState = engine->clutchDownState; tsOutputChannels->tCharge = getTCharge(rpm, tps, coolant, intake); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index a43fd6ab40..4d76054ef8 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -342,11 +342,9 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) { float externalKnockValue = getAdcValue(engineConfiguration->externalKnockSenseAdc); engine->knockNow = externalKnockValue > 2.5; - - + engine->knockEver |= engine->knockNow; } - engine->m.beforeIgnitionMath = GET_TIMESTAMP(); ignitionCalc(rpm PASS_ENGINE_PARAMETER); engine->m.ignitionMathTime = GET_TIMESTAMP() - engine->m.beforeIgnitionMath;