diff --git a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp index 4a516b9672..c8397e2e4f 100644 --- a/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp @@ -150,7 +150,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp index a9b0b0d771..eeea731231 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp +++ b/firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp @@ -171,7 +171,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/cypress/board_configuration.cpp b/firmware/config/boards/hellen/cypress/board_configuration.cpp index 9af99c5082..68b55ee37c 100644 --- a/firmware/config/boards/hellen/cypress/board_configuration.cpp +++ b/firmware/config/boards/hellen/cypress/board_configuration.cpp @@ -11,7 +11,7 @@ #include "trigger_input.h" void setBoardDefaultConfiguration() { - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/firmware/config/boards/hellen/harley81/board_configuration.cpp b/firmware/config/boards/hellen/harley81/board_configuration.cpp index a1a2157335..9f855a62ab 100644 --- a/firmware/config/boards/hellen/harley81/board_configuration.cpp +++ b/firmware/config/boards/hellen/harley81/board_configuration.cpp @@ -151,7 +151,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index 7b8f6473c8..97201c5baf 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -130,7 +130,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp index 2497500156..619ef0a9cd 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp @@ -142,7 +142,7 @@ void setBoardDefaultConfiguration() { engineConfiguration->etb_use_two_wires = true; // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->vvtCamSensorUseRise = true; engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp index 9e41583b01..9b5283a6be 100644 --- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp @@ -161,7 +161,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen128/board_configuration.cpp b/firmware/config/boards/hellen/hellen128/board_configuration.cpp index aedad75269..d9e543a54b 100644 --- a/firmware/config/boards/hellen/hellen128/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen128/board_configuration.cpp @@ -192,7 +192,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index 1c6f516b70..e35f3ba013 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -160,7 +160,7 @@ void setBoardDefaultConfiguration() { engineConfiguration->etbFunctions[1] = ETB_Wastegate; // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->vvtCamSensorUseRise = true; engineConfiguration->useOnlyRisingEdgeForTrigger = true; 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 daf0f6a3d8..babb3abab2 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp @@ -140,7 +140,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen72/board_configuration.cpp b/firmware/config/boards/hellen/hellen72/board_configuration.cpp index fc504394b1..de9d2046a1 100644 --- a/firmware/config/boards/hellen/hellen72/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen72/board_configuration.cpp @@ -146,7 +146,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen81/board_configuration.cpp b/firmware/config/boards/hellen/hellen81/board_configuration.cpp index d57937248a..b28996a254 100644 --- a/firmware/config/boards/hellen/hellen81/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen81/board_configuration.cpp @@ -151,7 +151,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp index d5082b78b9..b9545b8b17 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp @@ -139,7 +139,7 @@ void setBoardDefaultConfiguration() { engineConfiguration->etb_use_two_wires = true; // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->vvtCamSensorUseRise = true; engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp index 52ad930b4d..2814137550 100644 --- a/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp @@ -140,7 +140,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/kinetis/board_configuration.cpp b/firmware/config/boards/kinetis/board_configuration.cpp index 11a4f0652e..a628a50451 100644 --- a/firmware/config/boards/kinetis/board_configuration.cpp +++ b/firmware/config/boards/kinetis/board_configuration.cpp @@ -15,7 +15,7 @@ int __debugEnabled = 0; #endif void setBoardOverrides() { - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index f0dd0f5e72..8a9b28e943 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -215,7 +215,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index f4a58e2d80..81c5c1acde 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -17,7 +17,7 @@ static bool is469 = false; static void setPrometheusDefaults() { - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; //engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/proteus/board_configuration.cpp b/firmware/config/boards/proteus/board_configuration.cpp index fe952ec7a1..67455e47dd 100644 --- a/firmware/config/boards/proteus/board_configuration.cpp +++ b/firmware/config/boards/proteus/board_configuration.cpp @@ -186,7 +186,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/boards/skeleton/board_configuration.cpp b/firmware/config/boards/skeleton/board_configuration.cpp index dcd1e74ce0..c30ad25eb5 100644 --- a/firmware/config/boards/skeleton/board_configuration.cpp +++ b/firmware/config/boards/skeleton/board_configuration.cpp @@ -200,7 +200,7 @@ void setBoardDefaultConfiguration() { setupDefaultSensorInputs(); // Some sensible defaults for other options - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; setAlgorithm(LM_SPEED_DENSITY); diff --git a/firmware/config/engines/GY6_139QMB.cpp b/firmware/config/engines/GY6_139QMB.cpp index 5a4167753b..0d944b81d0 100644 --- a/firmware/config/engines/GY6_139QMB.cpp +++ b/firmware/config/engines/GY6_139QMB.cpp @@ -27,7 +27,7 @@ void setGy6139qmbDefaultEngineConfiguration() { engineConfiguration->globalTriggerAngleOffset = 45; engineConfiguration->specs.displacement = 0.072; // 72cc engineConfiguration->specs.cylindersCount = 1; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); // this is related to 'setDefaultBaseEngine' having 'skippedWheelOnCam = true' which is a weird fact by itself engineConfiguration->skippedWheelOnCam = false; diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp index 675b01fa32..4f689f8929 100644 --- a/firmware/config/engines/bmw_m73.cpp +++ b/firmware/config/engines/bmw_m73.cpp @@ -102,7 +102,7 @@ void m73engine() { engineConfiguration->vvtMode[0] = VVT_FIRST_HALF; engineConfiguration->globalTriggerAngleOffset = 90; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); // todo: that's not right, should be 60/2 without VW engineConfiguration->trigger.type = TT_60_2_VW; diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index e73bb5802e..783b4d2ef7 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -32,7 +32,7 @@ void setCamaro4() { // set ignition_mode 2 engineConfiguration->ignitionMode = IM_WASTED_SPARK; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_GM_LS_24; engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; // PA0 diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 71cd1f930b..71f4d6282f 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -20,7 +20,7 @@ void setCitroenBerlingoTU3JPConfiguration() { /** * Base engine setting */ - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->globalTriggerAngleOffset = 114; engineConfiguration->specs.cylindersCount = 4; diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 422d4e0b2d..9550749c72 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -257,7 +257,7 @@ void setEtbTestConfiguration() { // yes, 30K - that's a test configuration engineConfiguration->rpmHardLimit = 30000; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; @@ -813,9 +813,8 @@ void setRotary() { engineConfiguration->specs.firingOrder = FO_1_2; engineConfiguration->trigger.type = TT_36_2_2_2; - setOperationMode(engineConfiguration, TWO_STROKE); // todo: fix UI to make this possible via TS - engineConfiguration->twoStroke = true; + setTwoStrokeOperationMode(); strcpy(engineConfiguration->engineMake, ENGINE_MAKE_MAZDA); strcpy(engineConfiguration->engineCode, "13B"); diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index 78bbb1014d..762a59a5bb 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -23,7 +23,7 @@ void setFordInline6() { engineConfiguration->specs.cylindersCount = 6; - setCamOperationMode(engineConfiguration); + setCamOperationMode(); engineConfiguration->ignitionMode = IM_ONE_COIL; engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index db8564a05c..040d63ffd8 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -281,7 +281,6 @@ static void setCommonMazdaNB() { engineConfiguration->idleMode = IM_AUTO; engineConfiguration->tachPulsePerRev = 2; - setOperationMode(engineConfiguration, FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR); engineConfiguration->specs.displacement = 1.839; engineConfiguration->cylinderBore = 83; strcpy(engineConfiguration->engineMake, ENGINE_MAKE_MAZDA); diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp index 0b71b0ba56..f0457ebbe7 100644 --- a/firmware/config/engines/sachs.cpp +++ b/firmware/config/engines/sachs.cpp @@ -18,8 +18,7 @@ void setSachs() { engineConfiguration->specs.displacement = 0.1; // 100cc engineConfiguration->specs.cylindersCount = 1; - engineConfiguration->twoStroke = true; - setOperationMode(engineConfiguration, TWO_STROKE); + setTwoStrokeOperationMode(); engineConfiguration->specs.firingOrder = FO_1; engineConfiguration->engineChartSize = 400; diff --git a/firmware/config/engines/subaru.cpp b/firmware/config/engines/subaru.cpp index 5de93097e5..aa5683d441 100644 --- a/firmware/config/engines/subaru.cpp +++ b/firmware/config/engines/subaru.cpp @@ -66,7 +66,7 @@ void setSubaruEJ18_MRE() { */ void setSubaruEG33Defaults() { - setCamOperationMode(engineConfiguration); + setCamOperationMode(); engineConfiguration->trigger.type = TT_SUBARU_SVX; engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index a36853f8c5..f6325310de 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -54,14 +54,14 @@ void setTestCrankEngineConfiguration() { engineConfiguration->trigger.type = TT_ONE; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); // this is related to 'setDefaultBaseEngine' having 'skippedWheelOnCam = true' which is a weird fact by itself engineConfiguration->skippedWheelOnCam = false; } void setTestVVTEngineConfiguration() { setDefaultFrankensoConfiguration(); - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; engineConfiguration->trigger.customTotalToothCount = 3; diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp index 43129a12cc..160bee7617 100644 --- a/firmware/config/engines/toyota_jzs147.cpp +++ b/firmware/config/engines/toyota_jzs147.cpp @@ -70,11 +70,11 @@ static void common2jz() { void setToyota_jzs147EngineConfiguration() { common2jz(); - setCamOperationMode(engineConfiguration); + setCamOperationMode(); engineConfiguration->trigger.type = TT_2JZ_1_12; //// temporary while I am fixing trigger bug -// setCrankOperationMode(engineConfiguration); +// setCrankOperationMode(); // //set trigger_type 16 // engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; // engineConfiguration->trigger.customTotalToothCount = 36; @@ -102,7 +102,7 @@ void setToyota_jzs147EngineConfiguration() { void setToyota_2jz_vics() { common2jz(); - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_2; engineConfiguration->triggerInputPins[0] = GPIOA_5; // crank sensor diff --git a/firmware/config/engines/vw.cpp b/firmware/config/engines/vw.cpp index 800b16e698..7d20635329 100644 --- a/firmware/config/engines/vw.cpp +++ b/firmware/config/engines/vw.cpp @@ -25,7 +25,7 @@ void setVwAba() { engineConfiguration->globalTriggerAngleOffset = 93; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp index 76b0ebc59c..79bf2703c0 100644 --- a/firmware/config/engines/vw_b6.cpp +++ b/firmware/config/engines/vw_b6.cpp @@ -20,7 +20,7 @@ */ void setVwPassatB6() { #if HW_MICRO_RUSEFI - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->vvtMode[0] = VVT_BOSCH_QUICK_START; engineConfiguration->map.sensor.type = MT_BOSCH_2_5; diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index be02742b04..330797be0a 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -35,7 +35,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); + setCamOperationMode(); engineConfiguration->useOnlyRisingEdgeForTrigger = false; engineConfiguration->globalTriggerAngleOffset = 0; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 5eb6585096..7e1b859572 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1174,16 +1174,17 @@ void prepareShapes() { #endif -void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode) { - engineConfiguration->ambiguousOperationMode = mode; +void setTwoStrokeOperationMode() { + engineConfiguration->ambiguousOperationMode = TWO_STROKE; + engineConfiguration->twoStroke = true; } -void setCamOperationMode(engine_configuration_s *engineConfiguration) { +void setCamOperationMode() { engineConfiguration->ambiguousOperationMode = FOUR_STROKE_CAM_SENSOR; engineConfiguration->skippedWheelOnCam = true; } -void setCrankOperationMode(engine_configuration_s *engineConfiguration) { +void setCrankOperationMode() { engineConfiguration->ambiguousOperationMode = FOUR_STROKE_CRANK_SENSOR; engineConfiguration->skippedWheelOnCam = false; } diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 4a854c2bbf..433a55f38c 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -21,9 +21,9 @@ #define MOCK_UNDEFINED -1 -void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode); -void setCrankOperationMode(engine_configuration_s *engineConfiguration); -void setCamOperationMode(engine_configuration_s *engineConfiguration); +void setCrankOperationMode(); +void setCamOperationMode(); +void setTwoStrokeOperationMode(); void prepareVoidConfiguration(engine_configuration_s *activeConfiguration); void setTargetRpmCurve(int rpm); diff --git a/unit_tests/tests/actuators/test_tacho.cpp b/unit_tests/tests/actuators/test_tacho.cpp index fa116bca2e..2e6a5dd167 100644 --- a/unit_tests/tests/actuators/test_tacho.cpp +++ b/unit_tests/tests/actuators/test_tacho.cpp @@ -22,7 +22,7 @@ TEST(Actuators, Tachometer) { engineConfiguration->trigger.customTotalToothCount = 8; engineConfiguration->trigger.customSkippedToothCount = 0; engineConfiguration->useOnlyRisingEdgeForTrigger = false; - setCamOperationMode(engineConfiguration); + setCamOperationMode(); eth.applyTriggerWaveform(); // get the engine running - 6 revolutions diff --git a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp index b174ba8ee8..73fa302122 100644 --- a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp +++ b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp @@ -39,7 +39,7 @@ TEST(fuelControl, transitionIssue1592) { engineConfiguration->trigger.customTotalToothCount = 6; engineConfiguration->trigger.customSkippedToothCount = 1; eth.setTriggerType(TT_TOOTHED_WHEEL); - setCamOperationMode(engineConfiguration); + setCamOperationMode(); engineConfiguration->isFasterEngineSpinUpEnabled = true; setTable(config->injectionPhase, 0.0f); diff --git a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp index c7b7238d48..a456a05909 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp @@ -64,7 +64,7 @@ TEST(fuel, testWallWettingEnrichmentScheduling) { EngineTestHelper eth(FORD_ASPIRE_1996); - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->useOnlyRisingEdgeForTrigger = true; eth.setTriggerType(TT_ONE); diff --git a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp index a293eb3172..77a1b040ea 100644 --- a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp +++ b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp @@ -12,7 +12,7 @@ TEST(issues, issueOneCylinderSpecialCase968) { // set injection_mode 1 engineConfiguration->injectionMode = IM_SEQUENTIAL; - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->useOnlyRisingEdgeForTrigger = true; eth.setTriggerType(TT_ONE); diff --git a/unit_tests/tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp index 19504bb074..25e1e52577 100644 --- a/unit_tests/tests/test_accel_enrichment.cpp +++ b/unit_tests/tests/test_accel_enrichment.cpp @@ -42,7 +42,7 @@ TEST(fuel, testTpsAccelEnrichmentMath) { TEST(fuel, testTpsAccelEnrichmentScheduling) { EngineTestHelper eth(FORD_ASPIRE_1996); - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->useOnlyRisingEdgeForTrigger = true; engineConfiguration->tpsAccelEnrichmentThreshold = 5; diff --git a/unit_tests/tests/test_engine_math.cpp b/unit_tests/tests/test_engine_math.cpp index 9cad7653a5..21cbb739bc 100644 --- a/unit_tests/tests/test_engine_math.cpp +++ b/unit_tests/tests/test_engine_math.cpp @@ -26,7 +26,7 @@ TEST(misc, testEngineMath) { EngineTestHelper eth(FORD_ESCORT_GT); - setCamOperationMode(engineConfiguration); + setCamOperationMode(); engineConfiguration->fuelAlgorithm = LM_SPEED_DENSITY; ASSERT_NEAR( 50, getOneDegreeTimeMs(600) * 180, EPS4D) << "600 RPM"; diff --git a/unit_tests/tests/test_hpfp_integrated.cpp b/unit_tests/tests/test_hpfp_integrated.cpp index dfba9132cf..e0c97126e4 100644 --- a/unit_tests/tests/test_hpfp_integrated.cpp +++ b/unit_tests/tests/test_hpfp_integrated.cpp @@ -20,7 +20,7 @@ TEST(HPFP, IntegratedSchedule) { engineConfiguration->trigger.customTotalToothCount = 16; engineConfiguration->trigger.customSkippedToothCount = 0; eth.setTriggerType(TT_TOOTHED_WHEEL); - setCamOperationMode(engineConfiguration); + setCamOperationMode(); engineConfiguration->isFasterEngineSpinUpEnabled = true; diff --git a/unit_tests/tests/trigger/test_all_triggers.cpp b/unit_tests/tests/trigger/test_all_triggers.cpp index 0ab211612c..d178116569 100644 --- a/unit_tests/tests/trigger/test_all_triggers.cpp +++ b/unit_tests/tests/trigger/test_all_triggers.cpp @@ -58,7 +58,7 @@ TEST_P(AllTriggersFixture, TestTrigger) { EngineTestHelperBase base(engine, &pc.engineConfiguration, &pc); engineConfiguration->trigger.type = tt; - setCamOperationMode(engineConfiguration); + setCamOperationMode(); TriggerWaveform *shape = &engine->triggerCentral.triggerShape; TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails; diff --git a/unit_tests/tests/trigger/test_cam_vvt_input.cpp b/unit_tests/tests/trigger/test_cam_vvt_input.cpp index 804778b740..16620084e9 100644 --- a/unit_tests/tests/trigger/test_cam_vvt_input.cpp +++ b/unit_tests/tests/trigger/test_cam_vvt_input.cpp @@ -84,7 +84,7 @@ TEST(trigger, testCamInput) { EngineTestHelper eth(FORD_ESCORT_GT); // changing to 'ONE TOOTH' trigger on CRANK with CAM/VVT - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->useOnlyRisingEdgeForTrigger = true; engineConfiguration->vvtMode[0] = VVT_FIRST_HALF; engineConfiguration->vvtOffsets[0] = 360; diff --git a/unit_tests/tests/trigger/test_issue_898.cpp b/unit_tests/tests/trigger/test_issue_898.cpp index b0b64604dd..348078366d 100644 --- a/unit_tests/tests/trigger/test_issue_898.cpp +++ b/unit_tests/tests/trigger/test_issue_898.cpp @@ -8,7 +8,7 @@ #include "pch.h" static void boardConfigurationForIssue898(engine_configuration_s *engineConfiguration) { - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->useOnlyRisingEdgeForTrigger = true; } diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index 4254a05e95..3ddb4b1b01 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -9,7 +9,7 @@ TEST(trigger, testQuadCam) { // setting some weird engine EngineTestHelper eth(FORD_ESCORT_GT); - setCrankOperationMode(engineConfiguration); + setCrankOperationMode(); // changing to 'ONE TOOTH' trigger on CRANK with CAM/VVT engineConfiguration->useOnlyRisingEdgeForTrigger = true;