diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index 512c568b5b..626944bba7 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -97,11 +97,8 @@ static void endSimultaniousInjection(Engine *engine) { } } -static ALWAYS_INLINE void handleFuelInjectionEvent(int eventIndex, bool limitedFuel, InjectionEvent *event, +static ALWAYS_INLINE void handleFuelInjectionEvent(int eventIndex, InjectionEvent *event, int rpm DECLARE_ENGINE_PARAMETER_S) { - if (limitedFuel) { - return; // todo: move this check up - } /** * todo: this is a bit tricky with batched injection. is it? Does the same @@ -186,12 +183,16 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int eventIndex, bool limitedF } } -static ALWAYS_INLINE void handleFuel(bool limitedFuel, uint32_t currentEventIndex, int rpm DECLARE_ENGINE_PARAMETER_S) { +static ALWAYS_INLINE void handleFuel(const bool limitedFuel, uint32_t currentEventIndex, int rpm DECLARE_ENGINE_PARAMETER_S) { if (!isInjectionEnabled(engineConfiguration)) return; efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "lowstck#3"); efiAssertVoid(currentEventIndex < ENGINE(triggerShape.getLength()), "handleFuel/event index"); + if (limitedFuel) { + return; + } + /** * Ignition events are defined by addFuelEvents() according to selected * fueling strategy @@ -240,7 +241,7 @@ static ALWAYS_INLINE void handleFuel(bool limitedFuel, uint32_t currentEventInde if (eventIndex != currentEventIndex) { continue; } - handleFuelInjectionEvent(injEventIndex, limitedFuel, event, rpm PASS_ENGINE_PARAMETER); + handleFuelInjectionEvent(injEventIndex, event, rpm PASS_ENGINE_PARAMETER); } } diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 9426821b3c..529bff50ae 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -305,5 +305,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20160824; + return 20160902; }