diff --git a/firmware/controllers/algo/signal_executor.h b/firmware/controllers/algo/signal_executor.h index ef9a943cd3..bd31fb546e 100644 --- a/firmware/controllers/algo/signal_executor.h +++ b/firmware/controllers/algo/signal_executor.h @@ -39,6 +39,7 @@ struct OutputSignal_struct { }; void scheduleOutput2(scheduling_s * sUp, scheduling_s * sDown, efitimeus_t nowUs, float delayUs, float durationUs, InjectorOutputPin *output); +void seScheduleByTime(const char *prefix, scheduling_s *scheduling, efitimeus_t time, schfunc_t callback, NamedOutputPin *param); void initSignalExecutor(void); void initEnginePinsNames(void); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index 6fea1a805c..10a5280389 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -122,14 +122,13 @@ static void scheduleFuelInjection(int eventIndex, OutputSignal *signal, efitimeu } #endif - // todo: point at 'seScheduleByTime' if (isSecondaryOverlapping) { output->cancelNextTurningInjectorOff = true; } else { - scheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output); + seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output); } efitimeus_t turnOffTime = nowUs + (int) (delayUs + durationUs); - scheduleByTime("out down", sDown, turnOffTime, (schfunc_t) &seTurnPinLow, output); + seScheduleByTime("out down", sDown, turnOffTime, (schfunc_t) &seTurnPinLow, output); } static ALWAYS_INLINE void handleFuelInjectionEvent(int eventIndex, InjectionEvent *event, diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 7a4ae5a174..e3d1015924 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -119,7 +119,11 @@ #include "engine_emulator.h" #endif /* EFI_ENGINE_EMULATOR */ +#if FUEL_MATH_EXTREME_LOGGING +LoggingWithStorage sharedLogger("main"); +#else static LoggingWithStorage sharedLogger("main"); +#endif /* FUEL_MATH_EXTREME_LOGGING */ bool main_loop_started = false;