From a72cd9c9db3aad5e191d51e27b605214b592b00d Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Sun, 21 Oct 2018 11:27:14 -0400
Subject: [PATCH] refactoring trigger sync layer

---
 firmware/controllers/trigger/trigger_decoder.cpp | 15 ++++++++++-----
 firmware/controllers/trigger/trigger_decoder.h   |  3 ++-
 firmware/controllers/trigger/trigger_structure.h |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index b4e29746e6..887a2e3ce3 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -131,7 +131,7 @@ void TriggerState::reset() {
 	toothed_previous_time = 0;
 	toothed_previous_duration = 0;
 	durationBeforePrevious = 0;
-	thirdPreviousDuration = 0;
+	memset(toothDurations, 0, sizeof(toothDurations));
 
 	totalRevolutionCounter = 0;
 	totalTriggerErrorCounter = 0;
@@ -266,8 +266,8 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
 			bool secondaryGap = cisnan(TRIGGER_SHAPE(syncronizationRatioFrom[1])) || (toothed_previous_duration > durationBeforePrevious * TRIGGER_SHAPE(syncronizationRatioFrom[1])
 			&& toothed_previous_duration < durationBeforePrevious * TRIGGER_SHAPE(syncronizationRatioTo[1]));
 
-			bool thirdGap = cisnan(TRIGGER_SHAPE(syncronizationRatioFrom[2])) || (durationBeforePrevious > thirdPreviousDuration * TRIGGER_SHAPE(syncronizationRatioFrom[2])
-			&& durationBeforePrevious < thirdPreviousDuration * TRIGGER_SHAPE(syncronizationRatioTo[2]));
+			bool thirdGap = cisnan(TRIGGER_SHAPE(syncronizationRatioFrom[2])) || (durationBeforePrevious > toothDurations[2] * TRIGGER_SHAPE(syncronizationRatioFrom[2])
+			&& durationBeforePrevious < toothDurations[2] * TRIGGER_SHAPE(syncronizationRatioTo[2]));
 
 			/**
 			 * Here I prefer to have two multiplications instead of one division, that's a micro-optimization
@@ -283,7 +283,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
 #endif /* EFI_PROD_CODE */
 				float gap = 1.0 * currentDuration / toothed_previous_duration;
 				float prevGap = 1.0 * toothed_previous_duration / durationBeforePrevious;
-				float gap3 = 1.0 * durationBeforePrevious / thirdPreviousDuration;
+				float gap3 = 1.0 * durationBeforePrevious / toothDurations[2];
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 				scheduleMsg(logger, "%d: cur=%.2f/prev=%.2f/3rd=%.2f @ %d while expected from %.2f to %.2f and 2nd from %.2f to %.2f and 3rd from %.2f to %.2f error=%d",
 						getTimeNowSeconds(),
@@ -293,6 +293,11 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
 						TRIGGER_SHAPE(syncronizationRatioFrom[1]), TRIGGER_SHAPE(syncronizationRatioTo[1]),
 						TRIGGER_SHAPE(syncronizationRatioFrom[2]), TRIGGER_SHAPE(syncronizationRatioTo[2]),
 						someSortOfTriggerError);
+
+				for (int i = 0;i<GAP_TRACKING_LENGHT;i++) {
+					scheduleMsg(logger, "%d:", i);
+				}
+
 #else
 				actualSynchGap = gap;
 				print("current gap %.2f/%.2f/%.2f c=%d prev=%d\r\n", gap, prevGap, gap3, currentDuration, toothed_previous_duration);
@@ -419,7 +424,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
 			;
 		}
 
-		thirdPreviousDuration = durationBeforePrevious;
+		toothDurations[2] = durationBeforePrevious;
 		durationBeforePrevious = toothed_previous_duration;
 		toothed_previous_duration = currentDuration;
 		toothed_previous_time = nowNt;
diff --git a/firmware/controllers/trigger/trigger_decoder.h b/firmware/controllers/trigger/trigger_decoder.h
index 7da75c9506..f17af99fdb 100644
--- a/firmware/controllers/trigger/trigger_decoder.h
+++ b/firmware/controllers/trigger/trigger_decoder.h
@@ -74,9 +74,10 @@ public:
 	 */
 	bool shaft_is_synchronized;
 
+	uint32_t toothDurations[GAP_TRACKING_LENGHT];
+
 	uint32_t toothed_previous_duration; // todo: unify Camel_notation, what a mess :(
 	uint32_t durationBeforePrevious; // this one is before 'toothed_previous_duration'
-	uint32_t thirdPreviousDuration; // this one is before durationBeforePrevious, todo: better field names?
 
 	/**
 	 * this could be a local variable, but it's better for debugging to have it as a field
diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h
index a4fef5b813..24068f3573 100644
--- a/firmware/controllers/trigger/trigger_structure.h
+++ b/firmware/controllers/trigger/trigger_structure.h
@@ -45,7 +45,7 @@ private:
 class Engine;
 class TriggerState;
 
-#define GAP_TRACKING_LENGHT 3
+#define GAP_TRACKING_LENGHT 4
 
 /**
  * @brief Trigger shape has all the fields needed to describe and decode trigger signal.