From ea94fc05ae0208bec260443cc1da521f54c3e3ce Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 1 Apr 2022 21:10:08 -0400 Subject: [PATCH] Refactoring, technical debt: export more of trigger attributes into triggers.txt file #2077 --- firmware/controllers/trigger/decoders/trigger_gm.cpp | 1 + firmware/controllers/trigger/decoders/trigger_mazda.cpp | 2 ++ firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp | 1 + firmware/controllers/trigger/decoders/trigger_structure.cpp | 1 + firmware/controllers/trigger/decoders/trigger_structure.h | 2 ++ 5 files changed, 7 insertions(+) diff --git a/firmware/controllers/trigger/decoders/trigger_gm.cpp b/firmware/controllers/trigger/decoders/trigger_gm.cpp index d7688de08c..ed5a13a723 100644 --- a/firmware/controllers/trigger/decoders/trigger_gm.cpp +++ b/firmware/controllers/trigger/decoders/trigger_gm.cpp @@ -22,6 +22,7 @@ static float addTooth(float offset, TriggerWaveform *s) { void configureGm60_2_2_2(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CAM_SENSOR); s->isSynchronizationNeeded = false; + s->isSecondWheelCam = true; float m = CRANK_MODE_MULTIPLIER; int offset = 1 * m; diff --git a/firmware/controllers/trigger/decoders/trigger_mazda.cpp b/firmware/controllers/trigger/decoders/trigger_mazda.cpp index c0e3598132..0c9ff5aaf0 100644 --- a/firmware/controllers/trigger/decoders/trigger_mazda.cpp +++ b/firmware/controllers/trigger/decoders/trigger_mazda.cpp @@ -26,6 +26,7 @@ void initializeMazdaMiataNaShape(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CAM_SENSOR); + s->isSecondWheelCam = true; // nominal gap is 0.325 s->setTriggerSynchronizationGap2(0.1, 0.5); @@ -154,6 +155,7 @@ void configureMazdaProtegeSOHC(TriggerWaveform *s) { void configureMazdaProtegeLx(TriggerWaveform *s) { s->initialize(FOUR_STROKE_CAM_SENSOR); + s->isSecondWheelCam = true; /** * based on https://svn.code.sf.net/p/rusefi/code/trunk/misc/logs/1993_escort_gt/MAIN_rfi_report_2015-02-01%2017_39.csv */ diff --git a/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp b/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp index b376a5fdd8..dc9aeabacf 100644 --- a/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp +++ b/firmware/controllers/trigger/decoders/trigger_mitsubishi.cpp @@ -11,6 +11,7 @@ void configureFordAspireTriggerWaveform(TriggerWaveform * s) { s->initialize(FOUR_STROKE_CAM_SENSOR); s->isSynchronizationNeeded = false; + s->isSecondWheelCam = true; float x = 121.90; float y = 110.86; diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index e0164ab642..38881e2c83 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -56,6 +56,7 @@ TriggerWaveform::TriggerWaveform() { void TriggerWaveform::initialize(operation_mode_e operationMode) { isSynchronizationNeeded = true; // that's default value bothFrontsRequired = false; + isSecondWheelCam = false; needSecondTriggerInput = false; shapeWithoutTdc = false; memset(expectedDutyCycle, 0, sizeof(expectedDutyCycle)); diff --git a/firmware/controllers/trigger/decoders/trigger_structure.h b/firmware/controllers/trigger/decoders/trigger_structure.h index 972e828973..75cdd46f78 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.h +++ b/firmware/controllers/trigger/decoders/trigger_structure.h @@ -82,6 +82,8 @@ public: * one primary channel tooth each raising (or falling depending on configuration) front would synchronize */ bool isSynchronizationNeeded; + + bool isSecondWheelCam; /** * number of consecutive trigger gaps needed to synchronize */