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

refactoring: moving code to a better location

This commit is contained in:
rusefi 2018-02-06 23:47:19 +03:00
parent dee3a86cb1
commit b66bd28473
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#include "efilib2.h" #include "efilib2.h"
#include "settings.h" #include "settings.h"
#include "aux_valves.h" #include "aux_valves.h"
#include "map_averaging.h"
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)
#include "injector_central.h" #include "injector_central.h"
@ -443,31 +444,15 @@ injection_mode_e Engine::getCurrentInjectionMode(DECLARE_ENGINE_PARAMETER_SIGNAT
* so that trigger event handler/IO scheduler tasks are faster. * so that trigger event handler/IO scheduler tasks are faster.
*/ */
void Engine::periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void Engine::periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
int rpm = rpmCalculator.rpmValue;
if (isValidRpm(rpm)) { #if EFI_MAP_AVERAGING
MAP_sensor_config_s * c = &engineConfiguration->map; refreshMapAveragingPreCalc(PASS_ENGINE_PARAMETER_SIGNATURE);
angle_t start = interpolate2d("mapa", rpm, c->samplingAngleBins, c->samplingAngle, MAP_ANGLE_SIZE); #endif
angle_t offsetAngle = TRIGGER_SHAPE(eventAngles[CONFIG(mapAveragingSchedulingAtIndex)]);
for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
angle_t cylinderOffset = getEngineCycle(engineConfiguration->operationMode) * i / engineConfiguration->specs.cylindersCount;
float cylinderStart = start + cylinderOffset - offsetAngle + tdcPosition();
fixAngle(cylinderStart, "cylinderStart");
engine->engineState.mapAveragingStart[i] = cylinderStart;
}
engine->engineState.mapAveragingDuration = interpolate2d("samp", rpm, c->samplingWindowBins, c->samplingWindow, MAP_WINDOW_SIZE);
} else {
for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
engine->engineState.mapAveragingStart[i] = NAN;
}
engine->engineState.mapAveragingDuration = NAN;
}
engineState.periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE); engineState.periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
engine->m.beforeFuelCalc = GET_TIMESTAMP(); engine->m.beforeFuelCalc = GET_TIMESTAMP();
int rpm = rpmCalculator.rpmValue;
ENGINE(injectionDuration) = getInjectionDuration(rpm PASS_ENGINE_PARAMETER_SUFFIX); ENGINE(injectionDuration) = getInjectionDuration(rpm PASS_ENGINE_PARAMETER_SUFFIX);
engine->m.fuelCalcTime = GET_TIMESTAMP() - engine->m.beforeFuelCalc; engine->m.fuelCalcTime = GET_TIMESTAMP() - engine->m.beforeFuelCalc;

26
firmware/controllers/map_averaging.cpp
View File

@ -59,7 +59,7 @@ static volatile int measurementsPerRevolutionCounter = 0;
static volatile int measurementsPerRevolution = 0; static volatile int measurementsPerRevolution = 0;
/** /**
* In this lock-free imlementation 'readIndex' is always pointing * In this lock-free implementation 'readIndex' is always pointing
* to the consistent copy of accumulator and counter pair * to the consistent copy of accumulator and counter pair
*/ */
static int readIndex = 0; static int readIndex = 0;
@ -208,6 +208,30 @@ static void applyMapMinBufferLength() {
} }
} }
void refreshMapAveragingPreCalc(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
int rpm = engine->rpmCalculator.rpmValue;
if (isValidRpm(rpm)) {
MAP_sensor_config_s * c = &engineConfiguration->map;
angle_t start = interpolate2d("mapa", rpm, c->samplingAngleBins, c->samplingAngle, MAP_ANGLE_SIZE);
angle_t offsetAngle = TRIGGER_SHAPE(eventAngles[CONFIG(mapAveragingSchedulingAtIndex)]);
for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
angle_t cylinderOffset = getEngineCycle(engineConfiguration->operationMode) * i / engineConfiguration->specs.cylindersCount;
float cylinderStart = start + cylinderOffset - offsetAngle + tdcPosition();
fixAngle(cylinderStart, "cylinderStart");
engine->engineState.mapAveragingStart[i] = cylinderStart;
}
engine->engineState.mapAveragingDuration = interpolate2d("samp", rpm, c->samplingWindowBins, c->samplingWindow, MAP_WINDOW_SIZE);
} else {
for (int i = 0; i < engineConfiguration->specs.cylindersCount; i++) {
engine->engineState.mapAveragingStart[i] = NAN;
}
engine->engineState.mapAveragingDuration = NAN;
}
}
/** /**
* Shaft Position callback used to schedule start and end of MAP averaging * Shaft Position callback used to schedule start and end of MAP averaging
*/ */

1
firmware/controllers/map_averaging.h
View File

@ -17,6 +17,7 @@ void mapAveragingCallback(adcsample_t newValue);
#endif #endif
void initMapAveraging(Logging *sharedLogger, Engine *engine); void initMapAveraging(Logging *sharedLogger, Engine *engine);
void refreshMapAveragingPreCalc(DECLARE_ENGINE_PARAMETER_SIGNATURE);
#endif /* EFI_MAP_AVERAGING */ #endif /* EFI_MAP_AVERAGING */