diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index a4da8f3851..200ae3be5b 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -80,12 +80,17 @@ void EngineTestHelper::firePrimaryTriggerFall() { engine.triggerCentral.handleShaftSignal(SHAFT_PRIMARY_FALLING, &engine, engine.engineConfiguration, &persistentConfig, boardConfiguration); } +void EngineTestHelper::fireTriggerEventsWithDuration(int durationMs) { + fireTriggerEvents2(1, durationMs); +} + /** * Sends specified number of rise/fall trigger events, with specified amount of time between those. * * This is helpful for TT_ONE trigger wheel decoder and probably other decoders as well. */ -void EngineTestHelper::fireTriggerEvents2(int count, int durationUs) { +void EngineTestHelper::fireTriggerEvents2(int count, int durationMs) { + int durationUs = MS2US(durationMs); for (int i = 0; i < count; i++) { timeNowUs += durationUs; firePrimaryTriggerRise(); @@ -101,7 +106,7 @@ void EngineTestHelper::clearQueue() { } void EngineTestHelper::fireTriggerEvents(int count) { - fireTriggerEvents2(count, MS2US(5)); // 5ms + fireTriggerEvents2(count, 5); // 5ms } void EngineTestHelper::applyTriggerShape() { diff --git a/unit_tests/engine_test_helper.h b/unit_tests/engine_test_helper.h index a85243a2a8..07cd482b4a 100644 --- a/unit_tests/engine_test_helper.h +++ b/unit_tests/engine_test_helper.h @@ -23,7 +23,8 @@ public: void firePrimaryTriggerRise(); void firePrimaryTriggerFall(); void fireTriggerEvents(int count); - void fireTriggerEvents2(int count, int durationUs); + void fireTriggerEventsWithDuration(int durationMs); + void fireTriggerEvents2(int count, int durationMs); void clearQueue(); Engine engine; diff --git a/unit_tests/test_fasterEngineSpinningUp.cpp b/unit_tests/test_fasterEngineSpinningUp.cpp index aa5a802c3c..f5f5e52441 100644 --- a/unit_tests/test_fasterEngineSpinningUp.cpp +++ b/unit_tests/test_fasterEngineSpinningUp.cpp @@ -89,7 +89,7 @@ void testFasterEngineSpinningUp() { eth.clearQueue(); timeStartUs = timeNowUs; - eth.fireTriggerEvents2(1, MS2US(60)); + eth.fireTriggerEvents2(1, 60); // check if the mode is now changed to 'running' at higher RPM assertEquals(RUNNING, engine->rpmCalculator.getState()); diff --git a/unit_tests/test_startOfCrankingPrimingPulse.cpp b/unit_tests/test_startOfCrankingPrimingPulse.cpp index 0759170c0f..186acb24b1 100644 --- a/unit_tests/test_startOfCrankingPrimingPulse.cpp +++ b/unit_tests/test_startOfCrankingPrimingPulse.cpp @@ -24,7 +24,7 @@ void testPlainCrankingWithoutAdvancedFeatures() { setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð); assertEqualsM("RPM=0", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE)); - eth.fireTriggerEvents2(1, MS2US(200)); + eth.fireTriggerEvents2(1, 200); // still no RPM since need to cycles measure cycle duration assertEqualsM("RPM#1", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE)); diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index 9e657461bc..fea316d08f 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -666,10 +666,10 @@ static void setTestBug299(EngineTestHelper *eth) { assertRpm("RPM=0", 0 PASS_ENGINE_PARAMETER_SUFFIX); assertEqualsM("setTestBug299 EL", 0, getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE)); assertEqualsM("setTestBug299 IAT", 30, engine->sensors.iat); - eth->fireTriggerEvents2(1, MS2US(20)); + eth->fireTriggerEvents2(1, 20); // still no RPM since need to cycles measure cycle duration assertRpm("setTestBug299: RPM#1", 0 PASS_ENGINE_PARAMETER_SUFFIX); - eth->fireTriggerEvents2(1, MS2US(20)); + eth->fireTriggerEvents2(1, 20); assertRpm("setTestBug299: RPM#2", 3000 PASS_ENGINE_PARAMETER_SUFFIX); eth->clearQueue();