From 3441417b2481b05c6468c8383837aaa3bbf12eca Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 8 Apr 2024 22:39:31 -0400 Subject: [PATCH] odd fire timing_offset_cylinder not accounted by injection #6095 only:flipping test numbers --- .../test_odd_firing_engine.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 06717eadf0..806fd5eec0 100644 --- a/unit_tests/tests/ignition_injection/test_odd_firing_engine.cpp +++ b/unit_tests/tests/ignition_injection/test_odd_firing_engine.cpp @@ -12,10 +12,10 @@ TEST(OddFireRunningMode, hd) { engineConfiguration->cranking.rpm = 100; engineConfiguration->vvtMode[0] = VVT_SINGLE_TOOTH; // need to avoid engine phase sync requirement // let's pretend to have a 32 degree V odd fire engine. - float cylinderOne = 19; - float cylinderTwo = -13; - engineConfiguration->timing_offset_cylinder[0] = cylinderOne; - engineConfiguration->timing_offset_cylinder[1] = cylinderTwo; + float cylinderOne = -19; + float cylinderTwo = 13; + engineConfiguration->timing_offset_cylinder[0] = -cylinderOne; + engineConfiguration->timing_offset_cylinder[1] = -cylinderTwo; angle_t timing = 1; setTable(config->ignitionTable, timing); // run mode timing @@ -44,12 +44,12 @@ TEST(OddFireRunningMode, hd) { // ASSERT_NEAR(-168.0, eth.timeToAngle(-56.0), EPS3D); // ASSERT_NEAR(32, eth.timeToAngle(10.66666666), EPS3D); - angle_t expectedAngle3 = -180 - cylinderTwo - timing; + angle_t expectedAngle3 = -180 + cylinderTwo - timing; ASSERT_EQ( 8, engine->executor.size()); eth.assertEvent5("spark down#3", 3, (void*)fireSparkAndPrepareNextSchedule, eth.angleToTimeUs(expectedAngle3)); - angle_t expectedAngle7 = 180 - cylinderOne - timing; + angle_t expectedAngle7 = 180 + cylinderOne - timing; eth.assertEvent5("spark down#7", 7, (void*)fireSparkAndPrepareNextSchedule, eth.angleToTimeUs(expectedAngle7)); eth.assertRpm( 500, "spinning-RPM#1"); @@ -62,9 +62,9 @@ TEST(OddFireRunningMode, hd) { ASSERT_EQ( 8, engine->executor.size()); eth.assertEvent5("fuel down2#1", 1, (void*)turnInjectionPinLow, eth.angleToTimeUs(180 + PORT_INJECTION_OFFSET)); - eth.assertEvent5("spark down2#3", 3, (void*)fireSparkAndPrepareNextSchedule, eth.angleToTimeUs(-180 - cylinderTwo - timing)); + eth.assertEvent5("spark down2#3", 3, (void*)fireSparkAndPrepareNextSchedule, eth.angleToTimeUs(-180 + cylinderTwo - timing)); eth.assertEvent5("fuel down2#5", 5, (void*)turnInjectionPinLow, eth.angleToTimeUs(540 + PORT_INJECTION_OFFSET)); - eth.assertEvent5("spark down2#7", 7, (void*)fireSparkAndPrepareNextSchedule, eth.angleToTimeUs(180 - cylinderOne - timing)); + eth.assertEvent5("spark down2#7", 7, (void*)fireSparkAndPrepareNextSchedule, eth.angleToTimeUs(180 + cylinderOne - timing)); } TEST(OddFireCrankingMode, hd) {