toyota 3 tooth cam decoder #237

FOME-Tech · Sep 14, 2023 · a6a25ba · a6a25ba
1 parent a47bc88
commit a6a25ba
Show file tree

Hide file tree

Showing 4 changed files with 1,632 additions and 6 deletions.
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
@@ -299,14 +299,15 @@ void hwHandleVvtCamSignal(bool isRising, efitick_t nowNt, int index) {
 	}
 
 	switch(engineConfiguration->vvtMode[camIndex]) {
-	case VVT_2JZ:
-		// we do not know if we are in sync or out of sync, so we have to be looking for both possibilities
-		if ((currentPosition < engineConfiguration->scriptSetting[4]       || currentPosition > engineConfiguration->scriptSetting[5]) &&
-		    (currentPosition < engineConfiguration->scriptSetting[4] + 360 || currentPosition > engineConfiguration->scriptSetting[5] + 360)) {
-			// outside of the expected range
+	case VVT_2JZ: {
+		// Consider the tooth in the first 1/3 of the engine phase
+		bool inRange = angleFromPrimarySyncPoint > 0 && angleFromPrimarySyncPoint < (720 / 3);
+
+		if (!inRange) {
 			return;
 		}
-		break;
+
+		} break;
 	default:
 		// else, do nothing
 		break;

diff --git a/unit_tests/tests/tests.mk b/unit_tests/tests/tests.mk
@@ -20,6 +20,7 @@ TESTS_SRC_CPP = \
 	tests/trigger/test_real_gm_24x.cpp \
 	tests/trigger/test_real_k24a2.cpp \
 	tests/trigger/test_real_k20.cpp \
+	tests/trigger/test_real_toyota_3_tooth_cam.cpp \
 	tests/trigger/test_map_cam.cpp \
 	tests/trigger/test_rpm_multiplier.cpp \
 	tests/trigger/test_quad_cam.cpp \