From a43aec4e6047c186c9dd96b84130952f349520bb Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 2 Apr 2022 23:50:39 -0400 Subject: [PATCH] Trigger setup in TS is highly confusing: hide operation mode from users? #4031 --- firmware/config/engines/GY6_139QMB.cpp | 2 ++ firmware/config/engines/test_engine.cpp | 2 ++ firmware/controllers/algo/defaults/default_base_engine.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/firmware/config/engines/GY6_139QMB.cpp b/firmware/config/engines/GY6_139QMB.cpp index 767c5e58cd..917f0b1e91 100644 --- a/firmware/config/engines/GY6_139QMB.cpp +++ b/firmware/config/engines/GY6_139QMB.cpp @@ -28,6 +28,8 @@ void setGy6139qmbDefaultEngineConfiguration() { engineConfiguration->specs.displacement = 0.072; // 72cc engineConfiguration->specs.cylindersCount = 1; setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); + // this is related to 'setDefaultBaseEngine' having 'skippedWheelOnCam = true' which is a weird fact by itself + engineConfiguration->skippedWheelOnCam = false; engineConfiguration->specs.firingOrder = FO_1; diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index f897254318..685db3722b 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -55,6 +55,8 @@ void setTestCrankEngineConfiguration() { engineConfiguration->trigger.type = TT_ONE; setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); + // this is related to 'setDefaultBaseEngine' having 'skippedWheelOnCam = true' which is a weird fact by itself + engineConfiguration->skippedWheelOnCam = false; } void setTestVVTEngineConfiguration() { diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index 82cc602f79..e6ecc3d8a4 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -34,7 +34,9 @@ void setDefaultBaseEngine() { // Trigger engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; + // huh WAT? our default is skipped on CAM?! and *many* our tests are relying on that?! setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); + engineConfiguration->skippedWheelOnCam = true; engineConfiguration->useOnlyRisingEdgeForTrigger = false; engineConfiguration->globalTriggerAngleOffset = 0;