From d993c6522bb18a691c2c4817743172721c0ed94a Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 26 May 2021 05:29:41 -0400 Subject: [PATCH] subaru 7/6 progress based on https://rusefi.com/forum/viewtopic.php?p=41021#p41021 --- .../trigger/decoders/trigger_subaru.cpp | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/firmware/controllers/trigger/decoders/trigger_subaru.cpp b/firmware/controllers/trigger/decoders/trigger_subaru.cpp index b755be008b..2f2e2813c1 100644 --- a/firmware/controllers/trigger/decoders/trigger_subaru.cpp +++ b/firmware/controllers/trigger/decoders/trigger_subaru.cpp @@ -51,64 +51,64 @@ static void initializeSubaru7_6(TriggerWaveform *s, bool withCrankWheel) { float magic = 333; - s->tdcPosition = 192; + s->tdcPosition = 200 + 360; float width = 5; - s->addEvent720(25 - width, T_PRIMARY, TV_RISE); - s->addEvent720(25, T_PRIMARY, TV_FALL); + s->addEvent720(15 - width, T_PRIMARY, TV_RISE); + s->addEvent720(15, T_PRIMARY, TV_FALL); if (withCrankWheel) { - s->addEvent720(magic - 180 - 87 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic - 180 - 87, T_SECONDARY, TV_FALL); + s->addEvent720(66 - width, T_SECONDARY, TV_RISE); + s->addEvent720(66, T_SECONDARY, TV_FALL); - s->addEvent720(magic - 180 - 55 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic - 180 - 55, T_SECONDARY, TV_FALL); + s->addEvent720(98 - width, T_SECONDARY, TV_RISE); + s->addEvent720(98, T_SECONDARY, TV_FALL); - s->addEvent720(magic - 180 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic - 180, T_SECONDARY, TV_FALL); + s->addEvent720(153 - width, T_SECONDARY, TV_RISE); + s->addEvent720(153, T_SECONDARY, TV_FALL); } - s->addEvent720(182 - width, T_PRIMARY, TV_RISE); - s->addEvent720(182, T_PRIMARY, TV_FALL); + s->addEvent720(180 - width, T_PRIMARY, TV_RISE); + s->addEvent720(180, T_PRIMARY, TV_FALL); if (withCrankWheel) { - s->addEvent720(magic - 87 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic - 87, T_SECONDARY, TV_FALL); + s->addEvent720(246 - width, T_SECONDARY, TV_RISE); + s->addEvent720(246, T_SECONDARY, TV_FALL); s->addEvent720(magic - 55 - width, T_SECONDARY, TV_RISE); s->addEvent720(magic - 55, T_SECONDARY, TV_FALL); - s->addEvent720(magic - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic, T_SECONDARY, TV_FALL); + s->addEvent720(333 - width, T_SECONDARY, TV_RISE); + s->addEvent720(333, T_SECONDARY, TV_FALL); } - s->addEvent720(343 - width, T_PRIMARY, TV_RISE); - s->addEvent720(343, T_PRIMARY, TV_FALL); + s->addEvent720(345 - width, T_PRIMARY, TV_RISE); + s->addEvent720(345, T_PRIMARY, TV_FALL); - s->addEvent720(366 - width, T_PRIMARY, TV_RISE); - s->addEvent720(366, T_PRIMARY, TV_FALL); + s->addEvent720(360 - width, T_PRIMARY, TV_RISE); + s->addEvent720(360, T_PRIMARY, TV_FALL); s->addEvent720(375 - width, T_PRIMARY, TV_RISE); s->addEvent720(375, T_PRIMARY, TV_FALL); if (withCrankWheel) { - s->addEvent720(magic + 180 - 87 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic + 180 - 87, T_SECONDARY, TV_FALL); + s->addEvent720(426 - width, T_SECONDARY, TV_RISE); + s->addEvent720(426, T_SECONDARY, TV_FALL); s->addEvent720(magic + 180 - 55 - width, T_SECONDARY, TV_RISE); s->addEvent720(magic + 180 - 55, T_SECONDARY, TV_FALL); - s->addEvent720(magic + 180 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic + 180, T_SECONDARY, TV_FALL); + s->addEvent720(513 - width, T_SECONDARY, TV_RISE); + s->addEvent720(513, T_SECONDARY, TV_FALL); } - s->addEvent720(538 - width, T_PRIMARY, TV_RISE); - s->addEvent720(538, T_PRIMARY, TV_FALL); + s->addEvent720(540 - width, T_PRIMARY, TV_RISE); + s->addEvent720(540, T_PRIMARY, TV_FALL); if (withCrankWheel) { - s->addEvent720(magic + 360 - 87 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic + 360 - 87, T_SECONDARY, TV_FALL); + s->addEvent720(606 - width, T_SECONDARY, TV_RISE); + s->addEvent720(606, T_SECONDARY, TV_FALL); s->addEvent720(magic + 360 - 55 - width, T_SECONDARY, TV_RISE); s->addEvent720(magic + 360 - 55, T_SECONDARY, TV_FALL); - s->addEvent720(magic + 360 - width, T_SECONDARY, TV_RISE); - s->addEvent720(magic + 360, T_SECONDARY, TV_FALL); + s->addEvent720(693 - width, T_SECONDARY, TV_RISE); + s->addEvent720(693, T_SECONDARY, TV_FALL); } s->addEvent720(720 - width, T_PRIMARY, TV_RISE);