diff --git a/firmware/controllers/system/event_queue.cpp b/firmware/controllers/system/event_queue.cpp index 8aa3c79ddc..83d4228b08 100644 --- a/firmware/controllers/system/event_queue.cpp +++ b/firmware/controllers/system/event_queue.cpp @@ -45,10 +45,10 @@ bool EventQueue::insertTask(scheduling_s *scheduling, efitime_t timeX, schfunc_t efiAssert(callback != NULL, "NULL callback", false); if (scheduling->isScheduled) { -#if EFI_UNIT_TEST - printf("Already scheduled was %d\r\n", scheduling->momentX); - printf("Already scheduled now %d\r\n", timeX); -#endif +#if EFI_UNIT_TEST || EFI_SIMULATOR || defined(__DOXYGEN__) + printf("Already scheduled was %d\r\n", (int)scheduling->momentX); + printf("Already scheduled now %d\r\n", (int)timeX); +#endif /* EFI_UNIT_TEST || EFI_SIMULATOR */ return false; } diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index a5ff706d73..19b9655d1b 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -105,14 +105,11 @@ static void scheduleFuelInjection(int injEventIndex, OutputSignal *signal, efiti efitimeus_t turnOnTime = nowUs + (int) delayUs; 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) { 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 { seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, output); } diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 73c3d11ec3..954d44ef1b 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // 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 -#define VCS_VERSION "10675" +#define VCS_VERSION "10679" #endif