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

auto-sync

This commit is contained in:
rusEfi 2016-08-28 16:02:34 -04:00
parent 021c353097
commit ae3daee330
25 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/GY6_139QMB.cpp
View File

@ -84,7 +84,7 @@ void setGy6139qmbDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->cranking.rpm = 1100;
engineConfiguration->targetIdleRpm = 2000;
engineConfiguration->analogInputDividerCoefficient = 1;
engineConfiguration->algorithm = LM_MAP;
engineConfiguration->fuelAlgorithm = LM_MAP;
engineConfiguration->globalTriggerAngleOffset = 45;
boardConfiguration->sensorChartMode = SC_MAP;
engineConfiguration->specs.displacement = 0.072; // 72cc

8
firmware/config/engines/dodge_neon.cpp
View File

@ -151,7 +151,7 @@ EXTERN_ENGINE;
void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->trigger.type = TT_DODGE_NEON_1995;
engineConfiguration->algorithm = LM_ALPHA_N;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
// engineConfiguration->spi2SckMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
// engineConfiguration->spi2MosiMode = PAL_STM32_OTYPE_OPENDRAIN; // 4
@ -200,7 +200,7 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// set_ignition_offset 350
engineConfiguration->ignitionOffset = 350;
// set_injection_offset 510
engineConfiguration->injectionOffset = 510 + 497;
engineConfiguration->extraInjectionOffset = 510 + 497;
/**
* that's 1995 config
@ -267,7 +267,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// set_global_trigger_offset_angle 38
engineConfiguration->globalTriggerAngleOffset = 38;
// set_injection_offset 0
engineConfiguration->injectionOffset = 0;
engineConfiguration->extraInjectionOffset = 0;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SEQUENTIAL;
@ -314,7 +314,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
*/
engineConfiguration->injector.flow = 199;
//engineConfiguration->algorithm = LM_ALPHA_N; // I want to start with a simple Alpha-N
//engineConfiguration->fuelAlgorithm = LM_ALPHA_N; // I want to start with a simple Alpha-N
setFuelLoadBin(0, 100 PASS_ENGINE_PARAMETER);
setTableBin2(config->ignitionLoadBins, IGN_LOAD_COUNT, 20, 120, 1);

2
firmware/config/engines/ford_1995_inline_6.cpp
View File

@ -51,7 +51,7 @@ void setFordInline6(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->globalTriggerAngleOffset = 0;
engineConfiguration->ignitionOffset = 13;
engineConfiguration->injectionOffset = 207.269999;
engineConfiguration->extraInjectionOffset = 207.269999;
setThermistorConfiguration(&engineConfiguration->clt, -10.0, 160310.0, 60.0, 7700.0, 120.0, 1180.0);
engineConfiguration->clt.config.bias_resistor = 2700;

2
firmware/config/engines/ford_aspire.cpp
View File

@ -104,7 +104,7 @@ void setFordAspireEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
engineConfiguration->globalTriggerAngleOffset = 175;
engineConfiguration->ignitionOffset = 87;
engineConfiguration->injectionOffset = 54 + 360;
engineConfiguration->extraInjectionOffset = 54 + 360;
setDefaultAspireMaps(PASS_ENGINE_PARAMETER_F);
// set_cranking_rpm 550

6
firmware/config/engines/ford_festiva.cpp
View File

@ -78,9 +78,9 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->globalFuelCorrection = 0.75;
engineConfiguration->specs.displacement = 1.839;
// engineConfiguration->algorithm = LM_PLAIN_MAF;
// engineConfiguration->fuelAlgorithm = LM_PLAIN_MAF;
setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER);
// engineConfiguration->algorithm = LM_REAL_MAF;
// engineConfiguration->fuelAlgorithm = LM_REAL_MAF;
setFuelLoadBin(1.2, 4.4 PASS_ENGINE_PARAMETER);
setFuelRpmBin(800, 7000 PASS_ENGINE_PARAMETER);
@ -139,7 +139,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
// set_ignition_offset 0
engineConfiguration->ignitionOffset = 0;
// set_injection_offset 0
engineConfiguration->injectionOffset = 0;
engineConfiguration->extraInjectionOffset = 0;
// todo: change to 15?
// set_cranking_timing_angle 3

4
firmware/config/engines/honda_600.cpp
View File

