diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index e84dc9955f..cb734efe2a 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -118,7 +118,7 @@ static void initVvtShape(int camIndex, TriggerState &initState) { } } -void Engine::initializeTriggerWaveform() { +void Engine::updateTriggerWaveform() { static TriggerState initState; // Re-read config in case it's changed diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index 22a5855672..e4f80ff154 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -341,7 +341,7 @@ public: void periodicSlowCallback(); void updateSlowSensors(); void updateSwitchInputs(); - void initializeTriggerWaveform(); + void updateTriggerWaveform(); bool clutchUpState = false; bool clutchDownState = false; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 1f4e558512..cdaacaab30 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -1160,7 +1160,7 @@ void applyNonPersistentConfiguration() { #endif #if EFI_ENGINE_CONTROL - engine->initializeTriggerWaveform(); + engine->updateTriggerWaveform(); #endif // EFI_ENGINE_CONTROL } diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp index 6dd08f2f7c..7b3349a812 100644 --- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp +++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp @@ -404,7 +404,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp) { engine->ignitionEvents.isReady = false; // we need to rebuild complete ignition schedule engine->injectionEvents.isReady = false; // moved 'triggerIndexByAngle' into trigger initialization (why was it invoked from here if it's only about trigger shape & optimization?) - // see initializeTriggerWaveform() -> prepareOutputSignals() + // see updateTriggerWaveform() -> prepareOutputSignals() // we need this to apply new 'triggerIndexByAngle' values engine->periodicFastCallback(); diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 368952ad1c..0bea7eac48 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -882,7 +882,7 @@ void onConfigurationChangeTriggerCallback() { if (changed) { #if EFI_ENGINE_CONTROL - engine->initializeTriggerWaveform(); + engine->updateTriggerWaveform(); engine->triggerCentral.noiseFilter.resetAccumSignalData(); #endif } diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 93160dafc3..1e2f313839 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -340,7 +340,7 @@ void EngineTestHelper::assertEvent(const char *msg, int index, void *callback, e void EngineTestHelper::applyTriggerWaveform() { - engine.initializeTriggerWaveform(); + engine.updateTriggerWaveform(); incrementGlobalConfigurationVersion(); } diff --git a/unit_tests/tests/ignition_injection/test_fuel_map.cpp b/unit_tests/tests/ignition_injection/test_fuel_map.cpp index abd554b981..c7b0742762 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_map.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_map.cpp @@ -136,7 +136,7 @@ TEST(misc, testAngleResolver) { TriggerWaveform * ts = &engine->triggerCentral.triggerShape; TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails; - engine->initializeTriggerWaveform(); + engine->updateTriggerWaveform(); assertEqualsM("index 2", 52.76, triggerFormDetails->eventAngles[3]); // this angle is relation to synch point assertEqualsM("time 2", 0.3233, ts->wave.getSwitchTime(2)); diff --git a/unit_tests/tests/trigger/test_all_triggers.cpp b/unit_tests/tests/trigger/test_all_triggers.cpp index e0a52fa72e..6196a22e4f 100644 --- a/unit_tests/tests/trigger/test_all_triggers.cpp +++ b/unit_tests/tests/trigger/test_all_triggers.cpp @@ -62,7 +62,7 @@ TEST_P(AllTriggersFixture, TestTrigger) { TriggerWaveform *shape = &engine->triggerCentral.triggerShape; TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails; - engine->initializeTriggerWaveform(); + engine->updateTriggerWaveform(); ASSERT_FALSE(shape->shapeDefinitionError) << "Trigger shapeDefinitionError";