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

fixing unit tests

This commit is contained in:
rusefi 2017-05-11 19:15:47 -04:00
parent dd3b283be6
commit 7d5030086c
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,7 +362,7 @@ static void setBosch02880155868(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->injector.battLagCorr[7] = 0.726; engineConfiguration->injector.battLagCorr[7] = 0.726;
} }
static void setDefaultWarmupIdleCorrection() { static void setDefaultWarmupIdleCorrection(DECLARE_ENGINE_PARAMETER_F) {
initTemperatureCurve(CLT_CURVE_SIZE, config->cltIdleCorrBins, config->cltIdleCorr, PERCENT_MULT); initTemperatureCurve(CLT_CURVE_SIZE, config->cltIdleCorrBins, config->cltIdleCorr, PERCENT_MULT);
setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, -40, 150); setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, -40, 150);
@ -379,7 +379,7 @@ static void setDefaultWarmupIdleCorrection() {
setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 70, 101); setTableValue(config->cltIdleCorrBins, config->cltIdleCorr, CLT_CURVE_SIZE, 70, 101);
} }
static void setDefaultWarmupFuelEnrichment() { static void setDefaultWarmupFuelEnrichment(DECLARE_ENGINE_PARAMETER_F) {
initTemperatureCurve(CLT_CURVE_SIZE, config->cltFuelCorrBins, config->cltFuelCorr, PERCENT_MULT); initTemperatureCurve(CLT_CURVE_SIZE, config->cltFuelCorrBins, config->cltFuelCorr, PERCENT_MULT);
setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 150); setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 150);
@ -396,7 +396,7 @@ static void setDefaultWarmupFuelEnrichment() {
setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 70, 101); setTableValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 70, 101);
} }
static void setDefaultCrankingSettings() { static void setDefaultCrankingSettings(DECLARE_ENGINE_PARAMETER_F) {
setTableBin2(engineConfiguration->crankingTpsCoef, CRANKING_CURVE_SIZE, 1, 1, 1); setTableBin2(engineConfiguration->crankingTpsCoef, CRANKING_CURVE_SIZE, 1, 1, 1);
setTableBin2(engineConfiguration->crankingTpsBins, CRANKING_CURVE_SIZE, 0, 100, 1); setTableBin2(engineConfiguration->crankingTpsBins, CRANKING_CURVE_SIZE, 0, 100, 1);
@ -440,7 +440,7 @@ static void setDefaultCrankingSettings() {
} }
static void setDefaultIdleSpeedTarget() { static void setDefaultIdleSpeedTarget(DECLARE_ENGINE_PARAMETER_F) {
// todo: set bins // todo: set bins
setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -30, 1350); setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -30, 1350);
setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -20, 1300); setTableValue(engineConfiguration->cltIdleRpmBins, engineConfiguration->cltIdleRpm, CLT_CURVE_SIZE, -20, 1300);
@ -460,7 +460,7 @@ static void setDefaultIdleSpeedTarget() {
} }
static void setDefaultStepperIdleParameters() { static void setDefaultStepperIdleParameters(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->idle.stepperDirectionPin = GPIOE_10; boardConfiguration->idle.stepperDirectionPin = GPIOE_10;
boardConfiguration->idle.stepperStepPin = GPIOE_12; boardConfiguration->idle.stepperStepPin = GPIOE_12;
engineConfiguration->stepperEnablePin = GPIOE_14; engineConfiguration->stepperEnablePin = GPIOE_14;
@ -468,7 +468,7 @@ static void setDefaultStepperIdleParameters() {
engineConfiguration->idleStepperTotalSteps = 150; engineConfiguration->idleStepperTotalSteps = 150;
} }
static void setDefaultFsioParameters() { static void setDefaultFsioParameters(DECLARE_ENGINE_PARAMETER_F) {
for (int i = 0; i < AUX_PID_COUNT; i++) { for (int i = 0; i < AUX_PID_COUNT; i++) {
engineConfiguration->auxPidPins[i] = GPIO_UNASSIGNED; engineConfiguration->auxPidPins[i] = GPIO_UNASSIGNED;
} }
@ -480,7 +480,7 @@ static void setDefaultFsioParameters() {
} }
} }
static void setCanDefaults() { static void setCanDefaults(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->canDeviceMode = CD_USE_CAN2; boardConfiguration->canDeviceMode = CD_USE_CAN2;
boardConfiguration->canTxPin = GPIOB_6; boardConfiguration->canTxPin = GPIOB_6;
boardConfiguration->canRxPin = GPIOB_12; boardConfiguration->canRxPin = GPIOB_12;
@ -538,9 +538,9 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setTableBin2(engineConfiguration->cltTimingBins, CLT_TIMING_CURVE_SIZE, -40, 120, 1); setTableBin2(engineConfiguration->cltTimingBins, CLT_TIMING_CURVE_SIZE, -40, 120, 1);
setTableBin2(engineConfiguration->cltTimingExtra, CLT_TIMING_CURVE_SIZE, 0, 0, 1); setTableBin2(engineConfiguration->cltTimingExtra, CLT_TIMING_CURVE_SIZE, 0, 0, 1);
setDefaultWarmupIdleCorrection(); setDefaultWarmupIdleCorrection(PASS_ENGINE_PARAMETER_F);
setDefaultWarmupFuelEnrichment(); setDefaultWarmupFuelEnrichment(PASS_ENGINE_PARAMETER_F);
setConstantDwell(4 PASS_ENGINE_PARAMETER); // 4ms is global default dwell setConstantDwell(4 PASS_ENGINE_PARAMETER); // 4ms is global default dwell
// disable constant_dwell // disable constant_dwell
@ -622,10 +622,9 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->tChargeMaxRpmMinTps = 0.25; engineConfiguration->tChargeMaxRpmMinTps = 0.25;
engineConfiguration->tChargeMaxRpmMaxTps = 0.9; engineConfiguration->tChargeMaxRpmMaxTps = 0.9;
engineConfiguration->noAccelAfterHardLimitPeriodSecs = 3; engineConfiguration->noAccelAfterHardLimitPeriodSecs = 3;
setDefaultCrankingSettings(); setDefaultCrankingSettings(PASS_ENGINE_PARAMETER_F);
engineConfiguration->warmupTargetAfrBins[0] = -12; engineConfiguration->warmupTargetAfrBins[0] = -12;
engineConfiguration->warmupTargetAfr[0] = 12.3; engineConfiguration->warmupTargetAfr[0] = 12.3;
@ -636,8 +635,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->warmupTargetAfrBins[3] = 60; engineConfiguration->warmupTargetAfrBins[3] = 60;
engineConfiguration->warmupTargetAfr[3] = 14.5; engineConfiguration->warmupTargetAfr[3] = 14.5;
setDefaultIdleSpeedTarget(); setDefaultIdleSpeedTarget(PASS_ENGINE_PARAMETER_F);
engineConfiguration->fuelClosedLoopCorrectionEnabled = false; engineConfiguration->fuelClosedLoopCorrectionEnabled = false;
@ -749,7 +747,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->useSerialPort = true; boardConfiguration->useSerialPort = true;
boardConfiguration->useStepperIdle = false; boardConfiguration->useStepperIdle = false;
setDefaultStepperIdleParameters(); setDefaultStepperIdleParameters(PASS_ENGINE_PARAMETER_F);
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)
@ -794,7 +792,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->max31855_cs[i] = GPIO_UNASSIGNED; boardConfiguration->max31855_cs[i] = GPIO_UNASSIGNED;
} }
setDefaultFsioParameters(); setDefaultFsioParameters(PASS_ENGINE_PARAMETER_F);
engineConfiguration->alternatorPwmFrequency = 300; engineConfiguration->alternatorPwmFrequency = 300;
@ -850,7 +848,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->boardTestModeJumperPin = GPIOB_0; boardConfiguration->boardTestModeJumperPin = GPIOB_0;
setCanDefaults(); setCanDefaults(PASS_ENGINE_PARAMETER_F);
// set this to SPI_DEVICE_3 to enable stimulation // set this to SPI_DEVICE_3 to enable stimulation

2
firmware/rusefi.cpp
View File

@ -251,5 +251,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 20170505; return 20170511;
} }