From 22734e8f39e52a0701ba617aa1a806dc1956251b Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 25 Dec 2018 20:09:35 -0500 Subject: [PATCH] #635 --- .../trigger/decoders/trigger_bmw.cpp | 2 +- .../trigger/decoders/trigger_bmw.h | 2 +- .../trigger/decoders/trigger_gm.cpp | 6 +- .../controllers/trigger/decoders/trigger_gm.h | 2 +- .../trigger/decoders/trigger_honda.cpp | 104 +++++++++--------- .../trigger/decoders/trigger_honda.h | 12 +- .../trigger/decoders/trigger_nissan.cpp | 10 +- .../trigger/decoders/trigger_nissan.h | 4 +- .../trigger/decoders/trigger_rover.cpp | 2 +- .../trigger/decoders/trigger_rover.h | 2 +- .../trigger/decoders/trigger_subaru.cpp | 4 +- .../trigger/decoders/trigger_subaru.h | 4 +- .../trigger/decoders/trigger_toyota.cpp | 6 +- .../trigger/decoders/trigger_toyota.h | 4 +- .../trigger/decoders/trigger_universal.cpp | 2 +- .../trigger/decoders/trigger_universal.h | 2 +- .../controllers/trigger/trigger_decoder.cpp | 40 +++---- .../controllers/trigger/trigger_structure.cpp | 4 +- .../controllers/trigger/trigger_structure.h | 2 +- unit_tests/test_trigger_decoder.cpp | 2 +- 20 files changed, 108 insertions(+), 108 deletions(-) diff --git a/firmware/controllers/trigger/decoders/trigger_bmw.cpp b/firmware/controllers/trigger/decoders/trigger_bmw.cpp index 4ebe3300e8..115274a930 100644 --- a/firmware/controllers/trigger/decoders/trigger_bmw.cpp +++ b/firmware/controllers/trigger/decoders/trigger_bmw.cpp @@ -15,7 +15,7 @@ static inline float addPair(TriggerShape *s, float a, float w) { return a; } -void configureMiniCooperTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void configureMiniCooperTriggerShape(TriggerShape *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); // s->initialState[0] = 1; diff --git a/firmware/controllers/trigger/decoders/trigger_bmw.h b/firmware/controllers/trigger/decoders/trigger_bmw.h index 04b5e056ee..4d56a31dd3 100644 --- a/firmware/controllers/trigger/decoders/trigger_bmw.h +++ b/firmware/controllers/trigger/decoders/trigger_bmw.h @@ -9,6 +9,6 @@ #include "engine.h" -void configureMiniCooperTriggerShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureMiniCooperTriggerShape(TriggerShape *s); #endif /* TRIGGER_BMW_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_gm.cpp b/firmware/controllers/trigger/decoders/trigger_gm.cpp index f383fd9561..444bdc16f6 100644 --- a/firmware/controllers/trigger/decoders/trigger_gm.cpp +++ b/firmware/controllers/trigger/decoders/trigger_gm.cpp @@ -39,7 +39,7 @@ void configureGmTriggerShape(TriggerShape *s) { s->setTriggerSynchronizationGap(6); } -static int gm_tooth_pair(float startAngle, bool isLongShort, TriggerShape* s, int mult DECLARE_ENGINE_PARAMETER_SUFFIX) +static int gm_tooth_pair(float startAngle, bool isLongShort, TriggerShape* s, int mult) { int window = (isLongShort ? 12 : 3) * mult; int end = startAngle + mult * 15; @@ -59,7 +59,7 @@ static int gm_tooth_pair(float startAngle, bool isLongShort, TriggerShape* s, in * * based on data in https://rusefi.com/forum/viewtopic.php?f=3&t=936&p=30303#p30285 */ -void initGmLS24(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void initGmLS24(TriggerShape *s) { s->initialize(FOUR_STROKE_CRANK_SENSOR, false); trigger_wheel_e ch = T_PRIMARY; @@ -99,7 +99,7 @@ void initGmLS24(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { bool bit = code & 0x000001; code = code >> 1; - angle = gm_tooth_pair(angle, bit, s, CRANK_MODE_MULTIPLIER PASS_ENGINE_PARAMETER_SUFFIX); + angle = gm_tooth_pair(angle, bit, s, CRANK_MODE_MULTIPLIER); } s->useOnlyPrimaryForSync = true; diff --git a/firmware/controllers/trigger/decoders/trigger_gm.h b/firmware/controllers/trigger/decoders/trigger_gm.h index f191247783..53cca74206 100644 --- a/firmware/controllers/trigger/decoders/trigger_gm.h +++ b/firmware/controllers/trigger/decoders/trigger_gm.h @@ -11,6 +11,6 @@ #include "trigger_structure.h" void configureGmTriggerShape(TriggerShape *s); -void initGmLS24(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initGmLS24(TriggerShape *s); #endif /* TRIGGER_GM_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp index c678c345e5..390d9db1b2 100644 --- a/firmware/controllers/trigger/decoders/trigger_honda.cpp +++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp @@ -10,7 +10,7 @@ #define S24 (720.0f / 24 / 2) -static float addAccordPair(TriggerShape *s, float sb, trigger_wheel_e const channelIndex DECLARE_ENGINE_PARAMETER_SUFFIX) { +static float addAccordPair(TriggerShape *s, float sb, trigger_wheel_e const channelIndex) { s->addEvent720(sb, channelIndex, TV_RISE); sb += S24; s->addEvent720(sb, channelIndex, TV_FALL); @@ -20,7 +20,7 @@ static float addAccordPair(TriggerShape *s, float sb, trigger_wheel_e const chan } #define DIP 7.5f -static float addAccordPair3(TriggerShape *s, float sb DECLARE_ENGINE_PARAMETER_SUFFIX) { +static float addAccordPair3(TriggerShape *s, float sb) { sb += DIP; s->addEvent720(sb, T_CHANNEL_3, TV_RISE); sb += DIP; @@ -33,58 +33,58 @@ static float addAccordPair3(TriggerShape *s, float sb DECLARE_ENGINE_PARAMETER_S * Thank you Dip! * http://forum.pgmfi.org/viewtopic.php?f=2&t=15570start=210#p139007 */ -void configureHondaAccordCDDip(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void configureHondaAccordCDDip(TriggerShape *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); s->initialState[T_SECONDARY] = TV_RISE; float sb = 0; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(90, T_SECONDARY, TV_FALL); sb = 90; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(180, T_SECONDARY, TV_RISE); sb = 180; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(270, T_SECONDARY, TV_FALL); sb = 270; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(360.0f - DIP, T_PRIMARY, TV_RISE); s->addEvent720(360, T_SECONDARY, TV_RISE); sb = 360; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(450, T_SECONDARY, TV_FALL); sb = 450; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(540, T_SECONDARY, TV_RISE); sb = 540; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(630, T_SECONDARY, TV_FALL); sb = 630; - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair3(s, sb PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); + sb = addAccordPair3(s, sb); s->addEvent720(720.0f - DIP, T_PRIMARY, TV_FALL); @@ -105,7 +105,7 @@ void configureHondaAccordCDDip(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) void configureHonda_1_4_24(TriggerShape *s, bool withOneEventSignal, bool withFourEventSignal, trigger_wheel_e const oneEventWave, trigger_wheel_e const fourEventWave, - float prefix DECLARE_ENGINE_PARAMETER_SUFFIX) { + float prefix) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); @@ -115,50 +115,50 @@ void configureHonda_1_4_24(TriggerShape *s, bool withOneEventSignal, bool withFo s->isSynchronizationNeeded = false; - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); if (withOneEventSignal) s->addEvent720(sb - S24 / 2, oneEventWave, TV_RISE); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); if (withOneEventSignal) s->addEvent720(sb - S24 / 2, oneEventWave, TV_FALL); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); if (withFourEventSignal) { s->addEvent720(1 * 180.0f + prefix - tdcWidth, fourEventWave, TV_RISE); } - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); if (withFourEventSignal) { s->addEvent720(1 * 180.0f + prefix, fourEventWave, TV_FALL); } - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb,T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb,T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); if (withFourEventSignal) { s->addEvent720(2 * 180.0f + prefix - tdcWidth, fourEventWave, TV_RISE); } - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); if (withFourEventSignal) { s->addEvent720(2 * 180.0f + prefix, fourEventWave, TV_FALL); } for (int i = 3; i <= 4; i++) { - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); + sb = addAccordPair(s, sb, T_SECONDARY); if (withFourEventSignal) { s->addEvent720(i * 180.0f + prefix - tdcWidth, fourEventWave, TV_RISE); } - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); if (withFourEventSignal) { s->addEvent720(i * 180.0f + prefix, fourEventWave, TV_FALL); } @@ -166,13 +166,13 @@ void configureHonda_1_4_24(TriggerShape *s, bool withOneEventSignal, bool withFo s->useOnlyPrimaryForSync = true; } -void configureHondaCbr600(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void configureHondaCbr600(TriggerShape *s) { // todo: finish this - setToothedWheelConfiguration(s, 24, 0, FOUR_STROKE_CRANK_SENSOR PASS_ENGINE_PARAMETER_SUFFIX); + setToothedWheelConfiguration(s, 24, 0, FOUR_STROKE_CRANK_SENSOR); } -void configureHondaCbr600custom(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void configureHondaCbr600custom(TriggerShape *s) { float w = 720 / 2 / 24; // s->initialize(FOUR_STROKE_CAM_SENSOR, false); @@ -245,7 +245,7 @@ void configureHondaCbr600custom(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) } -void configureHondaAccordShifted(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void configureHondaAccordShifted(TriggerShape *s) { float w = 720 / 2 / 24; s->initialize(FOUR_STROKE_CAM_SENSOR, true); @@ -268,7 +268,7 @@ void configureHondaAccordShifted(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX for (int i = 0;i<23;i++) { - sb = addAccordPair(s, sb, T_SECONDARY PASS_ENGINE_PARAMETER_SUFFIX); + sb = addAccordPair(s, sb, T_SECONDARY); } @@ -277,7 +277,7 @@ void configureHondaAccordShifted(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX s->isSynchronizationNeeded = false; } -void configureOnePlus16(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX) { +void configureOnePlus16(TriggerShape *s, operation_mode_e operationMode) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); int totalTeethCount = 16; diff --git a/firmware/controllers/trigger/decoders/trigger_honda.h b/firmware/controllers/trigger/decoders/trigger_honda.h index dcb15f1c7b..365a46b9d8 100644 --- a/firmware/controllers/trigger/decoders/trigger_honda.h +++ b/firmware/controllers/trigger/decoders/trigger_honda.h @@ -10,17 +10,17 @@ #include "trigger_structure.h" -void configureHondaAccordCDDip(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void configureHondaAccordShifted(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureHondaAccordCDDip(TriggerShape *s); +void configureHondaAccordShifted(TriggerShape *s); void configureHonda_1_4_24(TriggerShape *s, bool withOneEventSignal, bool withFourEventSignal, trigger_wheel_e const oneEventWave, trigger_wheel_e const fourEventWave, - float d DECLARE_ENGINE_PARAMETER_SUFFIX); + float d); -void configureOnePlus16(TriggerShape *s, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureOnePlus16(TriggerShape *s, operation_mode_e operationMode); -void configureHondaCbr600(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void configureHondaCbr600custom(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void configureHondaCbr600(TriggerShape *s); +void configureHondaCbr600custom(TriggerShape *s); #endif /* CONTROLLERS_TRIGGER_TRIGGER_HONDA_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_nissan.cpp b/firmware/controllers/trigger/decoders/trigger_nissan.cpp index 9824156261..9c177b780d 100644 --- a/firmware/controllers/trigger/decoders/trigger_nissan.cpp +++ b/firmware/controllers/trigger/decoders/trigger_nissan.cpp @@ -13,7 +13,7 @@ /** * 8,2,2,2 Nissan pattern */ -static void initializeNissanSR20VE_4_optional_360(TriggerShape *s, bool with2nd DECLARE_ENGINE_PARAMETER_SUFFIX) { +static void initializeNissanSR20VE_4_optional_360(TriggerShape *s, bool with2nd) { s->initialize(FOUR_STROKE_CAM_SENSOR, with2nd); s->isSynchronizationNeeded = true; s->gapBothDirections = true; @@ -99,10 +99,10 @@ static void initializeNissanSR20VE_4_optional_360(TriggerShape *s, bool with2nd * Nissan Primera p11 year 1995-2002 */ -void initializeNissanSR20VE_4(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { - initializeNissanSR20VE_4_optional_360(s, false PASS_ENGINE_PARAMETER_SUFFIX); +void initializeNissanSR20VE_4(TriggerShape *s) { + initializeNissanSR20VE_4_optional_360(s, false); } -void initializeNissanSR20VE_4_360(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { - initializeNissanSR20VE_4_optional_360(s, true PASS_ENGINE_PARAMETER_SUFFIX); +void initializeNissanSR20VE_4_360(TriggerShape *s) { + initializeNissanSR20VE_4_optional_360(s, true); } diff --git a/firmware/controllers/trigger/decoders/trigger_nissan.h b/firmware/controllers/trigger/decoders/trigger_nissan.h index dd6f5467a8..bc5d76bb90 100644 --- a/firmware/controllers/trigger/decoders/trigger_nissan.h +++ b/firmware/controllers/trigger/decoders/trigger_nissan.h @@ -10,7 +10,7 @@ #include "trigger_structure.h" -void initializeNissanSR20VE_4(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void initializeNissanSR20VE_4_360(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeNissanSR20VE_4(TriggerShape *s); +void initializeNissanSR20VE_4_360(TriggerShape *s); #endif /* CONTROLLERS_TRIGGER_TRIGGER_NISSAN_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_rover.cpp b/firmware/controllers/trigger/decoders/trigger_rover.cpp index 165db4d766..8974cadad4 100644 --- a/firmware/controllers/trigger/decoders/trigger_rover.cpp +++ b/firmware/controllers/trigger/decoders/trigger_rover.cpp @@ -11,7 +11,7 @@ /** * https://en.wikipedia.org/wiki/Rover_K-series_engine */ -void initializeRoverK(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void initializeRoverK(TriggerShape *s) { s->initialize(FOUR_STROKE_CRANK_SENSOR, false); float tooth = 20; diff --git a/firmware/controllers/trigger/decoders/trigger_rover.h b/firmware/controllers/trigger/decoders/trigger_rover.h index 0d7c9d06a6..b057770229 100644 --- a/firmware/controllers/trigger/decoders/trigger_rover.h +++ b/firmware/controllers/trigger/decoders/trigger_rover.h @@ -11,6 +11,6 @@ #include "trigger_structure.h" -void initializeRoverK(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initializeRoverK(TriggerShape *s); #endif /* CONTROLLERS_TRIGGER_TRIGGER_ROVER_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_subaru.cpp b/firmware/controllers/trigger/decoders/trigger_subaru.cpp index 5403197c68..9286d2885e 100644 --- a/firmware/controllers/trigger/decoders/trigger_subaru.cpp +++ b/firmware/controllers/trigger/decoders/trigger_subaru.cpp @@ -10,7 +10,7 @@ /** * This trigger is also used by Nissan and Mazda */ -void initialize36_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void initialize36_2_2_2(TriggerShape *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); float wide = 30 * 2; @@ -46,7 +46,7 @@ void initialize36_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { s->useOnlyPrimaryForSync = true; } -void initializeSubaru7_6(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void initializeSubaru7_6(TriggerShape *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); float magic = 333; diff --git a/firmware/controllers/trigger/decoders/trigger_subaru.h b/firmware/controllers/trigger/decoders/trigger_subaru.h index 7a4524968c..cd3bff0fbb 100644 --- a/firmware/controllers/trigger/decoders/trigger_subaru.h +++ b/firmware/controllers/trigger/decoders/trigger_subaru.h @@ -10,7 +10,7 @@ #include "engine.h" -void initialize36_2_2_2(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void initializeSubaru7_6(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initialize36_2_2_2(TriggerShape *s); +void initializeSubaru7_6(TriggerShape *s); #endif /* CONTROLLERS_TRIGGER_TRIGGER_SUBARU_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_toyota.cpp b/firmware/controllers/trigger/decoders/trigger_toyota.cpp index 8575f250bf..8242cd1c02 100644 --- a/firmware/controllers/trigger/decoders/trigger_toyota.cpp +++ b/firmware/controllers/trigger/decoders/trigger_toyota.cpp @@ -11,7 +11,7 @@ EXTERN_ENGINE; -void initialize2jzGE1_12(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { +void initialize2jzGE1_12(TriggerShape *s) { s->initialize(FOUR_STROKE_CAM_SENSOR, true); float crankD = 360 / 12 / 2; // 15 @@ -45,8 +45,8 @@ void initialize2jzGE1_12(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { s->isSynchronizationNeeded = false; } -void initialize2jzGE3_34(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX) { - setToothedWheelConfiguration(s, 36, 2, FOUR_STROKE_CRANK_SENSOR PASS_ENGINE_PARAMETER_SUFFIX); +void initialize2jzGE3_34(TriggerShape *s) { + setToothedWheelConfiguration(s, 36, 2, FOUR_STROKE_CRANK_SENSOR); // s->initialize(FOUR_STROKE_CAM_SENSOR, true); // diff --git a/firmware/controllers/trigger/decoders/trigger_toyota.h b/firmware/controllers/trigger/decoders/trigger_toyota.h index 7cc8b57b41..4b55d35f5d 100644 --- a/firmware/controllers/trigger/decoders/trigger_toyota.h +++ b/firmware/controllers/trigger/decoders/trigger_toyota.h @@ -10,7 +10,7 @@ #include "engine.h" -void initialize2jzGE1_12(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); -void initialize2jzGE3_34(TriggerShape *s DECLARE_ENGINE_PARAMETER_SUFFIX); +void initialize2jzGE1_12(TriggerShape *s); +void initialize2jzGE3_34(TriggerShape *s); #endif /* CONTROLLERS_TRIGGER_TRIGGER_TOYOTA_H_ */ diff --git a/firmware/controllers/trigger/decoders/trigger_universal.cpp b/firmware/controllers/trigger/decoders/trigger_universal.cpp index a2c3fcfbe6..91e377bcce 100644 --- a/firmware/controllers/trigger/decoders/trigger_universal.cpp +++ b/firmware/controllers/trigger/decoders/trigger_universal.cpp @@ -29,7 +29,7 @@ void addSkippedToothTriggerEvents(trigger_wheel_e wheel, TriggerShape *s, int to } void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount, - operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX) { + operation_mode_e operationMode) { if (totalTeethCount <= 0) { warning(CUSTOM_OBD_TRIGGER_SHAPE, "totalTeethCount is zero or less: %d", totalTeethCount); s->shapeDefinitionError = true; diff --git a/firmware/controllers/trigger/decoders/trigger_universal.h b/firmware/controllers/trigger/decoders/trigger_universal.h index 73beda51ca..8db2d161ce 100644 --- a/firmware/controllers/trigger/decoders/trigger_universal.h +++ b/firmware/controllers/trigger/decoders/trigger_universal.h @@ -22,7 +22,7 @@ void addSkippedToothTriggerEvents(trigger_wheel_e wheel, TriggerShape *s, float offset, float engineCycle, float filterLeft, float filterRight); -void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX);; +void initializeSkippedToothTriggerShapeExt(TriggerShape *s, int totalTeethCount, int skippedCount, operation_mode_e operationMode);; void configureOnePlus60_2(TriggerShape *s, operation_mode_e operationMode); diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index fbe9af1921..427c450e2b 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -494,7 +494,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg case TT_TOOTHED_WHEEL: initializeSkippedToothTriggerShapeExt(this, triggerConfig->customTotalToothCount, - triggerConfig->customSkippedToothCount, engineConfiguration->operationMode PASS_ENGINE_PARAMETER_SUFFIX); + triggerConfig->customSkippedToothCount, engineConfiguration->operationMode); break; case TT_MAZDA_MIATA_NA: @@ -563,7 +563,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg break; case TT_ONE: - setToothedWheelConfiguration(this, 1, 0, engineConfiguration->operationMode PASS_ENGINE_PARAMETER_SUFFIX); + setToothedWheelConfiguration(this, 1, 0, engineConfiguration->operationMode); break; case TT_MAZDA_SOHC_4: @@ -571,11 +571,11 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg break; case TT_MINI_COOPER_R50: - configureMiniCooperTriggerShape(this PASS_ENGINE_PARAMETER_SUFFIX); + configureMiniCooperTriggerShape(this); break; case TT_TOOTHED_WHEEL_60_2: - setToothedWheelConfiguration(this, 60, 2, engineConfiguration->operationMode PASS_ENGINE_PARAMETER_SUFFIX); + setToothedWheelConfiguration(this, 60, 2, engineConfiguration->operationMode); break; case TT_60_2_VW: @@ -583,35 +583,35 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg break; case TT_TOOTHED_WHEEL_36_1: - setToothedWheelConfiguration(this, 36, 1, engineConfiguration->operationMode PASS_ENGINE_PARAMETER_SUFFIX); + setToothedWheelConfiguration(this, 36, 1, engineConfiguration->operationMode); break; case TT_HONDA_4_24_1: - configureHonda_1_4_24(this, true, true, T_CHANNEL_3, T_PRIMARY, 0 PASS_ENGINE_PARAMETER_SUFFIX); + configureHonda_1_4_24(this, true, true, T_CHANNEL_3, T_PRIMARY, 0); break; case TT_HONDA_4_24: - configureHonda_1_4_24(this, false, true, T_NONE, T_PRIMARY, 0 PASS_ENGINE_PARAMETER_SUFFIX); + configureHonda_1_4_24(this, false, true, T_NONE, T_PRIMARY, 0); break; case TT_HONDA_1_24: - configureHonda_1_4_24(this, true, false, T_PRIMARY, T_NONE, 10 PASS_ENGINE_PARAMETER_SUFFIX); + configureHonda_1_4_24(this, true, false, T_PRIMARY, T_NONE, 10); break; case TT_HONDA_ACCORD_1_24_SHIFTED: - configureHondaAccordShifted(this PASS_ENGINE_PARAMETER_SUFFIX); + configureHondaAccordShifted(this); break; case TT_HONDA_1_4_24: - configureHondaAccordCDDip(this PASS_ENGINE_PARAMETER_SUFFIX); + configureHondaAccordCDDip(this); break; case TT_HONDA_CBR_600: - configureHondaCbr600(this PASS_ENGINE_PARAMETER_SUFFIX); + configureHondaCbr600(this); break; case TT_HONDA_CBR_600_CUSTOM: - configureHondaCbr600custom(this PASS_ENGINE_PARAMETER_SUFFIX); + configureHondaCbr600custom(this); break; case TT_MITSUBISHI: @@ -631,31 +631,31 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg break; case TT_SUBARU_7_6: - initializeSubaru7_6(this PASS_ENGINE_PARAMETER_SUFFIX); + initializeSubaru7_6(this); break; case TT_36_2_2_2: - initialize36_2_2_2(this PASS_ENGINE_PARAMETER_SUFFIX); + initialize36_2_2_2(this); break; case TT_2JZ_3_34: - initialize2jzGE3_34(this PASS_ENGINE_PARAMETER_SUFFIX); + initialize2jzGE3_34(this); break; case TT_2JZ_1_12: - initialize2jzGE1_12(this PASS_ENGINE_PARAMETER_SUFFIX); + initialize2jzGE1_12(this); break; case TT_NISSAN_SR20VE: - initializeNissanSR20VE_4(this PASS_ENGINE_PARAMETER_SUFFIX); + initializeNissanSR20VE_4(this); break; case TT_NISSAN_SR20VE_360: - initializeNissanSR20VE_4_360(this PASS_ENGINE_PARAMETER_SUFFIX); + initializeNissanSR20VE_4_360(this); break; case TT_ROVER_K: - initializeRoverK(this PASS_ENGINE_PARAMETER_SUFFIX); + initializeRoverK(this); break; case TT_FIAT_IAW_P8: @@ -663,7 +663,7 @@ void TriggerShape::initializeTriggerShape(Logging *logger, bool useOnlyRisingEdg break; case TT_GM_LS_24: - initGmLS24(this PASS_ENGINE_PARAMETER_SUFFIX); + initGmLS24(this); break; default: diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp index bd7dcaeffb..8ddd88e975 100644 --- a/firmware/controllers/trigger/trigger_structure.cpp +++ b/firmware/controllers/trigger/trigger_structure.cpp @@ -418,13 +418,13 @@ angle_t TriggerShape::getSwitchAngle(int index) const { } void setToothedWheelConfiguration(TriggerShape *s, int total, int skipped, - operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX) { + operation_mode_e operationMode) { #if EFI_ENGINE_CONTROL || defined(__DOXYGEN__) s->useRiseEdge = true; initializeSkippedToothTriggerShapeExt(s, total, skipped, - operationMode PASS_ENGINE_PARAMETER_SUFFIX); + operationMode); #endif } diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h index 2a74b0884b..d210420098 100644 --- a/firmware/controllers/trigger/trigger_structure.h +++ b/firmware/controllers/trigger/trigger_structure.h @@ -250,7 +250,7 @@ private: void calculateTriggerSynchPoint(TriggerState *state DECLARE_ENGINE_PARAMETER_SUFFIX); }; -void setToothedWheelConfiguration(TriggerShape *s, int total, int skipped, operation_mode_e operationMode DECLARE_ENGINE_PARAMETER_SUFFIX); +void setToothedWheelConfiguration(TriggerShape *s, int total, int skipped, operation_mode_e operationMode); #define TRIGGER_SHAPE(x) ENGINE(triggerCentral.triggerShape.x) diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index c82aa91762..983effdf17 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -469,7 +469,7 @@ void testTriggerDecoder(void) { engine_configuration_s *engineConfiguration = &c.engineConfiguration; board_configuration_s *boardConfiguration = &c.engineConfiguration.bc; - initializeSkippedToothTriggerShapeExt(s, 2, 0, FOUR_STROKE_CAM_SENSOR PASS_ENGINE_PARAMETER_SUFFIX); + initializeSkippedToothTriggerShapeExt(s, 2, 0, FOUR_STROKE_CAM_SENSOR); assertEqualsM("shape size", s->getSize(), 4); assertEquals(s->wave.switchTimes[0], 0.25); assertEquals(s->wave.switchTimes[1], 0.5);