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

#487

This commit is contained in:
rusefi 2017-11-06 19:00:30 -05:00
parent faf9f2c364
commit 345304ea8e
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,6 +445,8 @@ case IM_SEQUENTIAL:
return "IM_SEQUENTIAL";
case IM_SIMULTANEOUS:
return "IM_SIMULTANEOUS";
case IM_SINGLE_POINT:
return "IM_SINGLE_POINT";
}
return NULL;
}

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

@ -109,6 +109,7 @@ int getNumberOfInjections(injection_mode_e mode DECLARE_ENGINE_PARAMETER_SUFFIX)
case IM_SIMULTANEOUS:
return engineConfiguration->specs.cylindersCount;
case IM_SEQUENTIAL:
case IM_SINGLE_POINT:
return 1;
case IM_BATCH:
return 2;

8
firmware/controllers/algo/rusefi_enums.h
View File

@ -423,6 +423,9 @@ typedef enum {
* @see getNumberOfInjections
*/
typedef enum {
/**
* each cylinder has it's own injector but they all works in parallel
*/
IM_SIMULTANEOUS = 0,
/**
* each cylinder has it's own injector, each injector is wired separately
@ -432,6 +435,11 @@ typedef enum {
* each cylinder has it's own injector but these injectors work in pairs. Injectors could be wired in pairs or separately.
*/
IM_BATCH = 2,
/**
* only one injector located in throttle body
*/
IM_SINGLE_POINT = 3,
Force_4b_injection_mode = ENUM_32_BITS,
} injection_mode_e;

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

@ -142,7 +142,7 @@ bool FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_SUFF
injection_mode_e mode = engine->getCurrentInjectionMode(PASS_ENGINE_PARAMETER_SIGNATURE);
if (mode == IM_SIMULTANEOUS) {
if (mode == IM_SIMULTANEOUS || mode == IM_SINGLE_POINT) {
index = 0;
} else if (mode == IM_SEQUENTIAL) {
index = getCylinderId(i PASS_ENGINE_PARAMETER_SUFFIX) - 1;

2
firmware/integration/rusefi_config.txt
View File

@ -295,7 +295,7 @@ custom engine_load_mode_e 4 bits, U32, @OFFSET@, [0:1], @@engine_load_mode_e_enu
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"
custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "Single Point"
injection_mode_e crankingInjectionMode;
injection_mode_e injectionMode;+'batched' means two injectors are wired together\nset injection_mode X
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

10
firmware/tunerstudio/rusefi.ini
View File

@ -63,7 +63,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 Sun Oct 29 20:03:49 EDT 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Nov 06 18:48:24 EST 2017
pageSize = 16376
page = 1
@ -149,8 +149,8 @@ page = 1
sensorSnifferRpmThreshold = scalar, S32, 416, "RPM", 1, 0, 0,30000, 0
rpmHardLimit = scalar, S32, 420, "rpm", 1, 0, 0, 20000.0, 2
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"
crankingInjectionMode = bits, U32, 428, [0:1], "Simultaneous", "Sequential", "Batch", "Single Point"
injectionMode = bits, U32, 432, [0:1], "Simultaneous", "Sequential", "Batch", "Single Point"
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"
@ -1416,7 +1416,7 @@ gaugeCategory = Fuel Data
baseFuelGauge = baseFuel, "fuel: base", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 3, 1
fuelPidCorrectionGauge = fuelPidCorrection, "fuel: correction", "mSec", -11, 11, 1.0, 1.2, 20, 25, 3, 1
[WueAnalyze]
; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition
@ -1442,7 +1442,7 @@ gaugeCategory = Fuel Data
filter = lowRpm, "Low RPM" , rpm, < , 300, , false
filter = std_Custom ; Standard Custom Expression Filter.
[FrontPage]
; Gauges are numbered left to right, top to bottom.
;