From 4f3eafeabe91dcb48a93e83caa9fe8e7d4e44d71 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 2 Oct 2016 15:03:03 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/system/signal_executor_sleep.cpp | 4 ++-- firmware/controllers/trigger/main_trigger_callback.cpp | 6 +++--- firmware/svnversion.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/system/signal_executor_sleep.cpp b/firmware/controllers/system/signal_executor_sleep.cpp index 97149890af..35369e3bdf 100644 --- a/firmware/controllers/system/signal_executor_sleep.cpp +++ b/firmware/controllers/system/signal_executor_sleep.cpp @@ -70,8 +70,8 @@ void scheduleTask(const bool monitorReuse, const char *prefix, scheduling_s *sch #if EFI_SIMULATOR || defined(__DOXYGEN__) if (monitorReuse) { // for (int i = 0;i<100;i++) -// printf("%s: isArmed? why? sch=%d cb=%d p=%d\r\n", prefix, (int) scheduling, (int)callback, (int)param); -// firmwareError("armored\r\n"); + printf("%s: isArmed? why? sch=%d cb=%d p=%d\r\n", prefix, (int) scheduling, (int)callback, (int)param); + firmwareError("armored\r\n"); } #endif /* EFI_SIMULATOR */ chVTResetI(&scheduling->timer); diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp index aa55c8f8f1..749f172496 100644 --- a/firmware/controllers/trigger/main_trigger_callback.cpp +++ b/firmware/controllers/trigger/main_trigger_callback.cpp @@ -215,7 +215,7 @@ static void scheduleFuelInjection(int rpm, int injEventIndex, OutputSignal *sign 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, pair); + seScheduleByTime("out up1", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, pair); } efitimeus_t turnOffTime = nowUs + (int) (delayUs + durationUs); seScheduleByTime("out down", sDown, turnOffTime, (schfunc_t) &seTurnPinLow, pair); @@ -289,7 +289,7 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int injEventIndex, InjectionE // todo: sequential need this logic as well, just do not forget to clear flag pair->isScheduled = true; scheduling_s * sDown = &pair->signalTimerDown; - scheduleTask(true, "out up", sUp, (int) injectionStartDelayUs, (schfunc_t) &startSimultaniousInjection, engine); + scheduleTask(true, "out up s", sUp, (int) injectionStartDelayUs, (schfunc_t) &startSimultaniousInjection, engine); scheduleTask(true, "out down", sDown, (int) injectionStartDelayUs + MS2US(injectionDuration), (schfunc_t) &endSimultaniousInjection, engine); @@ -333,7 +333,7 @@ static void scheduleOutput2(OutputSignalPair *pair, efitimeus_t nowUs, float del scheduling_s *sDown = &pair->signalTimerDown; pair->output = output; - seScheduleByTime("out up", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, pair); + seScheduleByTime("out up2", sUp, turnOnTime, (schfunc_t) &seTurnPinHigh, pair); efitimeus_t turnOffTime = nowUs + (int) (delayUs + durationUs); seScheduleByTime("out down", sDown, turnOffTime, (schfunc_t) &seTurnPinLow, pair); diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 5b0588e815..041b979d39 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Sun Oct 02 11:43:29 EDT 2016 +// Sun Oct 02 14:04:04 EDT 2016 #ifndef VCS_VERSION -#define VCS_VERSION "10724" +#define VCS_VERSION "10726" #endif