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

Merge pull request #1688 from mck1117/ys-2 

Simplify fuel mode logic
This commit is contained in:
rusefillc 2020-08-13 09:05:53 -04:00 committed by GitHub
parent 02563d42e1 adbd41f2bd
commit 45ce812a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
firmware/controllers/algo/fuel_math.cpp
View File

@ -261,6 +261,31 @@ int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_SUFFIX)
} }
} }
float getInjectionModeDurationMultiplier(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
injection_mode_e mode = ENGINE(getCurrentInjectionMode(PASS_ENGINE_PARAMETER_SIGNATURE));
switch (mode) {
case IM_SIMULTANEOUS: {
auto cylCount = engineConfiguration->specs.cylindersCount;
if (cylCount == 0) {
// we can end up here during configuration reset
return 0;
}
return 1.0f / cylCount;
}
case IM_SEQUENTIAL:
case IM_SINGLE_POINT:
return 1;
case IM_BATCH:
return 0.5f;
default:
firmwareError(CUSTOM_ERR_INVALID_INJECTION_MODE, "Unexpected injection_mode_e %d", mode);
return 0;
}
}
/** /**
* This is more like MOSFET duty cycle since durations include injector lag * This is more like MOSFET duty cycle since durations include injector lag
* @see getCoilDutyCycle * @see getCoilDutyCycle
@ -287,31 +312,20 @@ floatms_t getInjectionDuration(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
ScopePerf perf(PE::GetInjectionDuration); ScopePerf perf(PE::GetInjectionDuration);
#if EFI_SHAFT_POSITION_INPUT #if EFI_SHAFT_POSITION_INPUT
bool isCranking = ENGINE(rpmCalculator).isCranking(PASS_ENGINE_PARAMETER_SIGNATURE);
injection_mode_e mode = ENGINE(getCurrentInjectionMode(PASS_ENGINE_PARAMETER_SIGNATURE));
int numberOfInjections = getNumberOfInjections(mode PASS_ENGINE_PARAMETER_SUFFIX);
if (numberOfInjections == 0) {
warning(CUSTOM_CONFIG_NOT_READY, "config not ready");
return 0; // we can end up here during configuration reset
}
// Always update base fuel - some cranking modes use it // Always update base fuel - some cranking modes use it
floatms_t baseFuel = getBaseFuel(rpm PASS_ENGINE_PARAMETER_SUFFIX); floatms_t baseFuel = getBaseFuel(rpm PASS_ENGINE_PARAMETER_SUFFIX);
bool isCranking = ENGINE(rpmCalculator).isCranking(PASS_ENGINE_PARAMETER_SIGNATURE);
floatms_t fuelPerCycle = getFuel(isCranking, baseFuel PASS_ENGINE_PARAMETER_SUFFIX); floatms_t fuelPerCycle = getFuel(isCranking, baseFuel PASS_ENGINE_PARAMETER_SUFFIX);
efiAssert(CUSTOM_ERR_ASSERT, !cisnan(fuelPerCycle), "NaN fuelPerCycle", 0); efiAssert(CUSTOM_ERR_ASSERT, !cisnan(fuelPerCycle), "NaN fuelPerCycle", 0);
if (mode == IM_SINGLE_POINT) {
// here we convert per-cylinder fuel amount into total engine amount since the single injector serves all cylinders
fuelPerCycle *= engineConfiguration->specs.cylindersCount;
}
// Fuel cut-off isn't just 0 or 1, it can be tapered // Fuel cut-off isn't just 0 or 1, it can be tapered
fuelPerCycle *= ENGINE(engineState.fuelCutoffCorrection); fuelPerCycle *= ENGINE(engineState.fuelCutoffCorrection);
// If no fuel, don't add injector lag // If no fuel, don't add injector lag
if (fuelPerCycle == 0.0f) if (fuelPerCycle == 0.0f)
return 0; return 0;
floatms_t theoreticalInjectionLength = fuelPerCycle / numberOfInjections; floatms_t theoreticalInjectionLength = fuelPerCycle * getInjectionModeDurationMultiplier(PASS_ENGINE_PARAMETER_SIGNATURE);
floatms_t injectorLag = ENGINE(engineState.running.injectorLag); floatms_t injectorLag = ENGINE(engineState.running.injectorLag);
if (cisnan(injectorLag)) { if (cisnan(injectorLag)) {
warning(CUSTOM_ERR_INJECTOR_LAG, "injectorLag not ready"); warning(CUSTOM_ERR_INJECTOR_LAG, "injectorLag not ready");