From aca5755609b0d81a329ece33ebc20804d67915e3 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 25 May 2017 22:45:12 -0400 Subject: [PATCH] refactoring --- firmware/controllers/trigger/rpm_calculator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp index 12c8d8936c..33af1929d0 100644 --- a/firmware/controllers/trigger/rpm_calculator.cpp +++ b/firmware/controllers/trigger/rpm_calculator.cpp @@ -176,7 +176,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index DECLARE_ENGINE_PARAMETER_SUFFIX) { RpmCalculator *rpmState = &engine->rpmCalculator; efitick_t nowNt = getTimeNowNt(); - engine->m.beforeRpmCb = GET_TIMESTAMP(); + ENGINE(m.beforeRpmCb) = GET_TIMESTAMP(); #if EFI_PROD_CODE efiAssertVoid(getRemainingStack(chThdGetSelfX()) > 256, "lowstckRCL"); #endif @@ -228,7 +228,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, scAddData(crankAngle, signal); } #endif - engine->m.rpmCbTime = GET_TIMESTAMP() - engine->m.beforeRpmCb; + ENGINE(m.rpmCbTime) = GET_TIMESTAMP() - ENGINE(m.beforeRpmCb); } static scheduling_s tdcScheduler[2]; @@ -254,7 +254,7 @@ static void tdcMarkCallback(trigger_event_e ckpSignalType, bool isTriggerSynchronizationPoint = index0 == 0; if (isTriggerSynchronizationPoint && ENGINE(isEngineChartEnabled)) { int revIndex2 = engine->rpmCalculator.getRevolutionCounter() % 2; - int rpm = getRpmE(engine); + int rpm = ENGINE(rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE)); // todo: use event-based scheduling, not just time-based scheduling if (isValidRpm(rpm)) { scheduleByAngle(rpm, &tdcScheduler[revIndex2], tdcPosition(),