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-09-27 00:02:27 -04:00
parent 3981290369
commit 30c94041c0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/signal_executor.h
View File

@ -54,7 +54,6 @@ struct OutputSignal_struct {
OutputSignalPair signalPair[2]; OutputSignalPair signalPair[2];
}; };
void seScheduleByTime(const char *prefix, scheduling_s *scheduling, efitimeus_t time, schfunc_t callback, NamedOutputPin *param);
void initSignalExecutor(void); void initSignalExecutor(void);
void initEnginePinsNames(void); void initEnginePinsNames(void);

10
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -312,7 +312,7 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int injEventIndex, InjectionE
* @param dwell the number of ticks of output duration * @param dwell the number of ticks of output duration
* *
*/ */
void scheduleOutput2(scheduling_s * sUp, scheduling_s * sDown, efitimeus_t nowUs, float delayUs, float durationUs, InjectorOutputPin *output) { static void scheduleOutput2(OutputSignalPair *pair, efitimeus_t nowUs, float delayUs, float durationUs, InjectorOutputPin *output) {
#if EFI_GPIO || defined(__DOXYGEN__) #if EFI_GPIO || defined(__DOXYGEN__)
#if EFI_UNIT_TEST || defined(__DOXYGEN__) #if EFI_UNIT_TEST || defined(__DOXYGEN__)
@ -321,6 +321,9 @@ void scheduleOutput2(scheduling_s * sUp, scheduling_s * sDown, efitimeus_t nowUs
efitimeus_t turnOnTime = nowUs + (int) delayUs; efitimeus_t turnOnTime = nowUs + (int) delayUs;
scheduling_s *sUp = &pair->signalTimerUp;
scheduling_s *sDown = &pair->signalTimerDown;
seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output); seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output);
efitimeus_t turnOffTime = nowUs + (int) (delayUs + durationUs); efitimeus_t turnOffTime = nowUs + (int) (delayUs + durationUs);
@ -345,14 +348,13 @@ static void handleFuelScheduleOverlap(InjectionEventList *injectionEvents DECLAR
// todo: recalc fuel? account for wetting? // todo: recalc fuel? account for wetting?
floatms_t injectionDuration = ENGINE(fuelMs); floatms_t injectionDuration = ENGINE(fuelMs);
scheduling_s * sUp = &ENGINE(engineConfiguration2)->overlappingFuelActuator[injEventIndex].signalTimerUp; OutputSignalPair* pair = &ENGINE(engineConfiguration2)->overlappingFuelActuator[injEventIndex];
scheduling_s * sDown = &ENGINE(engineConfiguration2)->overlappingFuelActuator[injEventIndex].signalTimerDown;
efitimeus_t nowUs = getTimeNowUs(); efitimeus_t nowUs = getTimeNowUs();
output->overlappingScheduleOffTime = nowUs + MS2US(injectionDuration); output->overlappingScheduleOffTime = nowUs + MS2US(injectionDuration);
scheduleOutput2(sUp, sDown, nowUs, 0, MS2US(injectionDuration), output); scheduleOutput2(pair, nowUs, 0, MS2US(injectionDuration), output);
} }
} }
} }