rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-09-03 08:03:07 -04:00
parent ebc404da42
commit 8d41bd8c93
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -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) { 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 * 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)) if (!isInjectionEnabled(engineConfiguration))
return; return;
efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "lowstck#3"); efiAssertVoid(getRemainingStack(chThdSelf()) > 128, "lowstck#3");
efiAssertVoid(currentEventIndex < ENGINE(triggerShape.getLength()), "handleFuel/event index"); efiAssertVoid(currentEventIndex < ENGINE(triggerShape.getLength()), "handleFuel/event index");
if (limitedFuel) {
return;
}
/** /**
* Ignition events are defined by addFuelEvents() according to selected * Ignition events are defined by addFuelEvents() according to selected
* fueling strategy * fueling strategy
@ -240,7 +241,7 @@ static ALWAYS_INLINE void handleFuel(bool limitedFuel, uint32_t currentEventInde
if (eventIndex != currentEventIndex) { if (eventIndex != currentEventIndex) {
continue; continue;
} }
handleFuelInjectionEvent(injEventIndex, limitedFuel, event, rpm PASS_ENGINE_PARAMETER); handleFuelInjectionEvent(injEventIndex, event, rpm PASS_ENGINE_PARAMETER);
} }
} }

2
firmware/rusefi.cpp
View File

@ -305,5 +305,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20160824; return 20160902;
} }