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

MAP scheduling (#1352) 

* map sched

* format

* guard test
This commit is contained in:
Matthew Kennedy 2020-04-23 05:12:44 -07:00 committed by GitHub
parent e4f3989603
commit b28740c20e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/controllers/engine_cycle/map_averaging.cpp
View File

@ -107,8 +107,9 @@ static scheduling_s endTimer[INJECTION_PIN_COUNT][2];
*/ */
static bool isAveraging = false; static bool isAveraging = false;
static void startAveraging(void *arg) { static void endAveraging(void *arg);
(void) arg;
static void startAveraging(scheduling_s *endAveragingScheduling) {
efiAssertVoid(CUSTOM_ERR_6649, getCurrentRemainingStack() > 128, "lowstck#9"); efiAssertVoid(CUSTOM_ERR_6649, getCurrentRemainingStack() > 128, "lowstck#9");
bool wasLocked = lockAnyContext(); bool wasLocked = lockAnyContext();
@ -121,6 +122,11 @@ static void startAveraging(void *arg) {
} }
mapAveragingPin.setHigh(); mapAveragingPin.setHigh();
#if ! EFI_UNIT_TEST
scheduleByAngle(endAveragingScheduling, getTimeNowNt(), ENGINE(engineState.mapAveragingDuration),
endAveraging PASS_ENGINE_PARAMETER_SUFFIX);
#endif
} }
#if HAL_USE_ADC #if HAL_USE_ADC
@ -304,7 +310,6 @@ static void mapAveragingTriggerCallback(trigger_event_e ckpEventType,
return; return;
} }
fixAngle(samplingEnd, "samplingEnd", CUSTOM_ERR_6563); fixAngle(samplingEnd, "samplingEnd", CUSTOM_ERR_6563);
// only if value is already prepared // only if value is already prepared
int structIndex = getRevolutionCounter() % 2; int structIndex = getRevolutionCounter() % 2;
@ -312,9 +317,7 @@ static void mapAveragingTriggerCallback(trigger_event_e ckpEventType,
// we are loosing precision in case of changing RPM - the further away is the event the worse is precision // we are loosing precision in case of changing RPM - the further away is the event the worse is precision
// todo: schedule this based on closest trigger event, same as ignition works // todo: schedule this based on closest trigger event, same as ignition works
scheduleByAngle(&startTimer[i][structIndex], edgeTimestamp, samplingStart, scheduleByAngle(&startTimer[i][structIndex], edgeTimestamp, samplingStart,
startAveraging PASS_ENGINE_PARAMETER_SUFFIX); { startAveraging, &endTimer[i][structIndex] } PASS_ENGINE_PARAMETER_SUFFIX);
scheduleByAngle(&endTimer[i][structIndex], edgeTimestamp, samplingEnd,
endAveraging PASS_ENGINE_PARAMETER_SUFFIX);
} }
#endif #endif
} }
@ -347,11 +350,6 @@ float getMap(void) {
void initMapAveraging(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) { void initMapAveraging(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
logger = sharedLogger; logger = sharedLogger;
// startTimer[0].name = "map start0";
// startTimer[1].name = "map start1";
// endTimer[0].name = "map end0";
// endTimer[1].name = "map end1";
#if EFI_SHAFT_POSITION_INPUT #if EFI_SHAFT_POSITION_INPUT
addTriggerEventListener(&mapAveragingTriggerCallback, "MAP averaging", engine); addTriggerEventListener(&mapAveragingTriggerCallback, "MAP averaging", engine);
#endif /* EFI_SHAFT_POSITION_INPUT */ #endif /* EFI_SHAFT_POSITION_INPUT */