diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index c1592ac548..cc3bcdb830 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -389,7 +389,7 @@ void EngineTestHelper::executeUntil(int timeUs) { void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injectionMode) { setCamOperationMode(); - setupSimpleTestEngineWithMaf(eth, injectionMode, TT_ONE); + setupSimpleTestEngineWithMaf(eth, injectionMode, trigger_type_e::TT_ONE); } void setVerboseTrigger(bool isEnabled) { diff --git a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp index 30f8879d39..c4b19ef995 100644 --- a/unit_tests/tests/ignition_injection/injection_mode_transition.cpp +++ b/unit_tests/tests/ignition_injection/injection_mode_transition.cpp @@ -40,7 +40,7 @@ TEST(fuelControl, transitionIssue1592) { // This is easiest to trip on a wheel that requires sync engineConfiguration->trigger.customTotalToothCount = 6; engineConfiguration->trigger.customSkippedToothCount = 1; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); setCamOperationMode(); engineConfiguration->isFasterEngineSpinUpEnabled = true; 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 1e253c8898..858d4c4370 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp @@ -67,7 +67,7 @@ TEST(fuel, testWallWettingEnrichmentScheduling) { setCrankOperationMode(); - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); eth.fireTriggerEvents2(/* count */ 4, 25 /* ms */); 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 f8ecfce734..6293a87ad5 100644 --- a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp +++ b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp @@ -16,7 +16,7 @@ TEST(issues, issueOneCylinderSpecialCase968) { setCrankOperationMode(); - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ( 0, engine->executor.size()) << "start"; diff --git a/unit_tests/tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp index 24923624f5..e2b4458d62 100644 --- a/unit_tests/tests/test_accel_enrichment.cpp +++ b/unit_tests/tests/test_accel_enrichment.cpp @@ -47,7 +47,7 @@ TEST(fuel, testTpsAccelEnrichmentScheduling) { engineConfiguration->tpsAccelEnrichmentThreshold = 5; engineConfiguration->tpsAccelLookback = 2; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); Sensor::setMockValue(SensorType::Tps1, 0); diff --git a/unit_tests/tests/test_hpfp_integrated.cpp b/unit_tests/tests/test_hpfp_integrated.cpp index d5e38e740c..fcdb18131c 100644 --- a/unit_tests/tests/test_hpfp_integrated.cpp +++ b/unit_tests/tests/test_hpfp_integrated.cpp @@ -19,7 +19,7 @@ TEST(HPFP, IntegratedSchedule) { engineConfiguration->trigger.customTotalToothCount = 16; engineConfiguration->trigger.customSkippedToothCount = 0; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); setCamOperationMode(); engineConfiguration->isFasterEngineSpinUpEnabled = true; diff --git a/unit_tests/tests/trigger/test_2jz_vvt.cpp b/unit_tests/tests/trigger/test_2jz_vvt.cpp index a7271cc7a9..ac5de9607b 100644 --- a/unit_tests/tests/trigger/test_2jz_vvt.cpp +++ b/unit_tests/tests/trigger/test_2jz_vvt.cpp @@ -11,7 +11,7 @@ TEST(sensors, test2jz) { EngineTestHelper eth(engine_type_e::TOYOTA_2JZ_GTE_VVTi); engineConfiguration->isFasterEngineSpinUpEnabled = false; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "test2jz RPM"; for (int i = 0; i < 2;i++) { diff --git a/unit_tests/tests/trigger/test_all_triggers.cpp b/unit_tests/tests/trigger/test_all_triggers.cpp index c1764e49b8..6b002b1656 100644 --- a/unit_tests/tests/trigger/test_all_triggers.cpp +++ b/unit_tests/tests/trigger/test_all_triggers.cpp @@ -9,7 +9,7 @@ //#define TEST_FROM_TRIGGER_ID ((int)TT_UNUSED - 1) #define TEST_FROM_TRIGGER_ID 1 -#define TEST_TO_TRIGGER_ID TT_UNUSED +#define TEST_TO_TRIGGER_ID trigger_type_e::TT_UNUSED // uncomment to test only one trigger //#define TEST_TO_TRIGGER_ID (TEST_FROM_TRIGGER_ID + 1) diff --git a/unit_tests/tests/trigger/test_cam_vvt_input.cpp b/unit_tests/tests/trigger/test_cam_vvt_input.cpp index e6fa0c0269..9d2bf605e4 100644 --- a/unit_tests/tests/trigger/test_cam_vvt_input.cpp +++ b/unit_tests/tests/trigger/test_cam_vvt_input.cpp @@ -15,7 +15,7 @@ extern WaveChart waveChart; TEST(trigger, testNoStartUpWarningsNoSyncronizationTrigger) { EngineTestHelper eth(engine_type_e::TEST_ENGINE); // one tooth does not need synchronization it just counts tooth - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM"; eth.fireTriggerEvents2(/*count*/10, /*duration*/50); @@ -28,7 +28,7 @@ TEST(trigger, testNoStartUpWarnings) { // for this test we need a trigger with isSynchronizationNeeded=true engineConfiguration->trigger.customTotalToothCount = 3; engineConfiguration->trigger.customSkippedToothCount = 1; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM"; for (int i = 0;i < 10;i++) { @@ -86,7 +86,7 @@ TEST(trigger, testCamInput) { setCrankOperationMode(); engineConfiguration->vvtMode[0] = VVT_FIRST_HALF; engineConfiguration->vvtOffsets[0] = 360; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); engineConfiguration->camInputs[0] = Gpio::A10; // we just need to indicate that we have CAM ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testCamInput RPM"; diff --git a/unit_tests/tests/trigger/test_override_gaps.cpp b/unit_tests/tests/trigger/test_override_gaps.cpp index 0b36df403c..b1bdc347ea 100644 --- a/unit_tests/tests/trigger/test_override_gaps.cpp +++ b/unit_tests/tests/trigger/test_override_gaps.cpp @@ -17,7 +17,7 @@ TEST(subaru, overrideGap) { engineConfiguration->triggerGapOverrideFrom[1] = 0.75; engineConfiguration->triggerGapOverrideTo[1] = 1.25; - eth.setTriggerType(TT_SUBARU_7_WITHOUT_6); + eth.setTriggerType(trigger_type_e::TT_SUBARU_7_WITHOUT_6); ASSERT_EQ(2, engine->triggerCentral.triggerShape.gapTrackingLength); diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index ff20938e3e..7184a0e3b9 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -20,7 +20,7 @@ TEST(trigger, testQuadCam) { engineConfiguration->camInputs[0] = Gpio::A10; // we just need to indicate that we have CAM // this crank trigger would be easier to test, crank shape is less important for this test - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)); diff --git a/unit_tests/tests/trigger/test_real_4b11.cpp b/unit_tests/tests/trigger/test_real_4b11.cpp index 34557347ac..caeb1dc38e 100644 --- a/unit_tests/tests/trigger/test_real_4b11.cpp +++ b/unit_tests/tests/trigger/test_real_4b11.cpp @@ -14,7 +14,7 @@ TEST(real4b11, running) { engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_36_2_1); + eth.setTriggerType(trigger_type_e::TT_36_2_1); int eventCount = 0; bool gotRpm = false; @@ -50,7 +50,7 @@ TEST(real4b11, runningDoubledEdge) { engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_36_2_1); + eth.setTriggerType(trigger_type_e::TT_36_2_1); int eventCount = 0; bool gotRpm = false; diff --git a/unit_tests/tests/trigger/test_real_4g93.cpp b/unit_tests/tests/trigger/test_real_4g93.cpp index 7f97cb7d66..2c437b2dfc 100644 --- a/unit_tests/tests/trigger/test_real_4g93.cpp +++ b/unit_tests/tests/trigger/test_real_4g93.cpp @@ -18,7 +18,7 @@ TEST(real4g93, cranking) { engineConfiguration->vvtMode[0] = VVT_MITSUBISHI_4G63; - eth.setTriggerType(TT_MITSU_4G63_CRANK); + eth.setTriggerType(trigger_type_e::TT_MITSU_4G63_CRANK); bool gotRpm = false; bool gotSync = false; @@ -78,7 +78,7 @@ TEST(real4g93, crankingOn11) { engineConfiguration->isPhaseSyncRequiredForIgnition = true; - eth.setTriggerType(TT_MAZDA_MIATA_NA); + eth.setTriggerType(trigger_type_e::TT_MAZDA_MIATA_NA); bool gotRpm = false; while (reader.haveMore()) { @@ -106,7 +106,7 @@ TEST(real4g93, crankingCamOnly) { engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_MITSU_4G9x_CAM); + eth.setTriggerType(trigger_type_e::TT_MITSU_4G9x_CAM); bool gotRpm = false; bool gotSync = false; diff --git a/unit_tests/tests/trigger/test_real_gm_24x.cpp b/unit_tests/tests/trigger/test_real_gm_24x.cpp index 74961c2f56..4c1aac36aa 100644 --- a/unit_tests/tests/trigger/test_real_gm_24x.cpp +++ b/unit_tests/tests/trigger/test_real_gm_24x.cpp @@ -10,7 +10,7 @@ TEST(crankingGm24x, gmRealCrankingFromFile) { engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_GM_24x); + eth.setTriggerType(trigger_type_e::TT_GM_24x); int eventCount = 0; bool gotRpm = false; diff --git a/unit_tests/tests/trigger/test_real_k24a2.cpp b/unit_tests/tests/trigger/test_real_k24a2.cpp index 7dc0d07848..a478f01662 100644 --- a/unit_tests/tests/trigger/test_real_k24a2.cpp +++ b/unit_tests/tests/trigger/test_real_k24a2.cpp @@ -10,7 +10,7 @@ static void doTest(const char* testFile, int expectedRpm) { engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_HONDA_K_CRANK_12_1); + eth.setTriggerType(trigger_type_e::TT_HONDA_K_CRANK_12_1); while (reader.haveMore()) { reader.processLine(ð); diff --git a/unit_tests/tests/trigger/test_real_volkswagen.cpp b/unit_tests/tests/trigger/test_real_volkswagen.cpp index 837c2a30d4..ce752da4e3 100644 --- a/unit_tests/tests/trigger/test_real_volkswagen.cpp +++ b/unit_tests/tests/trigger/test_real_volkswagen.cpp @@ -15,7 +15,7 @@ TEST(crankingVW, vwRealCrankingFromFile) { reader.open("tests/trigger/resources/nick_1.csv"); EngineTestHelper eth (engine_type_e::VW_ABA); engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_60_2_VW); + eth.setTriggerType(trigger_type_e::TT_60_2_VW); while (reader.haveMore()) { reader.processLine(ð); @@ -28,7 +28,7 @@ TEST(crankingVW, vwRealCrankingFromFile) { TEST(crankingVW, crankingTwiceWithGap) { EngineTestHelper eth (engine_type_e::VW_ABA); engineConfiguration->alwaysInstantRpm = true; - eth.setTriggerType(TT_60_2_VW); + eth.setTriggerType(trigger_type_e::TT_60_2_VW); { CsvReader reader(1, /* vvtCount */ 0); diff --git a/unit_tests/tests/trigger/test_rpm_multiplier.cpp b/unit_tests/tests/trigger/test_rpm_multiplier.cpp index bfde6abe9b..018f0cc194 100644 --- a/unit_tests/tests/trigger/test_rpm_multiplier.cpp +++ b/unit_tests/tests/trigger/test_rpm_multiplier.cpp @@ -13,7 +13,7 @@ static void runRpmTest(bool isTwoStroke, bool isCam, int expected) { EngineTestHelper eth(engine_type_e::TEST_ENGINE); engineConfiguration->twoStroke = isTwoStroke; engineConfiguration->skippedWheelOnCam = isCam; - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); eth.smartFireTriggerEvents2(/*count*/200, /*delay*/ 40); ASSERT_EQ(expected, Sensor::getOrZero(SensorType::Rpm)); diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index cd7eb2502b..28d435576a 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -48,7 +48,7 @@ TEST(trigger, testSkipped2_0) { // for this test we need a trigger with isSynchronizationNeeded=true engineConfiguration->trigger.customTotalToothCount = 2; engineConfiguration->trigger.customSkippedToothCount = 0; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM"; } @@ -969,7 +969,7 @@ TEST(big, testSparkReverseOrderBug319) { // this is needed to update injectorLag engine->updateSlowSensors(); - eth.setTriggerType(TT_ONE); + eth.setTriggerType(trigger_type_e::TT_ONE); eth.engine.periodicFastCallback(); setWholeTimingTable(0); diff --git a/unit_tests/tests/trigger/test_trigger_decoder_2.cpp b/unit_tests/tests/trigger/test_trigger_decoder_2.cpp index c4f13e5c97..8e29a33eee 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder_2.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder_2.cpp @@ -42,7 +42,7 @@ static auto makeTriggerShape(operation_mode_e mode, const TriggerConfiguration& #define doTooth(dut, shape, cfg, t) dut.decodeTriggerEvent("", shape, nullptr, cfg, SHAFT_PRIMARY_RISING, t) TEST(TriggerDecoder, FindsFirstSyncPoint) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -85,7 +85,7 @@ TEST(TriggerDecoder, FindsFirstSyncPoint) { TEST(TriggerDecoder, FindsSyncPointMultipleRevolutions) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -135,7 +135,7 @@ TEST(TriggerDecoder, FindsSyncPointMultipleRevolutions) { } TEST(TriggerDecoder, TooManyTeeth_CausesError) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -213,7 +213,7 @@ TEST(TriggerDecoder, TooManyTeeth_CausesError) { } TEST(TriggerDecoder, NotEnoughTeeth_CausesError) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -290,7 +290,7 @@ TEST(TriggerDecoder, NotEnoughTeeth_CausesError) { } TEST(TriggerDecoder, PrimaryDecoderNoDisambiguation) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CAM_SENSOR, cfg); @@ -321,7 +321,7 @@ TEST(TriggerDecoder, PrimaryDecoderNoDisambiguation) { } TEST(TriggerDecoder, PrimaryDecoderNeedsDisambiguation) { - MockTriggerConfiguration cfg({TT_TOOTHED_WHEEL, 4, 1}); + MockTriggerConfiguration cfg({trigger_type_e::TT_TOOTHED_WHEEL, 4, 1}); cfg.update(); auto shape = makeTriggerShape(FOUR_STROKE_CRANK_SENSOR, cfg); diff --git a/unit_tests/tests/trigger/test_trigger_input_adc.cpp b/unit_tests/tests/trigger/test_trigger_input_adc.cpp index 2632c29aad..e8d93c0f08 100644 --- a/unit_tests/tests/trigger/test_trigger_input_adc.cpp +++ b/unit_tests/tests/trigger/test_trigger_input_adc.cpp @@ -80,7 +80,7 @@ TEST(big, testTriggerInputAdc) { engineConfiguration->analogInputDividerCoefficient = 2.0f; // we'll test on 60-2 wheel - eth.setTriggerType(TT_TOOTHED_WHEEL_60_2); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL_60_2); ASSERT_EQ(0, engine->triggerCentral.triggerState.totalTriggerErrorCounter); ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)) << "testTriggerInputAdc RPM #1"; diff --git a/unit_tests/tests/trigger/test_trigger_noiseless.cpp b/unit_tests/tests/trigger/test_trigger_noiseless.cpp index 4b88115b44..c801156363 100644 --- a/unit_tests/tests/trigger/test_trigger_noiseless.cpp +++ b/unit_tests/tests/trigger/test_trigger_noiseless.cpp @@ -166,7 +166,7 @@ TEST(trigger, noiselessDecoder) { engineConfiguration->ignitionMode = IM_WASTED_SPARK; // we'll test on 60-2 wheel - eth.setTriggerType(TT_TOOTHED_WHEEL_60_2); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL_60_2); ASSERT_EQ(0, engine->triggerCentral.triggerState.totalTriggerErrorCounter); ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "testNoiselessDecoder RPM"; diff --git a/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp b/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp index 0cad4f580a..1991b0cd33 100644 --- a/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp +++ b/unit_tests/tests/trigger/test_trigger_skipped_wheel.cpp @@ -7,6 +7,6 @@ TEST(trigger, testCustomSkipped) { engineConfiguration->trigger.customTotalToothCount = 24; engineConfiguration->trigger.customSkippedToothCount = 2; - eth.setTriggerType(TT_TOOTHED_WHEEL); + eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL); }