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

reducing code duplication

This commit is contained in:
rusefi 2017-06-11 15:17:02 -04:00
parent 53d1b39a1c
commit 6a4d69acc8
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/controllers/algo/engine_configuration.cpp
View File

@ -425,21 +425,23 @@ static void setDefaultWarmupIdleCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setCurveValue(CLT_MANUAL_IDLE_CORRECTION, 70, 33.0 / baseIdle * 100); setCurveValue(CLT_MANUAL_IDLE_CORRECTION, 70, 33.0 / baseIdle * 100);
} }
static void setDefaultWarmupFuelEnrichment(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #define WARMUP_CLT_EXTRA_FUEL_CURVE config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE
initTemperatureCurve(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, PERCENT_MULT);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 150); static void setDefaultWarmupFuelEnrichment(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -30, 150); initTemperatureCurve(WARMUP_CLT_EXTRA_FUEL_CURVE, PERCENT_MULT);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -20, 142);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -10, 136); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, -40, 150);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 0, 128); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, -30, 150);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 10, 119); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, -20, 142);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 20, 112); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, -10, 136);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 30, 110); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 0, 128);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 40, 106); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 10, 119);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 50, 106); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 20, 112);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 60, 103); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 30, 110);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 70, 101); setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 40, 106);
setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 50, 106);
setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 60, 103);
setCurveValue(WARMUP_CLT_EXTRA_FUEL_CURVE, 70, 101);
} }
static void setDefaultCrankingSettings(DECLARE_ENGINE_PARAMETER_SIGNATURE) { static void setDefaultCrankingSettings(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
@ -568,7 +570,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->postCrankingTargetClt = 25; engineConfiguration->postCrankingTargetClt = 25;
engineConfiguration->postCrankingDurationSec = 2; engineConfiguration->postCrankingDurationSec = 2;
initTemperatureCurve(config->iatFuelCorrBins, config->iatFuelCorr, IAT_CURVE_SIZE, 1); #define IAT_FUEL_CORRECTION_CURVE config->iatFuelCorrBins, config->iatFuelCorr, IAT_CURVE_SIZE
initTemperatureCurve(IAT_FUEL_CORRECTION_CURVE, 1);
engineConfiguration->tachPulseDuractionMs = 4; engineConfiguration->tachPulseDuractionMs = 4;
engineConfiguration->tachPulseTriggerIndex = 4; engineConfiguration->tachPulseTriggerIndex = 4;