From a0639bc668ace383e5302c25b18ed25eca85b4bd Mon Sep 17 00:00:00 2001
From: rusEfi <russianefi@gmail.com>
Date: Mon, 14 Dec 2015 21:01:30 -0500
Subject: [PATCH] auto-sync

---
 firmware/controllers/algo/auto_generated_enums.cpp |  2 ++
 firmware/controllers/algo/rusefi_enums.h           |  4 +++-
 firmware/controllers/trigger/trigger.mk            |  1 +
 firmware/controllers/trigger/trigger_decoder.cpp   |  5 +++++
 firmware/controllers/trigger/trigger_toyota.cpp    | 10 ++++++++++
 firmware/rusefi.cpp                                |  2 +-
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index e62cea2512..cc9931ddda 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -159,6 +159,8 @@ case TT_UNUSED:
 	return "TT_UNUSED";
 case TT_NISSAN:
 	return "TT_NISSAN";
+case TT_2JZ:
+	return "TT_2JZ";
   }
  return NULL;
 }
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index f462525eab..c6e37ee518 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -155,7 +155,9 @@ typedef enum {
 
 	TT_NISSAN = 24,
 
-	TT_UNUSED = 25, // this is used if we want to iterate over all trigger types
+	TT_2JZ = 25,
+
+	TT_UNUSED = 26, // this is used if we want to iterate over all trigger types
 
 	Force_4b_trigger_type = ENUM_32_BITS,
 } trigger_type_e;
diff --git a/firmware/controllers/trigger/trigger.mk b/firmware/controllers/trigger/trigger.mk
index eff136a6d3..e65e260da0 100644
--- a/firmware/controllers/trigger/trigger.mk
+++ b/firmware/controllers/trigger/trigger.mk
@@ -11,6 +11,7 @@ TRIGGER_DECODERS_SRC_CPP = \
 	$(PROJECT_DIR)/controllers/trigger/trigger_mitsubishi.cpp \
 	$(PROJECT_DIR)/controllers/trigger/trigger_nissan.cpp \
 	$(PROJECT_DIR)/controllers/trigger/trigger_subaru.cpp \
+	$(PROJECT_DIR)/controllers/trigger/trigger_toyota.cpp \
 	$(PROJECT_DIR)/controllers/trigger/trigger_gm.cpp
 
 TRIGGER_SRC_CPP = \
diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index 5f7d2dcfa3..79c9016b1b 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -32,6 +32,7 @@
 #include "trigger_mitsubishi.h"
 #include "trigger_subaru.h"
 #include "trigger_nissan.h"
+#include "trigger_toyota.h"
 #include "auto_generated_enums.h"
 #include "trigger_structure.h"
 #include "efiGpio.h"
@@ -500,6 +501,10 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
 		initialize36_2_2_2(triggerShape);
 		break;
 
+	case TT_2JZ:
+		initialize2jzGE(triggerShape);
+		break;
+
 	case TT_NISSAN:
 		initializeNissan(triggerShape);
 		break;
diff --git a/firmware/controllers/trigger/trigger_toyota.cpp b/firmware/controllers/trigger/trigger_toyota.cpp
index b57188a8f4..e520ad5915 100644
--- a/firmware/controllers/trigger/trigger_toyota.cpp
+++ b/firmware/controllers/trigger/trigger_toyota.cpp
@@ -9,4 +9,14 @@
 
 #include "trigger_toyota.h"
 
+EXTERN_ENGINE;
 
+void initialize2jzGE(TriggerShape *s) {
+	s->initialize(FOUR_STROKE_CAM_SENSOR, false);
+
+	initializeSkippedToothTriggerShapeExt(s, 3, 0,
+			FOUR_STROKE_CAM_SENSOR);
+
+	s->isSynchronizationNeeded = false;
+
+}
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index f8f65ee616..7e95724b81 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -275,5 +275,5 @@ int getRusEfiVersion(void) {
 		return 123; // this is here to make the compiler happy about the unused array
 	if (UNUSED_CCM_SIZE[0] * 0 != 0)
 		return 3211; // this is here to make the compiler happy about the unused array
-	return 20151208;
+	return 20151214;
 }