From 36d5b1fbb60f246f174d5aef99668a8598511ff7 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 6 Nov 2022 00:59:29 -0400 Subject: [PATCH] minor trigger refactoring --- .../tests/ignition_injection/test_fuel_map.cpp | 12 ++++++------ unit_tests/tests/trigger/test_trigger_decoder.cpp | 12 +++--------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/unit_tests/tests/ignition_injection/test_fuel_map.cpp b/unit_tests/tests/ignition_injection/test_fuel_map.cpp index a0a89d2d4c..e787ae4ec9 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_map.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_map.cpp @@ -150,32 +150,32 @@ TEST(misc, testAngleResolver) { event_trigger_position_s injectionStart; printf("*************************************************** testAngleResolver 0\r\n"); - findTriggerPosition(&engine->triggerCentral.triggerShape, &engine->triggerCentral.triggerFormDetails,&injectionStart, -122); + injectionStart.setAngle(-122); ASSERT_EQ( 2, injectionStart.triggerEventIndex) << "eventIndex@0"; ASSERT_NEAR(0.24, injectionStart.angleOffsetFromTriggerEvent, EPS5D); printf("*************************************************** testAngleResolver 0.1\r\n"); - findTriggerPosition(&engine->triggerCentral.triggerShape, &engine->triggerCentral.triggerFormDetails,&injectionStart, -80); + injectionStart.setAngle(-80); ASSERT_EQ( 2, injectionStart.triggerEventIndex) << "eventIndex@0"; ASSERT_FLOAT_EQ(42.24, injectionStart.angleOffsetFromTriggerEvent); printf("*************************************************** testAngleResolver 0.2\r\n"); - findTriggerPosition(&engine->triggerCentral.triggerShape, &engine->triggerCentral.triggerFormDetails,&injectionStart, -54); + injectionStart.setAngle(-54); ASSERT_EQ( 2, injectionStart.triggerEventIndex) << "eventIndex@0"; ASSERT_FLOAT_EQ(68.2400, injectionStart.angleOffsetFromTriggerEvent); printf("*************************************************** testAngleResolver 0.3\r\n"); - findTriggerPosition(&engine->triggerCentral.triggerShape, &engine->triggerCentral.triggerFormDetails,&injectionStart, -53); + injectionStart.setAngle(-53); ASSERT_EQ(2, injectionStart.triggerEventIndex); ASSERT_FLOAT_EQ(69.24, injectionStart.angleOffsetFromTriggerEvent); printf("*************************************************** testAngleResolver 1\r\n"); - findTriggerPosition(&engine->triggerCentral.triggerShape, &engine->triggerCentral.triggerFormDetails,&injectionStart, 0); + injectionStart.setAngle(0); ASSERT_EQ(2, injectionStart.triggerEventIndex); ASSERT_FLOAT_EQ(122.24, injectionStart.angleOffsetFromTriggerEvent); printf("*************************************************** testAngleResolver 2\r\n"); - findTriggerPosition(&engine->triggerCentral.triggerShape, &engine->triggerCentral.triggerFormDetails,&injectionStart, 56); + injectionStart.setAngle(56); ASSERT_EQ(2, injectionStart.triggerEventIndex); ASSERT_FLOAT_EQ(178.24, injectionStart.angleOffsetFromTriggerEvent); diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index 3a455cf2ab..94709b7136 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -159,19 +159,13 @@ TEST(trigger, test1995FordInline6TriggerDecoder) { event_trigger_position_s position; ASSERT_EQ( 0, engineConfiguration->globalTriggerAngleOffset) << "globalTriggerAngleOffset"; - findTriggerPosition(&engine->triggerCentral.triggerShape, - &engine->triggerCentral.triggerFormDetails, - &position, 0); + position.setAngle(0); assertTriggerPosition(&position, 0, 0); - findTriggerPosition(&engine->triggerCentral.triggerShape, - &engine->triggerCentral.triggerFormDetails, - &position, 200); + position.setAngle(200); assertTriggerPosition(&position, 3, 20); - findTriggerPosition(&engine->triggerCentral.triggerShape, - &engine->triggerCentral.triggerFormDetails, - &position, 360); + position.setAngle(360); assertTriggerPosition(&position, 6, 0); eth.applyTriggerWaveform();