From d3a21bcb63f9b7416a8f23e3b5b615c509bc27bb Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 4 Dec 2020 01:02:09 -0500 Subject: [PATCH] 6.1 Hemi V8 decoder #2010 --- .../trigger/decoders/trigger_chrysler.cpp | 13 +++++-------- firmware/controllers/trigger/trigger_simulator.cpp | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp index f3976d1f51..4c3a412b5c 100644 --- a/firmware/controllers/trigger/decoders/trigger_chrysler.cpp +++ b/firmware/controllers/trigger/decoders/trigger_chrysler.cpp @@ -583,30 +583,27 @@ void configureChryslerNGC_36_2_2(TriggerWaveform *s) { s->isSynchronizationNeeded = true; s->setTriggerSynchronizationGap(0.5); - s->setSecondTriggerSynchronizationGap(1); float base = 0; - for (int i = 0; i < 12; i++) { + for (int i = 0; i < 16; i++) { s->addEvent720(base + narrow / 2, T_PRIMARY, TV_RISE); s->addEvent720(base + narrow, T_PRIMARY, TV_FALL); base += narrow; } - s->addEvent720(base + wide / 2, T_PRIMARY, TV_RISE); + s->addEvent720(base + narrow / 2, T_PRIMARY, TV_RISE); + base += narrow / 2; s->addEvent720(base + wide, T_PRIMARY, TV_FALL); base += wide; - for (int i = 0; i < 15; i++) { + for (int i = 0; i < 14; i++) { s->addEvent720(base + narrow / 2, T_PRIMARY, TV_RISE); s->addEvent720(base + narrow, T_PRIMARY, TV_FALL); base += narrow; } - s->addEvent720(720 - wide - wide / 2, T_PRIMARY, TV_RISE); - s->addEvent720(720 - wide, T_PRIMARY, TV_FALL); - - s->addEvent720(720 - wide / 2, T_PRIMARY, TV_RISE); + s->addEvent720(720 - narrow / 2, T_PRIMARY, TV_RISE); s->addEvent720(720, T_PRIMARY, TV_FALL); s->useOnlyPrimaryForSync = true; } diff --git a/firmware/controllers/trigger/trigger_simulator.cpp b/firmware/controllers/trigger/trigger_simulator.cpp index 95b5d21e87..785f1e9bfa 100644 --- a/firmware/controllers/trigger/trigger_simulator.cpp +++ b/firmware/controllers/trigger/trigger_simulator.cpp @@ -122,7 +122,7 @@ void TriggerStimulatorHelper::assertSyncPositionAndSetDutyCycle( } int revolutionCounter = state.getTotalRevolutionCounter(); if (revolutionCounter != GAP_TRACKING_LENGTH + 1) { - warning(CUSTOM_OBD_TRIGGER_WAVEFORM, "sync failed/wrong gap parameters trigger=%s rc=%d", getTrigger_type_e(triggerConfiguration.TriggerType), revolutionCounter); + warning(CUSTOM_OBD_TRIGGER_WAVEFORM, "sync failed/wrong gap parameters trigger=%s revolutionCounter=%d", getTrigger_type_e(triggerConfiguration.TriggerType), revolutionCounter); shape.setShapeDefinitionError(true); return; }