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

auto-sync

This commit is contained in:
rusEfi 2016-12-01 09:02:30 -05:00
parent e291bbd846
commit fb5c4257e7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,8 +225,7 @@ static void scheduleFuelInjection(int rpm, OutputSignal *signal, efitimeus_t now
#endif /*EFI_PRINTF_FUEL_DETAILS */
efiAssertVoid(signal!=NULL, "signal is NULL");
int index = getRevolutionCounter() % 2;
OutputSignalPair *pair = &signal->signalPair[index];
OutputSignalPair *pair = &signal->signalPair[0];
if (pair->isScheduled) {
#if EFI_UNIT_TEST || EFI_SIMULATOR || defined(__DOXYGEN__)
printf("still used1 %s %d\r\n", output->name, (int)getTimeNowUs());
@ -317,8 +316,7 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int injEventIndex, InjectionE
* changed into 'scheduleInjection' and unified? todo: think about it.
*/
efiAssertVoid(signal!=NULL, "signal is NULL");
int index = getRevolutionCounter() % 2;
OutputSignalPair *pair = &signal->signalPair[index];
OutputSignalPair *pair = &signal->signalPair[0];
scheduling_s * sUp = &pair->signalTimerUp;
// todo: sequential need this logic as well, just do not forget to clear flag pair->isScheduled = true;
scheduling_s * sDown = &pair->signalTimerDown;

4
unit_tests/test_trigger_decoder.cpp
View File

@ -961,7 +961,7 @@ void testFuelSchedulerBug299smallAndMedium(void) {
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
assertEqualsM("Queue.size#05", 9, schedulingQueue.size());
assertEqualsM("Queue.size#05", 7, schedulingQueue.size());
schedulingQueue.executeAll(timeNow);
timeNow += MS2US(20);
@ -982,7 +982,7 @@ void testFuelSchedulerBug299smallAndMedium(void) {
assertInjectionEvent("#30", &t->elements[3], 1, 0, 45, false);
// todo: what's what? a mix of new something and old something?
assertEqualsM("qs#5", 6, schedulingQueue.size());
assertEqualsM("qs#5", 4, schedulingQueue.size());
// assertInjectorDownEvent("8@0", 0, MS2US(5.0), 1);
// assertInjectorUpEvent("8@1", 1, MS2US(7.5), 1);
// assertInjectorDownEvent("8@2", 2, MS2US(15.0), 0);