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

refactoring: moving field

This commit is contained in:
Andrey 2022-09-05 00:53:05 -04:00
parent ccfe2a5d58
commit d51511a15e
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/engine.h
View File

@ -330,12 +330,6 @@ public:
TriggerCentral triggerCentral; TriggerCentral triggerCentral;
#endif // EFI_SHAFT_POSITION_INPUT #endif // EFI_SHAFT_POSITION_INPUT
/**
* Each individual fuel injection duration for current engine cycle, without wall wetting
* including everything including injector lag, both cranking and running
* @see getInjectionDuration()
*/
floatms_t injectionDuration = 0;
// Per-injection fuel mass, including TPS accel enrich // Per-injection fuel mass, including TPS accel enrich
float injectionMass[MAX_CYLINDER_COUNT] = {0}; float injectionMass[MAX_CYLINDER_COUNT] = {0};

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

@ -158,7 +158,7 @@ void EngineState::periodicFastCallback() {
auto clResult = fuelClosedLoopCorrection(); auto clResult = fuelClosedLoopCorrection();
// Store the pre-wall wetting injection duration for scheduling purposes only, not the actual injection duration // Store the pre-wall wetting injection duration for scheduling purposes only, not the actual injection duration
engine->injectionDuration = engine->module<InjectorModel>()->getInjectionDuration(injectionMass); engine->engineState.injectionDuration = engine->module<InjectorModel>()->getInjectionDuration(injectionMass);
float fuelLoad = getFuelingLoad(); float fuelLoad = getFuelingLoad();
injectionOffset = getInjectionOffset(rpm, fuelLoad); injectionOffset = getInjectionOffset(rpm, fuelLoad);

7
firmware/controllers/algo/engine_state.h
View File

@ -61,6 +61,13 @@ public:
*/ */
floatms_t tpsAccelEnrich = 0; floatms_t tpsAccelEnrich = 0;
/**
* Each individual fuel injection duration for current engine cycle, without wall wetting
* including everything including injector lag, both cranking and running
* @see getInjectionDuration()
*/
floatms_t injectionDuration = 0;
angle_t injectionOffset = 0; angle_t injectionOffset = 0;
multispark_state multispark; multispark_state multispark;

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

@ -271,7 +271,7 @@ float getInjectionModeDurationMultiplier() {
* @see getCoilDutyCycle * @see getCoilDutyCycle
*/ */
percent_t getInjectorDutyCycle(int rpm) { percent_t getInjectorDutyCycle(int rpm) {
floatms_t totalInjectiorAmountPerCycle = engine->injectionDuration * getNumberOfInjections(engineConfiguration->injectionMode); floatms_t totalInjectiorAmountPerCycle = engine->engineState.injectionDuration * getNumberOfInjections(engineConfiguration->injectionMode);
floatms_t engineCycleDuration = getEngineCycleDuration(rpm); floatms_t engineCycleDuration = getEngineCycleDuration(rpm);
return 100 * totalInjectiorAmountPerCycle / engineCycleDuration; return 100 * totalInjectiorAmountPerCycle / engineCycleDuration;
} }

2
firmware/controllers/engine_cycle/fuel_schedule.cpp
View File

@ -64,7 +64,7 @@ expected<float> InjectionEvent::computeInjectionAngle(int cylinderIndex) const {
// injection phase may be scheduled by injection end, so we need to step the angle back // injection phase may be scheduled by injection end, so we need to step the angle back
// for the duration of the injection // for the duration of the injection
angle_t injectionDurationAngle = getInjectionAngleCorrection(engine->injectionDuration, oneDegreeUs); angle_t injectionDurationAngle = getInjectionAngleCorrection(engine->engineState.injectionDuration, oneDegreeUs);
// User configured offset - degrees after TDC combustion // User configured offset - degrees after TDC combustion
floatus_t injectionOffset = engine->engineState.injectionOffset; floatus_t injectionOffset = engine->engineState.injectionOffset;