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

auto-sync

This commit is contained in:
rusEfi 2016-11-29 23:01:55 -05:00
parent 7f1858a57f
commit 070cdef25c
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/algo/engine.cpp
View File

@ -305,8 +305,7 @@ void Engine::watchdog() {
} }
IgnitionEventList * Engine::ignitionList() { IgnitionEventList * Engine::ignitionList() {
// int revolutionIndex = rpmCalculator.getRevolutionCounter() % 2; return &engineConfiguration2->ignitionEvents;
return &engineConfiguration2->ignitionEvents[0];
} }
void Engine::prepareFuelSchedule(DECLARE_ENGINE_PARAMETER_F) { void Engine::prepareFuelSchedule(DECLARE_ENGINE_PARAMETER_F) {

6
firmware/controllers/algo/engine.h
View File

@ -94,11 +94,7 @@ public:
float fsioLastValue[LE_COMMAND_COUNT]; float fsioLastValue[LE_COMMAND_COUNT];
/** IgnitionEventList ignitionEvents;
* We are alternating two event lists in order to avoid a potential issue around revolution boundary
* when an event is scheduled within the next revolution.
*/
IgnitionEventList ignitionEvents[2];
}; };
class ThermistorMath { class ThermistorMath {

4
unit_tests/test_trigger_decoder.cpp
View File

@ -148,7 +148,7 @@ void test1995FordInline6TriggerDecoder(void) {
eth.engine.periodicFastCallback(PASS_ENGINE_PARAMETER_F); eth.engine.periodicFastCallback(PASS_ENGINE_PARAMETER_F);
eth.fireTriggerEvents(48); eth.fireTriggerEvents(48);
IgnitionEventList *ecl = &eth.ec2.ignitionEvents[0]; IgnitionEventList *ecl = &eth.ec2.ignitionEvents;
assertEqualsM("ford inline ignition events size", 1, ecl->isReady); assertEqualsM("ford inline ignition events size", 1, ecl->isReady);
assertEqualsM("event index", 0, ecl->elements[0].dwellPosition.eventIndex); assertEqualsM("event index", 0, ecl->elements[0].dwellPosition.eventIndex);
assertEqualsM("angle offset#1", 7, ecl->elements[0].dwellPosition.angleOffset); assertEqualsM("angle offset#1", 7, ecl->elements[0].dwellPosition.angleOffset);
@ -300,7 +300,7 @@ void testRpmCalculator(void) {
EngineTestHelper eth(FORD_INLINE_6_1995); EngineTestHelper eth(FORD_INLINE_6_1995);
EXPAND_EngineTestHelper; EXPAND_EngineTestHelper;
IgnitionEventList *ilist = &eth.engine.engineConfiguration2->ignitionEvents[0]; IgnitionEventList *ilist = &eth.engine.engineConfiguration2->ignitionEvents;
assertEqualsM("size #1", 0, ilist->isReady); assertEqualsM("size #1", 0, ilist->isReady);
assertEqualsM("engineCycle", 720, eth.engine.engineCycle); assertEqualsM("engineCycle", 720, eth.engine.engineCycle);