From b6f5e5f34d6c5c5677a89d77938f799d5fc199ac Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 26 Jan 2021 21:16:47 -0500
Subject: [PATCH] M62T vanos support #2243

---
 firmware/controllers/trigger/trigger_central.cpp | 9 ++++++---
 firmware/controllers/trigger/trigger_central.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index dab13f5e38..99c14ce703 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -54,7 +54,9 @@ TriggerCentral::TriggerCentral() : trigger_central_s() {
 
 void TriggerCentral::init(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	INJECT_ENGINE_REFERENCE(&triggerState);
-	INJECT_ENGINE_REFERENCE(&vvtState);
+	for (int bankIndex = 0; bankIndex < BANKS_COUNT; bankIndex++) {
+		INJECT_ENGINE_REFERENCE(&vvtState[bankIndex]);
+	}
 }
 
 void TriggerNoiseFilter::resetAccumSignalData() {
@@ -87,6 +89,7 @@ static bool vvtWithRealDecoder(vvt_mode_e vvtMode) {
 }
 
 void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	int bankIndex = 0;
 	TriggerCentral *tc = &engine->triggerCentral;
 	if (front == TV_RISE) {
 		tc->vvtEventRiseCounter++;
@@ -157,7 +160,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_
 		return;
 	}
 
-	ENGINE(triggerCentral).vvtState.decodeTriggerEvent(
+	ENGINE(triggerCentral).vvtState[bankIndex].decodeTriggerEvent(
 			ENGINE(triggerCentral).vvtShape,
 			nullptr,
 			nullptr,
@@ -192,7 +195,7 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_
 	case MIATA_NB2:
 	case VVT_BOSCH_QUICK_START:
 	 {
-		if (engine->triggerCentral.vvtState.currentCycle.current_index != 0) {
+		if (engine->triggerCentral.vvtState[bankIndex].currentCycle.current_index != 0) {
 			// this is not NB2 sync tooth - exiting
 			return;
 		}
diff --git a/firmware/controllers/trigger/trigger_central.h b/firmware/controllers/trigger/trigger_central.h
index dc0b748577..0efa0b6b49 100644
--- a/firmware/controllers/trigger/trigger_central.h
+++ b/firmware/controllers/trigger/trigger_central.h
@@ -69,7 +69,7 @@ public:
 	TriggerStateWithRunningStatistics triggerState;
 	TriggerWaveform triggerShape;
 
-	TriggerState vvtState;
+	TriggerState vvtState[BANKS_COUNT];
 	TriggerWaveform vvtShape;
 
 	TriggerFormDetails triggerFormDetails;