From 1c203a948d14616e202a73fdbd52915e481867be Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 25 Oct 2018 18:17:47 -0400
Subject: [PATCH] fix #615

---
 .../trigger/decoders/trigger_chrysler.cpp     | 36 +++++++++++++++++--
 .../controllers/trigger/trigger_decoder.cpp   |  3 ++
 java_console/.gitignore                       |  3 +-
 unit_tests/triggers.txt                       | 36 +++++++++++++++++++
 4 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp
index 086e321ca6..e7524deddc 100644
--- a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp
@@ -545,6 +545,38 @@ void initJeep18_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
 
 }
 
-void initJeep_XJ_4cyl_2500(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
-	initJeep18_2_2_2(s PASS_ENGINE_PARAMETER_SUFFIX);
+static void add4cylblock(int off, TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	s->addEvent2(114 + off, T_SECONDARY, TV_RISE PASS_ENGINE_PARAMETER_SUFFIX);
+	s->addEvent2(114 + off + 2, T_SECONDARY, TV_FALL PASS_ENGINE_PARAMETER_SUFFIX);
+
+	s->addEvent2(134 + off, T_SECONDARY, TV_RISE PASS_ENGINE_PARAMETER_SUFFIX);
+	s->addEvent2(134 + off + 2, T_SECONDARY, TV_FALL PASS_ENGINE_PARAMETER_SUFFIX);
+
+	s->addEvent2(154 + off, T_SECONDARY, TV_RISE PASS_ENGINE_PARAMETER_SUFFIX);
+	s->addEvent2(154 + off + 2, T_SECONDARY, TV_FALL PASS_ENGINE_PARAMETER_SUFFIX);
+
+	s->addEvent2(174 + off, T_SECONDARY, TV_RISE PASS_ENGINE_PARAMETER_SUFFIX);
+	s->addEvent2(174 + off + 2, T_SECONDARY, TV_FALL PASS_ENGINE_PARAMETER_SUFFIX);
+}
+
+// TT_JEEP_4_CYL
+void initJeep_XJ_4cyl_2500(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	s->initialize(FOUR_STROKE_CAM_SENSOR, true);
+	s->isSynchronizationNeeded = true;
+	s->setTriggerSynchronizationGap(1);
+	s->useOnlyPrimaryForSync = true;
+	s->tdcPosition = 720 - 236;
+
+	float offset = 124;
+
+	add4cylblock(offset - 180, s PASS_ENGINE_PARAMETER_SUFFIX);
+	add4cylblock(offset, s PASS_ENGINE_PARAMETER_SUFFIX);
+
+	s->addEvent2(236 + offset, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER_SUFFIX); // 360
+
+	add4cylblock(offset + 180, s PASS_ENGINE_PARAMETER_SUFFIX);
+	add4cylblock(offset + 360, s PASS_ENGINE_PARAMETER_SUFFIX);
+
+	s->addEvent2(596 + offset, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER_SUFFIX); // 720
+
 }
diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index 5bad3931be..3fc27ed07b 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -597,6 +597,9 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
 		break;
 
 	case TT_JEEP_4_CYL:
+		initJeep_XJ_4cyl_2500(this PASS_ENGINE_PARAMETER_SUFFIX);
+		break;
+
 	case TT_JEEP_18_2_2_2:
 		initJeep18_2_2_2(this PASS_ENGINE_PARAMETER_SUFFIX);
 		break;
diff --git a/java_console/.gitignore b/java_console/.gitignore
index e2ce0ff799..4af1a17db9 100644
--- a/java_console/.gitignore
+++ b/java_console/.gitignore
@@ -4,4 +4,5 @@ output.c
 currenttune.msq
 rusefi.ini
 openocd
-rusefi_*.*
\ No newline at end of file
+rusefi_*.*
+triggers
\ No newline at end of file
diff --git a/unit_tests/triggers.txt b/unit_tests/triggers.txt
index c163aa10d6..c6b073bf77 100644
--- a/unit_tests/triggers.txt
+++ b/unit_tests/triggers.txt
@@ -2445,3 +2445,39 @@ event 28 1 581.00
 event 29 0 586.00
 event 30 1 610.00
 event 31 0 615.00
+TRIGGERTYPE 40 34 TT_JEEP_4_CYL 484.00
+# duty 0.50 0.04
+event 0 1 0.00
+event 1 1001 58.00
+event 2 1000 60.00
+event 3 1001 78.00
+event 4 1000 80.00
+event 5 1001 98.00
+event 6 1000 100.00
+event 7 1001 118.00
+event 8 1000 120.00
+event 9 1001 238.00
+event 10 1000 240.00
+event 11 1001 258.00
+event 12 1000 260.00
+event 13 1001 278.00
+event 14 1000 280.00
+event 15 1001 298.00
+event 16 1000 300.00
+event 17 0 360.00
+event 18 1001 418.00
+event 19 1000 420.00
+event 20 1001 438.00
+event 21 1000 440.00
+event 22 1001 458.00
+event 23 1000 460.00
+event 24 1001 478.00
+event 25 1000 480.00
+event 26 1001 598.00
+event 27 1000 600.00
+event 28 1001 618.00
+event 29 1000 620.00
+event 30 1001 638.00
+event 31 1000 640.00
+event 32 1001 658.00
+event 33 1000 660.00