From 53d3c4a5296bf52940658d4e211546833499e9c9 Mon Sep 17 00:00:00 2001
From: rusefillc <rusefillc@gmail.com>
Date: Sun, 6 Nov 2022 01:32:59 -0400
Subject: [PATCH] minor trigger refactoring

---
 firmware/controllers/trigger/trigger_central.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index fb83cb6aef..5da99bec49 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -966,15 +966,15 @@ void TriggerCentral::validateCamVvtCounters() {
  * Calculate 'shape.triggerShapeSynchPointIndex' value using 'TriggerDecoderBase *state'
  */
 static void calculateTriggerSynchPoint(
-		TriggerCentral *triggerCentral,
+		const PrimaryTriggerConfiguration &primaryTriggerConfiguration,
 		TriggerWaveform& shape,
-		TriggerDecoderBase& state) {
+		TriggerDecoderBase& initState) {
 
 #if EFI_PROD_CODE
 	efiAssertVoid(CUSTOM_TRIGGER_STACK, getCurrentRemainingStack() > EXPECTED_REMAINING_STACK, "calc s");
 #endif
-	triggerCentral->triggerErrorDetection.clear();
-	shape.initializeSyncPoint(state, triggerCentral->primaryTriggerConfiguration);
+
+	shape.initializeSyncPoint(initState, primaryTriggerConfiguration);
 
 	if (shape.getSize() >= PWM_PHASE_MAX_COUNT) {
 		// todo: by the time we are here we had already modified a lot of RAM out of bounds!
@@ -1026,11 +1026,13 @@ void TriggerCentral::updateWaveform() {
 
 		efiAssertVoid(CUSTOM_SHAPE_LEN_ZERO, length > 0, "shapeLength=0");
 
+		triggerErrorDetection.clear();
+
 		/**
 	 	 * 'initState' instance of TriggerDecoderBase is used only to initialize 'this' TriggerWaveform instance
 	 	 * #192 BUG real hardware trigger events could be coming even while we are initializing trigger
 	 	 */
-		calculateTriggerSynchPoint(this,
+		calculateTriggerSynchPoint(primaryTriggerConfiguration,
 				triggerShape,
 				initState);
 	}