From 342a331e1c7b3d52962f3624a7fa57a287ee4cc3 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 10 May 2020 11:54:21 -0400 Subject: [PATCH] 34-2 3 cam Toyota wheel progress --- firmware/controllers/trigger/trigger_central.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 810b590eff..285499cce5 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -145,6 +145,13 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_ tc->vvtCamCounter++; + efitick_t offsetNt = nowNt - tc->timeAtVirtualZeroNt; + angle_t currentPosition = NT2US(offsetNt) / oneDegreeUs; + // convert engine cycle angle into trigger cycle angle + currentPosition -= tdcPosition(); + fixAngle(currentPosition, "currentPosition", CUSTOM_ERR_6558); + + switch(engineConfiguration->vvtMode) { case MIATA_NB2: { @@ -159,6 +166,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_ scheduleMsg(logger, "vvt ratio %.2f", ratio); } if (ratio < miataNb2VVTRatioFrom || ratio > miataNb2VVTRatioTo) { + // this is not NB2 sync tooth - exiting return; } if (engineConfiguration->verboseTriggerSynchDetails) { @@ -174,14 +182,6 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_ tc->vvtSyncTimeNt = nowNt; - efitick_t offsetNt = nowNt - tc->timeAtVirtualZeroNt; - - angle_t currentPosition = NT2US(offsetNt) / oneDegreeUs; - - // convert engine cycle angle into trigger cycle angle - currentPosition -= tdcPosition(); - fixAngle(currentPosition, "currentPosition", CUSTOM_ERR_6558); - tc->vvtPosition = engineConfiguration->vvtOffset - currentPosition; switch (engineConfiguration->vvtMode) {