From d4e48a142d35788f62ba9fb09fdaba9ffbbcb4d1 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 27 Jul 2015 00:01:35 -0400 Subject: [PATCH] auto-sync --- .../controllers/trigger/rpm_calculator.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp index 40083fa8b5..968ad530f0 100644 --- a/firmware/controllers/trigger/rpm_calculator.cpp +++ b/firmware/controllers/trigger/rpm_calculator.cpp @@ -164,11 +164,20 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, efiAssertVoid(getRemainingStack(chThdSelf()) > 256, "lowstck#2z"); #endif +#if EFI_ANALOG_CHART || defined(__DOXYGEN__) + angle_t crankAngle; + int signal; + if (boardConfiguration->sensorChartMode == SC_TRIGGER) { + crankAngle = getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER); + signal = 1000 * ckpSignalType + index; + } +#endif + if (index != 0) { #if EFI_ANALOG_CHART || defined(__DOXYGEN__) - if (boardConfiguration->sensorChartMode == SC_TRIGGER) - scAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), - 1000 * ckpSignalType + index); + if (boardConfiguration->sensorChartMode == SC_TRIGGER) { + scAddData(crankAngle, signal); + } #endif return; } @@ -195,8 +204,9 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, rpmState->onNewEngineCycle(); rpmState->lastRpmEventTimeNt = nowNt; #if EFI_ANALOG_CHART || defined(__DOXYGEN__) - if (boardConfiguration->sensorChartMode == SC_TRIGGER) - scAddData(getCrankshaftAngleNt(nowNt PASS_ENGINE_PARAMETER), index); + if (boardConfiguration->sensorChartMode == SC_TRIGGER) { + scAddData(crankAngle, signal); + } #endif engine->m.rpmCbTime = GET_TIMESTAMP() - engine->m.beforeRpmCb; }