@ -61,7 +61,7 @@ static void setDefaultCustomMaps(DECLARE_ENGINE_PARAMETER_F) {
void setHonda600(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM;
engineConfiguration->algorithm = LM_ALPHA_N;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
// upside down wiring
boardConfiguration->triggerInputPins[0] = GPIOA_5;
@ -77,7 +77,7 @@ void setHonda600(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
engineConfiguration->injectionOffset = 320;
engineConfiguration->extraInjectionOffset = 320;
engineConfiguration->cranking.rpm = 800;
// engineConfiguration->ignitionMode = IM_WASTED_SPARK; //IM_INDIVIDUAL_COILS;

2
firmware/config/engines/honda_accord.cpp
View File

@ -79,7 +79,7 @@ static void setHondaAccordConfigurationCommon(DECLARE_ENGINE_PARAMETER_F) {
// set_ignition_offset 350
// engineConfiguration->ignitionOffset = 350;
// set_injection_offset 510
// engineConfiguration->injectionOffset = 510;
// engineConfiguration->extraInjectionOffset = 510;
/**

2
firmware/config/engines/mazda_miata.cpp
View File

@ -358,7 +358,7 @@ void setMiata1994_s(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->malfunctionIndicatorPin = GPIOE_5;
boardConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT;
engineConfiguration->algorithm = LM_REAL_MAF;
engineConfiguration->fuelAlgorithm = LM_REAL_MAF;
setMazdaMiataNAMaf(config);
engineConfiguration->injector.flow = 230;
}

2
firmware/config/engines/sachs.cpp
View File

@ -23,7 +23,7 @@ void setSachs(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->engineChartSize = 400;
// set_injection_offset 0
engineConfiguration->injectionOffset = 0;
engineConfiguration->extraInjectionOffset = 0;
setEgoSensor(ES_Innovate_MTX_L PASS_ENGINE_PARAMETER);

2
firmware/console/status_loop.cpp
View File

@ -429,7 +429,7 @@ static void showFuelInfo2(float rpm, float engineLoad) {
scheduleMsg(&logger, "inj flow %fcc/min displacement %fL", engineConfiguration->injector.flow,
engineConfiguration->specs.displacement);
scheduleMsg(&logger2, "algo=%s/pump=%s", getEngine_load_mode_e(engineConfiguration->algorithm),
scheduleMsg(&logger2, "algo=%s/pump=%s", getEngine_load_mode_e(engineConfiguration->fuelAlgorithm),
boolToString(enginePins.fuelPumpRelay.getLogicValue()));
scheduleMsg(&logger2, "injection phase=%f/global fuel correction=%f", getinjectionOffset(rpm), engineConfiguration->globalFuelCorrection);

4
firmware/controllers/algo/advance_map.cpp
View File

@ -180,8 +180,8 @@ float getInitialAdvance(int rpm, float map, float advanceMax) {
* this method builds a good-enough base timing advance map bases on a number of heuristics
*/
void buildTimingMap(float advanceMax DECLARE_ENGINE_PARAMETER_S) {
if (engineConfiguration->algorithm != LM_SPEED_DENSITY &&
engineConfiguration->algorithm != LM_MAP) {
if (engineConfiguration->fuelAlgorithm != LM_SPEED_DENSITY &&
engineConfiguration->fuelAlgorithm != LM_MAP) {
warning(CUSTOM_OBD_1, "wrong algorithm for MAP-based timing");
return;
}

2
firmware/controllers/algo/engine.cpp
View File

@ -186,7 +186,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
float engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_F);
timingAdvance = getAdvance(rpm, engineLoad PASS_ENGINE_PARAMETER);
if (engineConfiguration->algorithm == LM_SPEED_DENSITY) {
if (engineConfiguration->fuelAlgorithm == LM_SPEED_DENSITY) {
float coolantC = ENGINE(engineState.clt);
float intakeC = ENGINE(engineState.iat);
float tps = getTPS(PASS_ENGINE_PARAMETER_F);

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

@ -530,12 +530,12 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->ignitionMode = IM_ONE_COIL;
engineConfiguration->globalTriggerAngleOffset = 0;
engineConfiguration->injectionOffset = 0;
engineConfiguration->extraInjectionOffset = 0;
engineConfiguration->ignitionOffset = 0;
engineConfiguration->overrideCrankingIgnition = true;
engineConfiguration->sensorChartFrequency = 20;
engineConfiguration->algorithm = LM_PLAIN_MAF;
engineConfiguration->fuelAlgorithm = LM_PLAIN_MAF;
engineConfiguration->vbattDividerCoeff = ((float) (15 + 65)) / 15;

11
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 27 10:09:22 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -973,11 +973,11 @@ typedef struct {
*/
int rpmHardLimit;
/**
* This setting controls which algorithm is used for ENGINE LOAD
* This setting controls which fuel quantity control algorithm is used.
* set_algorithm X
* offset 424
*/
engine_load_mode_e algorithm;
engine_load_mode_e fuelAlgorithm;
/**
* offset 428
*/
@ -990,9 +990,10 @@ typedef struct {
/**
* this is about deciding when the injector starts it's squirt
* See also injectionPhase map
* todo: do we need even need this since we have the map anyway?
* offset 436
*/
angle_t injectionOffset;
angle_t extraInjectionOffset;
/**
* Timing advance while engine cranking
* set_cranking_timing_angle X
@ -1929,4 +1930,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Aug 27 10:09:22 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016

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

@ -74,9 +74,9 @@ float getRealMafFuel(float airSpeed, int rpm DECLARE_ENGINE_PARAMETER_S) {
floatms_t getBaseFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
ENGINE(engineState.tpsAccelEnrich) = ENGINE(tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F));
if (CONFIG(algorithm) == LM_SPEED_DENSITY) {
if (CONFIG(fuelAlgorithm) == LM_SPEED_DENSITY) {
engine->engineState.baseFuel = getSpeedDensityFuel(rpm PASS_ENGINE_PARAMETER);
} else if (engineConfiguration->algorithm == LM_REAL_MAF) {
} else if (engineConfiguration->fuelAlgorithm == LM_REAL_MAF) {
float maf = getRealMaf(PASS_ENGINE_PARAMETER_F) + engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_F);
engine->engineState.baseFuel = getRealMafFuel(maf, rpm PASS_ENGINE_PARAMETER);
} else {

4
firmware/controllers/algo/rusefi_generated.h
View File

@ -191,10 +191,10 @@
#define cylinderBore_offset 412
#define sensorSnifferRpmThreshold_offset 416
#define rpmHardLimit_offset 420
#define algorithm_offset 424
#define fuelAlgorithm_offset 424
#define crankingInjectionMode_offset 428
#define injectionMode_offset 432
#define injectionOffset_offset 436
#define extraInjectionOffset_offset 436
#define crankingTimingAngle_offset 440
#define ignitionMode_offset 444
#define ignitionOffset_offset 448

2
firmware/controllers/lcd_controller.cpp
View File

@ -230,7 +230,7 @@ static void showLine(lcd_line_e line, int screenY) {
lcdPrintf("Intake Air %f", getIntakeAirTemperature(PASS_ENGINE_PARAMETER_F));
return;
case LL_ALGORITHM:
lcdPrintf(getEngine_load_mode_e(engineConfiguration->algorithm));
lcdPrintf(getEngine_load_mode_e(engineConfiguration->fuelAlgorithm));
return;
case LL_INJECTION:
lcdPrintf(getInjection_mode_e(engineConfiguration->injectionMode));

17
firmware/controllers/math/engine_math.cpp
View File

@ -50,7 +50,7 @@ floatms_t getCrankshaftRevolutionTimeMs(int rpm) {
float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F) {
efiAssert(engine!=NULL, "engine 2NULL", NAN);
efiAssert(engineConfiguration!=NULL, "engineConfiguration 2NULL", NAN);
switch (engineConfiguration->algorithm) {
switch (engineConfiguration->fuelAlgorithm) {
case LM_PLAIN_MAF:
if (!hasMafSensor(PASS_ENGINE_PARAMETER_F)) {
warning(CUSTOM_OBD_17, "MAF sensor needed for current fuel algorithm");
@ -67,7 +67,7 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_F) {
return getRealMaf(PASS_ENGINE_PARAMETER_F);
}
default:
warning(CUSTOM_OBD_18, "Unexpected engine load parameter: %d", engineConfiguration->algorithm);
warning(CUSTOM_OBD_18, "Unexpected engine load parameter: %d", engineConfiguration->fuelAlgorithm);
return -1;
}
}
@ -138,7 +138,7 @@ void FuelSchedule::registerInjectionEvent(int injectorIndex, float angle,
NamedOutputPin *output = &enginePins.injectors[injectorIndex];
if (!isSimultanious && !isPinAssigned(output)) {
// todo: extact method for this index math
// todo: extract method for this index math
warning(CUSTOM_OBD_20, "no_pin_inj #%s", output->name);
}
@ -192,9 +192,12 @@ void FuelSchedule::addFuelEvents(injection_mode_e mode DECLARE_ENGINE_PARAMETER_
/**
* injection phase is scheduled by injection end, so we need to step the angle back
* for the duration of the injection
*
* todo: since this method is not invoked within trigger event handler and
* engineState.injectionOffset is calculated from the same utility timer should we more that logic here?
*/
angle_t baseAngle = ENGINE(engineState.injectionOffset)
+ CONFIG(injectionOffset) - MS2US(ENGINE(fuelMs)) / ENGINE(rpmCalculator.oneDegreeUs);
+ CONFIG(extraInjectionOffset) - MS2US(ENGINE(fuelMs)) / ENGINE(rpmCalculator.oneDegreeUs);
switch (mode) {
case IM_SEQUENTIAL:
@ -448,7 +451,7 @@ int isInjectionEnabled(engine_configuration_s *engineConfiguration) {
* this method sets algorithm and ignition table scale
*/
void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_S) {
engineConfiguration->algorithm = algo;
engineConfiguration->fuelAlgorithm = algo;
if (algo == LM_ALPHA_N) {
setTimingLoadBin(20, 120 PASS_ENGINE_PARAMETER);
} else if (algo == LM_SPEED_DENSITY) {
@ -458,7 +461,5 @@ void setAlgorithm(engine_load_mode_e algo DECLARE_ENGINE_PARAMETER_S) {
}
void setInjectorLag(float value DECLARE_ENGINE_PARAMETER_S) {
for (int i=0;i<VBAT_INJECTOR_CURVE_SIZE;i++) {
engineConfiguration->injector.battLagCorr[i] = value;
}
setArrayValues(engineConfiguration->injector.battLagCorr, VBAT_INJECTOR_CURVE_SIZE, value);
}

10
firmware/controllers/settings.cpp
View File

@ -200,7 +200,7 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
scheduleMsg(&logger, "Template %s/%d trigger %s/%s/%d", getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->trigger.type),
getEngine_load_mode_e(engineConfiguration->algorithm), engineConfiguration->algorithm);
getEngine_load_mode_e(engineConfiguration->fuelAlgorithm), engineConfiguration->fuelAlgorithm);
scheduleMsg(&logger, "configurationVersion=%d", getGlobalConfigurationVersion());
@ -254,7 +254,7 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
scheduleMsg(&logger, "=== injection ===");
scheduleMsg(&logger, "injection %s offset=%f/enabled=%s", getInjection_mode_e(engineConfiguration->injectionMode),
(double) engineConfiguration->injectionOffset, boolToString(engineConfiguration->isInjectionEnabled));
(double) engineConfiguration->extraInjectionOffset, boolToString(engineConfiguration->isInjectionEnabled));
printOutputs(engineConfiguration);
@ -342,7 +342,7 @@ static void setIdlePinMode(int value) {
}
static void setInjectionOffset(float value) {
engineConfiguration->injectionOffset = value;
engineConfiguration->extraInjectionOffset = value;
doPrintConfiguration(engine);
incrementGlobalConfigurationVersion();
}
@ -582,7 +582,7 @@ static void setWholeTimingMapCmd(float value) {
static void setWholeVeCmd(float value) {
scheduleMsg(&logger, "Setting whole VE map to %f", value);
if (engineConfiguration->algorithm != LM_SPEED_DENSITY) {
if (engineConfiguration->fuelAlgorithm != LM_SPEED_DENSITY) {
scheduleMsg(&logger, "WARNING: setting VE map not in SD mode is pointless");
}
setMap(config->veTable, value);
@ -590,7 +590,7 @@ static void setWholeVeCmd(float value) {
static void setWholeFuelMapCmd(float value) {
scheduleMsg(&logger, "Setting whole fuel map to %f", value);
if (engineConfiguration->algorithm == LM_SPEED_DENSITY) {
if (engineConfiguration->fuelAlgorithm == LM_SPEED_DENSITY) {
scheduleMsg(&logger, "WARNING: setting fuel map in SD mode is pointless");
}
setWholeFuelMap(value PASS_ENGINE_PARAMETER);

4
firmware/integration/rusefi_config.txt
View File

@ -264,13 +264,13 @@ int sensorSnifferRpmThreshold;+Disable sensor sniffer above this rpm;"RPM",
custom engine_load_mode_e 4 bits, U32, @OFFSET@, [0:1], @@engine_load_mode_e_enum@@
engine_load_mode_e algorithm;+This setting controls which algorithm is used for ENGINE LOAD\nset_algorithm X
engine_load_mode_e fuelAlgorithm;+This setting controls which fuel quantity control algorithm is used.\nset_algorithm X
custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
injection_mode_e crankingInjectionMode;
injection_mode_e injectionMode;+'batched' means two injectors are wired together
angle_t injectionOffset;+this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, -720, 720, 2
angle_t extraInjectionOffset;+this is about deciding when the injector starts it's squirt\nSee also injectionPhase map\ntodo: do we need even need this since we have the map anyway?;"deg", 1, 0.0, -720, 720, 2
angle_t crankingTimingAngle;+Timing advance while engine cranking\nset_cranking_timing_angle X; "deg", 1, 0.0, -360, 360, 2
custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"

30
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Aug 23 22:54:36 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016
pageSize = 16376
page = 1
@ -127,10 +127,10 @@ page = 1
cylinderBore = scalar, F32, 412, "mm", 1, 0, 0, 20000.0, 2
sensorSnifferRpmThreshold = scalar, S32, 416, "RPM", 1, 0, 0,30000, 0
rpmHardLimit = scalar, S32, 420, "rpm", 1, 0, 0, 20000.0, 2
algorithm = bits, U32, 424, [0:1], "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"
fuelAlgorithm = bits, U32, 424, [0:1], "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"
crankingInjectionMode = bits, U32, 428, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
injectionMode = bits, U32, 432, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
injectionOffset = scalar, F32, 436, "deg", 1, 0.0, -720, 720, 2
extraInjectionOffset = scalar, F32, 436, "deg", 1, 0.0, -720, 720, 2
crankingTimingAngle = scalar, F32, 440, "deg", 1, 0.0, -360, 360, 2
ignitionMode = bits, U32, 444, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
ignitionOffset = scalar, F32, 448, "RPM", 1, 0, 0, 3000.0, 0
@ -688,9 +688,9 @@ page = 1
knockBandCustom = "kHz knock band override"
cylinderBore = "Cylinder diameter, in mm."
sensorSnifferRpmThreshold = "Disable sensor sniffer above this rpm"
algorithm = "This setting controls which algorithm is used for ENGINE LOAD\nset_algorithm X"
fuelAlgorithm = "This setting controls which fuel quantity control algorithm is used.\nset_algorithm X"
injectionMode = "'batched' means two injectors are wired together"
injectionOffset = "this is about deciding when the injector starts it's squirt\nSee also injectionPhase map"
extraInjectionOffset = "this is about deciding when the injector starts it's squirt\nSee also injectionPhase map\ntodo: do we need even need this since we have the map anyway?"
crankingTimingAngle = "Timing advance while engine cranking\nset_cranking_timing_angle X"
ignitionMode = "'wasted' means one coil is driving two spark plugs in two cylinders, with one of the aparks not doing anything since it's happening on the exhaust cycle"
ignitionOffset = "this value could be used to offset the whole ignition timing table by a constant"
@ -870,7 +870,7 @@ fileVersion = { 20160702 }
egoCorrection = { 100 }
time = { timeNow }
; engineLoad = { algorithm == 0 ? MAF : TPS }
; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS }
[CurveEditor]
; xAxis = leftValue, rightValue, step
@ -1317,9 +1317,9 @@ fileVersion = { 20160702 }
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target", 0, {useWarmupPidAfr == 1}
subMenu = cltIdleCurve, "Warmup IAC position manual Multiplier"
subMenu = std_separator
subMenu = fuelTableTbl, "Fuel Table", 0, {algorithm != 3}
subMenu = veTableTbl, "VE Table", 0, {algorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", 0, {algorithm == 3}
subMenu = fuelTableTbl, "Fuel Table", 0, {fuelAlgorithm != 3}
subMenu = veTableTbl, "VE Table", 0, {fuelAlgorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", 0, {fuelAlgorithm == 3}
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
subMenu = injPhaseTableTbl, "Injection Phase"
@ -1328,16 +1328,16 @@ fileVersion = { 20160702 }
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction"
subMenu = baroCorrTbl, "Baro Correction", 0, {algorithm == 3}
subMenu = baroCorrTbl, "Baro Correction", 0, {fuelAlgorithm == 3}
subMenu = std_separator
subMenu = std_realtime, "&Realtime Display", 0
menu = "3D Map Tuning"
; subMenu = std_realtime, "Realtime Display"
; subMenu = std_warmup, "Warmup Wizard"
subMenu = fuelTableMap, "Fuel Table", 0, {algorithm != 3}
subMenu = veTableMap, "VE Table", 0, {algorithm == 3}
subMenu = afrTableMap, "Targe AFR Table", 0, {algorithm == 3}
subMenu = fuelTableMap, "Fuel Table", 0, {fuelAlgorithm != 3}
subMenu = veTableMap, "VE Table", 0, {fuelAlgorithm == 3}
subMenu = afrTableMap, "Targe AFR Table", 0, {fuelAlgorithm == 3}
subMenu = injPhaseTableMap, "Injection Phase"
subMenu = ignitionTableMap, "Ignition Table"
subMenu = ignitionIatCorrTableMap, "Ignition Intake Air Temp correction"
@ -1470,7 +1470,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
; Engine->Injection Settings
dialog = injChars, "Injector Settings", yAxis
field = "Injector Flow", injector_flow
field = "phase offset", injectionOffset
field = "phase offset", extraInjectionOffset
dialog = injIO, "Injector Output", yAxis
field = "!ECU reboot needed to apply these settings"
@ -1837,7 +1837,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "RPM Hard Limit", rpmHardLimit
field = "Boost Cut Pressure", boostCutPressure
field = ""
field = "Fuel Algorithm", algorithm
field = "Fuel Algorithm", fuelAlgorithm
field = ""
field = "#System hack's"
field = "Global fuel correction", globalFuelCorrection

20
firmware/tunerstudio/rusefi.input
View File

@ -852,7 +852,7 @@ fileVersion = { 20160702 }
egoCorrection = { 100 }
time = { timeNow }
; engineLoad = { algorithm == 0 ? MAF : TPS }
; engineLoad = { fuleAlgorithm == 0 ? MAF : TPS }
[CurveEditor]
; xAxis = leftValue, rightValue, step
@ -1299,9 +1299,9 @@ fileVersion = { 20160702 }
subMenu = warmupTargetAfrCurve, "Warmup fuel auto correction AFR target", 0, {useWarmupPidAfr == 1}
subMenu = cltIdleCurve, "Warmup IAC position manual Multiplier"
subMenu = std_separator
subMenu = fuelTableTbl, "Fuel Table", 0, {algorithm != 3}
subMenu = veTableTbl, "VE Table", 0, {algorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", 0, {algorithm == 3}
subMenu = fuelTableTbl, "Fuel Table", 0, {fuelAlgorithm != 3}
subMenu = veTableTbl, "VE Table", 0, {fuelAlgorithm == 3}
subMenu = afrTableTbl, "Targe AFR Table", 0, {fuelAlgorithm == 3}
subMenu = AccelEnrich, "Accel/Decel Enrichment/Enleanment"
subMenu = iatFuelCorrCurve, "Intake air temperature fuel Multiplier"
subMenu = injPhaseTableTbl, "Injection Phase"
@ -1310,16 +1310,16 @@ fileVersion = { 20160702 }
subMenu = std_separator
subMenu = ignitionTableTbl, "Ignition Table"
subMenu = ignitionIatCorrTableTbl, "Ignition Intake Air Temp correction"
subMenu = baroCorrTbl, "Baro Correction", 0, {algorithm == 3}
subMenu = baroCorrTbl, "Baro Correction", 0, {fuelAlgorithm == 3}
subMenu = std_separator
subMenu = std_realtime, "&Realtime Display", 0
menu = "3D Map Tuning"
; subMenu = std_realtime, "Realtime Display"
; subMenu = std_warmup, "Warmup Wizard"
subMenu = fuelTableMap, "Fuel Table", 0, {algorithm != 3}
subMenu = veTableMap, "VE Table", 0, {algorithm == 3}
subMenu = afrTableMap, "Targe AFR Table", 0, {algorithm == 3}
subMenu = fuelTableMap, "Fuel Table", 0, {fuelAlgorithm != 3}
subMenu = veTableMap, "VE Table", 0, {fuelAlgorithm == 3}
subMenu = afrTableMap, "Targe AFR Table", 0, {fuelAlgorithm == 3}
subMenu = injPhaseTableMap, "Injection Phase"
subMenu = ignitionTableMap, "Ignition Table"
subMenu = ignitionIatCorrTableMap, "Ignition Intake Air Temp correction"
@ -1452,7 +1452,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
; Engine->Injection Settings
dialog = injChars, "Injector Settings", yAxis
field = "Injector Flow", injector_flow
field = "phase offset", injectionOffset
field = "phase offset", extraInjectionOffset
dialog = injIO, "Injector Output", yAxis
field = "!ECU reboot needed to apply these settings"
@ -1819,7 +1819,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "RPM Hard Limit", rpmHardLimit
field = "Boost Cut Pressure", boostCutPressure
field = ""
field = "Fuel Algorithm", algorithm
field = "Fuel Algorithm", fuelAlgorithm
field = ""
field = "#System hack's"
field = "Global fuel correction", globalFuelCorrection

10
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Aug 23 21:52:05 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Aug 28 15:53:30 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -195,10 +195,10 @@ public class Fields {
public static final int cylinderBore_offset = 412;
public static final int sensorSnifferRpmThreshold_offset = 416;
public static final int rpmHardLimit_offset = 420;
public static final int algorithm_offset = 424;
public static final int fuelAlgorithm_offset = 424;
public static final int crankingInjectionMode_offset = 428;
public static final int injectionMode_offset = 432;
public static final int injectionOffset_offset = 436;
public static final int extraInjectionOffset_offset = 436;
public static final int crankingTimingAngle_offset = 440;
public static final int ignitionMode_offset = 444;
public static final int ignitionOffset_offset = 448;
@ -1038,10 +1038,10 @@ public class Fields {
public static final Field SENSORSNIFFERRPMTHRESHOLD = Field.create("SENSORSNIFFERRPMTHRESHOLD", 416, FieldType.INT);
public static final Field RPMHARDLIMIT = Field.create("RPMHARDLIMIT", 420, FieldType.INT);
public static final String[] engine_load_mode_e = {"MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"};
public static final Field ALGORITHM = Field.create("ALGORITHM", 424, FieldType.INT, engine_load_mode_e);
public static final Field FUELALGORITHM = Field.create("FUELALGORITHM", 424, FieldType.INT, engine_load_mode_e);
public static final Field CRANKINGINJECTIONMODE = Field.create("CRANKINGINJECTIONMODE", 428, FieldType.INT);
public static final Field INJECTIONMODE = Field.create("INJECTIONMODE", 432, FieldType.INT);
public static final Field INJECTIONOFFSET = Field.create("INJECTIONOFFSET", 436, FieldType.FLOAT);
public static final Field EXTRAINJECTIONOFFSET = Field.create("EXTRAINJECTIONOFFSET", 436, FieldType.FLOAT);
public static final Field CRANKINGTIMINGANGLE = Field.create("CRANKINGTIMINGANGLE", 440, FieldType.FLOAT);
public static final Field IGNITIONMODE = Field.create("IGNITIONMODE", 444, FieldType.INT);
public static final Field IGNITIONOFFSET = Field.create("IGNITIONOFFSET", 448, FieldType.FLOAT);

2
unit_tests/test_fuel_map.cpp
View File

@ -24,7 +24,7 @@ void testMafFuelMath(void) {
EngineTestHelper eth(FORD_ASPIRE_1996);
EXPAND_EngineTestHelper;
engineConfiguration->algorithm = LM_REAL_MAF;
engineConfiguration->fuelAlgorithm = LM_REAL_MAF;
engineConfiguration->injector.flow = 200;
setAfrMap(config->afrTable, 13);

2
unit_tests/test_trigger_decoder.cpp
View File

@ -598,7 +598,7 @@ void testFuelSchedulerBug299(void) {
printf("*************************************************** testFuelSchedulerBug299\r\n");
EngineTestHelper eth(TEST_ENGINE);
EXPAND_EngineTestHelper;
assertEquals(LM_PLAIN_MAF, engineConfiguration->algorithm);
assertEquals(LM_PLAIN_MAF, engineConfiguration->fuelAlgorithm);
engineConfiguration->isIgnitionEnabled = false;
engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->injectionMode = IM_BATCH;