From 3697fc605233aaa6e980a0e5a6c2be00d8a1c63d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 20 Jan 2019 22:21:12 -0500 Subject: [PATCH] future fast spinning 60/2 test --- unit_tests/engine_test_helper.cpp | 9 +++++++-- unit_tests/engine_test_helper.h | 2 ++ unit_tests/tests/test_fasterEngineSpinningUp.cpp | 13 ++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 12f6ed2a00..7f6be726ec 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -186,7 +186,8 @@ void assertRpm(const char *msg, int expectedRpm DECLARE_ENGINE_PARAMETER_SUFFIX) EXPECT_EQ(expectedRpm, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE)) << msg; } -void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode) { +void setupSimpleTestEngineWithMaf(EngineTestHelper *eth, injection_mode_e injectionMode, + trigger_type_e trigger) { Engine *engine = ð->engine; EXPAND_Engine @@ -197,7 +198,7 @@ void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, inject engineConfiguration->isIgnitionEnabled = false; // let's focus on injection engineConfiguration->specs.cylindersCount = 4; // a bit of flexibility - the mode may be changed by some tests - engineConfiguration->injectionMode = injMode; + engineConfiguration->injectionMode = injectionMode; // set cranking mode (it's used by getCurrentInjectionMode()) engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; @@ -215,3 +216,7 @@ void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, inject eth->applyTriggerShape(); } + +void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injectionMode) { + setupSimpleTestEngineWithMaf(eth, injectionMode, TT_ONE); +} diff --git a/unit_tests/engine_test_helper.h b/unit_tests/engine_test_helper.h index 99dd5a541c..1407c227e9 100644 --- a/unit_tests/engine_test_helper.h +++ b/unit_tests/engine_test_helper.h @@ -54,5 +54,7 @@ public: void assertRpm(const char *msg, int expectedRpm DECLARE_ENGINE_PARAMETER_SUFFIX); void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode = IM_BATCH); +void setupSimpleTestEngineWithMaf(EngineTestHelper *eth, injection_mode_e injectionMode, + trigger_type_e trigger); #endif /* ENGINE_TEST_HELPER_H_ */ diff --git a/unit_tests/tests/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/test_fasterEngineSpinningUp.cpp index 3d6eabd8b4..61833c5c39 100644 --- a/unit_tests/tests/test_fasterEngineSpinningUp.cpp +++ b/unit_tests/tests/test_fasterEngineSpinningUp.cpp @@ -7,7 +7,7 @@ #include "engine_math.h" #include "engine_test_helper.h" -TEST(sensors, testFasterEngineSpinningUp) { +TEST(cranking, testFasterEngineSpinningUp) { printf("*************************************************** testFasterEngineSpinningUp\r\n"); WITH_ENGINE_TEST_HELPER(TEST_ENGINE); @@ -95,3 +95,14 @@ TEST(sensors, testFasterEngineSpinningUp) { eth.assertEvent5(&engine->executor, "inj start#3", 0, (void*)seTurnPinHigh, timeStartUs, MS2US(60) + 27974); eth.assertEvent5(&engine->executor, "inj end#3", 1, (void*)seTurnPinLow, timeStartUs, MS2US(60) + 27974 + 3000); } + + +TEST(cranking, testFasterEngineSpinningUp60_2) { + WITH_ENGINE_TEST_HELPER(TEST_ENGINE); + // turn on FasterEngineSpinUp mode + engineConfiguration->bc.isFasterEngineSpinUpEnabled = true; + + setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð, IM_SEQUENTIAL); + + +}