From 2836a0849a14c23ad7dc91af6b311e4c226799e9 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 7 Jan 2017 08:01:37 -0500 Subject: [PATCH] auto-sync --- .../trigger/decoders/trigger_subaru.cpp | 32 ++++++++----------- firmware/rusefi.cpp | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/firmware/controllers/trigger/decoders/trigger_subaru.cpp b/firmware/controllers/trigger/decoders/trigger_subaru.cpp index 2927f2a45d..eac8d312a0 100644 --- a/firmware/controllers/trigger/decoders/trigger_subaru.cpp +++ b/firmware/controllers/trigger/decoders/trigger_subaru.cpp @@ -49,34 +49,30 @@ void initialize36_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { void initializeSubaru7_6(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { s->initialize(FOUR_STROKE_CAM_SENSOR, false); - float t2 = 25; - float t3 = 15; float width = 5; - s->addEvent2(180 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); - s->addEvent2(180, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(25 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(25, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->addEvent2(360 - t2 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); - s->addEvent2(360 - t2, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(182 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(182, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->addEvent2(360 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); - s->addEvent2(360, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(343 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(343, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->addEvent2(540 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); - s->addEvent2(540, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(366 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(366, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(384 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(384, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->addEvent2(720 - 2 * t3 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); - s->addEvent2(720 - 2 * t3, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); + s->addEvent2(538 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(538, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->addEvent2(720 - t3 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); - s->addEvent2(720 - t3, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - - - s->addEvent2(720 - width / 2, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); + s->addEvent2(720 - width, T_PRIMARY, TV_RISE PASS_ENGINE_PARAMETER); s->addEvent2(720, T_PRIMARY, TV_FALL PASS_ENGINE_PARAMETER); - s->setTriggerSynchronizationGap(12); + s->setTriggerSynchronizationGap2(7, 9); s->isSynchronizationNeeded = true; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index f672ec2f1d..810c4c9c01 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -249,5 +249,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 20170105; + return 20170107; }