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-24 00:03:14 -04:00
parent 8f1dc4a5c1
commit d9d7ffaeae
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/system/event_queue.cpp
View File

@ -45,10 +45,10 @@ bool EventQueue::insertTask(scheduling_s *scheduling, efitime_t timeX, schfunc_t
efiAssert(callback != NULL, "NULL callback", false); efiAssert(callback != NULL, "NULL callback", false);
if (scheduling->isScheduled) { if (scheduling->isScheduled) {
#if EFI_UNIT_TEST #if EFI_UNIT_TEST || EFI_SIMULATOR || defined(__DOXYGEN__)
printf("Already scheduled was %d\r\n", scheduling->momentX); printf("Already scheduled was %d\r\n", (int)scheduling->momentX);
printf("Already scheduled now %d\r\n", timeX); printf("Already scheduled now %d\r\n", (int)timeX);
#endif #endif /* EFI_UNIT_TEST || EFI_SIMULATOR */
return false; return false;
} }

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

@ -105,14 +105,11 @@ static void scheduleFuelInjection(int injEventIndex, OutputSignal *signal, efiti
efitimeus_t turnOnTime = nowUs + (int) delayUs; efitimeus_t turnOnTime = nowUs + (int) delayUs;
bool isSecondaryOverlapping = turnOnTime < output->overlappingScheduleOffTime; bool isSecondaryOverlapping = turnOnTime < output->overlappingScheduleOffTime;
#if EFI_UNIT_CODE
if (isOverlapping) {
printf("overlapping on %s %d < %d", output->name, turnOnTime, output->overlappingScheduleOffTime);
}
#endif
if (isSecondaryOverlapping) { if (isSecondaryOverlapping) {
output->cancelNextTurningInjectorOff = true; output->cancelNextTurningInjectorOff = true;
#if EFI_UNIT_TEST || EFI_SIMULATOR || defined(__DOXYGEN__)
printf("please cancel %s %d %d\r\n", output->name, (int)getTimeNowUs(), output->overlappingCounter);
#endif /* EFI_UNIT_TEST || EFI_SIMULATOR */
} else { } else {
seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output); seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output);
} }

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header // This file was generated by Version2Header
// Thu Sep 22 12:57:29 EDT 2016 // Fri Sep 23 23:48:14 EDT 2016
#ifndef VCS_VERSION #ifndef VCS_VERSION
#define VCS_VERSION "10675" #define VCS_VERSION "10679"
#endif #endif