diff --git a/firmware/controllers/algo/signal_executor.cpp b/firmware/controllers/algo/signal_executor.cpp index 7bd46afa6d..65dc859cf3 100644 --- a/firmware/controllers/algo/signal_executor.cpp +++ b/firmware/controllers/algo/signal_executor.cpp @@ -49,8 +49,8 @@ static const char *sparkNames[IGNITION_PIN_COUNT] = { "c1", "c2", "c3", "c4", "c static const char *injectorNames[INJECTION_PIN_COUNT] = { "i1", "i2", "i3", "i4", "i5", "i6", "i7", "i8", "j9", "iA", "iB", "iC"}; -void initSignalExecutor(void) { - initSignalExecutorImpl(); +void initEnginePinsNames(void) { + // todo: make engine_pins_s a class and move this to constructor? for (int i = 0; i < IGNITION_PIN_COUNT;i++) { enginePins.coils[i].name = sparkNames[i]; } @@ -59,6 +59,11 @@ void initSignalExecutor(void) { } } +void initSignalExecutor(void) { + initSignalExecutorImpl(); + initEnginePinsNames(); +} + void turnPinHigh(NamedOutputPin *output) { efiAssertVoid(output!=NULL, "NULL @ turnPinHigh"); #if EFI_DEFAILED_LOGGING || defined(__DOXYGEN__) diff --git a/firmware/controllers/algo/signal_executor.h b/firmware/controllers/algo/signal_executor.h index 76e031da7f..30cd7f8ae6 100644 --- a/firmware/controllers/algo/signal_executor.h +++ b/firmware/controllers/algo/signal_executor.h @@ -40,6 +40,7 @@ struct OutputSignal_struct { void scheduleOutput(OutputSignal *signal, efitimeus_t nowUs, float delayUs, float durationUs, NamedOutputPin *output); void initSignalExecutor(void); +void initEnginePinsNames(void); void initSignalExecutorImpl(void); diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 9278501f8d..03e9e160ab 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -19,6 +19,8 @@ extern int timeNow; EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persistentConfig) { ec = &persistentConfig.engineConfiguration; + initEnginePinsNames(); + engineConfiguration = ec; board_configuration_s * boardConfiguration = &engineConfiguration->bc; persistent_config_s *config = &persistentConfig;