diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index c8397e2e4f..04f5fee268 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -149,12 +149,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index eeea731231..dc6324b5d5 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -170,12 +170,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/cypress/board_configuration.cpp b/firmware/config/boards/hellen/cypress/board_configuration.cpp index 68b55ee37c..7acd014a42 100644 --- a/firmware/config/boards/hellen/cypress/board_configuration.cpp +++ b/firmware/config/boards/hellen/cypress/board_configuration.cpp @@ -13,9 +13,6 @@ void setBoardDefaultConfiguration() { setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - engineConfiguration->invertPrimaryTriggerSignal = true; engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->useNoiselessTriggerDecoder = true; diff --git a/firmware/config/boards/hellen/harley81/board_configuration.cpp b/firmware/config/boards/hellen/harley81/board_configuration.cpp index 9f855a62ab..49032b67ed 100644 --- a/firmware/config/boards/hellen/harley81/board_configuration.cpp +++ b/firmware/config/boards/hellen/harley81/board_configuration.cpp @@ -150,12 +150,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index 97201c5baf..e42ca898ae 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -129,12 +129,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 9b5283a6be..a8f5b31c4f 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -160,12 +160,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - strcpy(engineConfiguration->engineMake, ENGINE_MAKE_VAG); strcpy(engineConfiguration->engineCode, "base"); diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index d9e543a54b..4b909d23b1 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -191,12 +191,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; engineConfiguration->specs.displacement = 2.295f; diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp index babb3abab2..5aa9c477f9 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp @@ -139,12 +139,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index de9d2046a1..270b1be86d 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -145,12 +145,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/hellen81/board_configuration.cpp b/firmware/config/boards/hellen/hellen81/board_configuration.cpp index b28996a254..b292bf7dbf 100644 --- a/firmware/config/boards/hellen/hellen81/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen81/board_configuration.cpp @@ -150,12 +150,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp index 2814137550..37e16d9153 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp @@ -139,12 +139,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/kinetis/board_configuration.cpp b/firmware/config/boards/kinetis/board_configuration.cpp index a628a50451..cc260910e1 100644 --- a/firmware/config/boards/kinetis/board_configuration.cpp +++ b/firmware/config/boards/kinetis/board_configuration.cpp @@ -15,10 +15,6 @@ int __debugEnabled = 0; #endif void setBoardOverrides() { - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->useNoiselessTriggerDecoder = true; diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index 8a9b28e943..b15cf242a1 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -214,12 +214,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 81c5c1acde..b90af4154e 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -17,11 +17,6 @@ static bool is469 = false; static void setPrometheusDefaults() { - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - //engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->useCicPidForIdle = true; engineConfiguration->specs.cylindersCount = 4; diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index 67455e47dd..349da49f9c 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -185,12 +185,6 @@ void setBoardDefaultConfiguration() { // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; diff --git a/firmware/config/boards/skeleton/board_configuration.cpp b/firmware/config/boards/skeleton/board_configuration.cpp index c30ad25eb5..be542283e2 100644 --- a/firmware/config/boards/skeleton/board_configuration.cpp +++ b/firmware/config/boards/skeleton/board_configuration.cpp @@ -199,12 +199,6 @@ void setBoardDefaultConfiguration() { // The "required" hardware is done - set some reasonable input defaults setupDefaultSensorInputs(); - // Some sensible defaults for other options - setCrankOperationMode(); - engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->useOnlyRisingEdgeForTrigger = true; - setAlgorithm(LM_SPEED_DENSITY); - engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2; diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index f6325310de..16a3956847 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -19,6 +19,7 @@ void setTestCamEngineConfiguration() { setDefaultFrankensoConfiguration(); engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; + setCamOperationMode(); // engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; // trigger_config_s *triggerConfig = &engineConfiguration->trigger; diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index 330797be0a..932481eef8 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -34,8 +34,7 @@ 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?! - setCamOperationMode(); + engineConfiguration->useOnlyRisingEdgeForTrigger = false; engineConfiguration->globalTriggerAngleOffset = 0; diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 1e2f313839..35402f2d15 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -391,6 +391,7 @@ void EngineTestHelper::executeUntil(int timeUs) { void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injectionMode) { setupSimpleTestEngineWithMaf(eth, injectionMode, TT_ONE); + setCamOperationMode(); } void setVerboseTrigger(bool isEnabled) {