From b5e369464766bafcd3dd90797eca0be4c812c9fd Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 27 Apr 2024 01:48:02 -0700 Subject: [PATCH] no need for getTimeNowUs on ETH --- unit_tests/test-framework/engine_test_helper.cpp | 4 ---- unit_tests/test-framework/engine_test_helper.h | 1 - .../tests/ignition_injection/test_odd_firing_engine.cpp | 2 +- unit_tests/tests/trigger/test_trigger_decoder.cpp | 8 ++++---- unit_tests/tests/trigger/test_trigger_input_adc.cpp | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/unit_tests/test-framework/engine_test_helper.cpp b/unit_tests/test-framework/engine_test_helper.cpp index 3092f9d7b8..858581d3db 100644 --- a/unit_tests/test-framework/engine_test_helper.cpp +++ b/unit_tests/test-framework/engine_test_helper.cpp @@ -278,10 +278,6 @@ void EngineTestHelper::setTimeAndInvokeEventsUs(int targetTime) { timeNowUs = targetTime; } -efitimeus_t EngineTestHelper::getTimeNowUs() { - return timeNowUs; -} - void EngineTestHelper::fireTriggerEvents(int count) { fireTriggerEvents2(count, 5); // 5ms } diff --git a/unit_tests/test-framework/engine_test_helper.h b/unit_tests/test-framework/engine_test_helper.h index 5c745db83e..ce03d9c93d 100644 --- a/unit_tests/test-framework/engine_test_helper.h +++ b/unit_tests/test-framework/engine_test_helper.h @@ -104,7 +104,6 @@ public: int executeActions(); void moveTimeForwardMs(float deltaTimeMs); void moveTimeForwardSec(float deltaTimeSec); - efitimeus_t getTimeNowUs(); Engine engine; persistent_config_s persistentConfig; diff --git a/unit_tests/tests/ignition_injection/test_odd_firing_engine.cpp b/unit_tests/tests/ignition_injection/test_odd_firing_engine.cpp index 0cf0cc58af..43e5e8dcf5 100644 --- a/unit_tests/tests/ignition_injection/test_odd_firing_engine.cpp +++ b/unit_tests/tests/ignition_injection/test_odd_firing_engine.cpp @@ -54,7 +54,7 @@ TEST(OddFireRunningMode, hd) { eth.assertRpm( 500, "spinning-RPM#1"); - engine->executor.executeAll(eth.getTimeNowUs() + MS2US(1000000)); + engine->executor.executeAll(getTimeNowUs() + MS2US(1000000)); eth.fireTriggerEvents2(2 /* count */ , 60 /* ms */); ASSERT_EQ(IM_SEQUENTIAL, getCurrentInjectionMode()); diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index ac20917ada..5a0b6febac 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -222,7 +222,7 @@ TEST(misc, testRpmCalculator) { eth.moveTimeForwardMs(5 /*ms*/); - int start = eth.getTimeNowUs(); + int start = getTimeNowUs(); ASSERT_EQ( 485000, start) << "start value"; engine->periodicFastCallback(); @@ -928,11 +928,11 @@ TEST(big, testFuelSchedulerBug299smallAndLarge) { // assertInjectorDownEvent("L04@8", 8, MS2US(50.0), 0); - engine->executor.executeAll(eth.getTimeNowUs() + 1); + engine->executor.executeAll(getTimeNowUs() + 1); // injector goes high... ASSERT_FALSE(enginePins.injectors[0].currentLogicValue) << "injector@1"; - engine->executor.executeAll(eth.getTimeNowUs() + MS2US(17.5) + 1); + engine->executor.executeAll(getTimeNowUs() + MS2US(17.5) + 1); // injector does not go low too soon, that's a feature :) ASSERT_TRUE(enginePins.injectors[0].currentLogicValue) << "injector@2"; @@ -948,7 +948,7 @@ TEST(big, testFuelSchedulerBug299smallAndLarge) { //todo assertInjectorDownEvent("L015@5", 5, MS2US(30), 0); - engine->executor.executeAll(eth.getTimeNowUs() + MS2US(10) + 1); + engine->executor.executeAll(getTimeNowUs() + MS2US(10) + 1); // end of combined injection ASSERT_FALSE(enginePins.injectors[0].currentLogicValue) << "injector@3"; diff --git a/unit_tests/tests/trigger/test_trigger_input_adc.cpp b/unit_tests/tests/trigger/test_trigger_input_adc.cpp index 39b6a41f6b..9281767141 100644 --- a/unit_tests/tests/trigger/test_trigger_input_adc.cpp +++ b/unit_tests/tests/trigger/test_trigger_input_adc.cpp @@ -48,7 +48,7 @@ static void simulateTrigger(EngineTestHelper ð, TriggerAdcDetector &trigAdcSt static const float Vil = 0.3f * adcMaxVoltage; static const float Vih = 0.7f * adcMaxVoltage; - efitimeus_t startUs = eth.getTimeNowUs(); + efitimeus_t startUs = getTimeNowUs(); int prevLogicValue = -1; while (reader.haveMore()) {