From ce1dad1100f1149b6ea3b4dbae0c9246ee5e8708 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 30 May 2023 22:48:07 -0700 Subject: [PATCH] trigger structure api accepts bool #55 --- .../trigger/decoders/trigger_structure.cpp | 11 ++++++++--- .../controllers/trigger/decoders/trigger_structure.h | 2 ++ unit_tests/engine_test_helper.cpp | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp index b6f06a81dc..674f6df8df 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.cpp +++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp @@ -222,6 +222,10 @@ void TriggerWaveform::addEvent720(angle_t angle, TriggerValue const state, Trigg } void TriggerWaveform::addEvent360(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex) { + addEvent360(angle, state == TriggerValue::RISE, channelIndex); +} + +void TriggerWaveform::addEvent360(angle_t angle, bool state, TriggerWheel const channelIndex) { efiAssertVoid(ObdCode::CUSTOM_OMODE_UNDEF, operationMode == FOUR_STROKE_CAM_SENSOR || operationMode == FOUR_STROKE_CRANK_SENSOR, "Not a mode for 360"); addEvent(CRANK_MODE_MULTIPLIER * angle / FOUR_STROKE_CYCLE_DURATION, state, channelIndex); } @@ -230,10 +234,11 @@ void TriggerWaveform::addEventAngle(angle_t angle, TriggerValue const state, Tri addEvent(angle / getCycleDuration(), state, channelIndex); } -void TriggerWaveform::addEvent(angle_t angle, TriggerValue const stateTv, TriggerWheel const channelIndex) { - // TODO: #55 - bool state = stateTv == TriggerValue::RISE; +void TriggerWaveform::addEvent(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex) { + addEvent(angle, state == TriggerValue::RISE, channelIndex); +} +void TriggerWaveform::addEvent(angle_t angle, bool state, TriggerWheel const channelIndex) { efiAssertVoid(ObdCode::CUSTOM_OMODE_UNDEF, operationMode != OM_NONE, "operationMode not set"); if (channelIndex == TriggerWheel:: T_SECONDARY) { diff --git a/firmware/controllers/trigger/decoders/trigger_structure.h b/firmware/controllers/trigger/decoders/trigger_structure.h index a6bd0eb0c4..052a928d45 100644 --- a/firmware/controllers/trigger/decoders/trigger_structure.h +++ b/firmware/controllers/trigger/decoders/trigger_structure.h @@ -181,6 +181,7 @@ public: * @param angle (0..1] */ void addEvent(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY); + void addEvent(angle_t angle, bool state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY); /* (0..720] angle range * Deprecated! many usages should be replaced by addEvent360 */ @@ -190,6 +191,7 @@ public: * this method helps us use real world 360 degrees shape for FOUR_STROKE_CAM_SENSOR and FOUR_STROKE_CRANK_SENSOR */ void addEvent360(angle_t angle, TriggerValue const state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY); + void addEvent360(angle_t angle, bool state, TriggerWheel const channelIndex = TriggerWheel::T_PRIMARY); /** * This version of the method is best when same wheel could be mounted either on crank or cam diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 530bd3189a..65eb55393b 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -12,7 +12,6 @@ #include "fuel_math.h" #include "accel_enrichment.h" #include "advance_map.h" -#include "tooth_logger.h" #include "logicdata.h" #include "hardware.h"