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 2014-11-17 11:03:06 -06:00
parent 7452259f77
commit a661751ce8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/controllers/math/engine_math.cpp
View File

@ -137,7 +137,7 @@ void initializeIgnitionActions(float advance, float dwellAngle,
case IM_ONE_COIL: case IM_ONE_COIL:
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
// todo: extract method // todo: extract method
float localAdvance = advance + 720.0f * i / engineConfiguration->cylindersCount; float localAdvance = advance + (float) engineConfiguration->engineCycle * i / engineConfiguration->cylindersCount;
registerSparkEvent(&engineConfiguration2->triggerShape, list, SPARKOUT_1_OUTPUT, registerSparkEvent(&engineConfiguration2->triggerShape, list, SPARKOUT_1_OUTPUT,
localAdvance, dwellAngle PASS_ENGINE_PARAMETER); localAdvance, dwellAngle PASS_ENGINE_PARAMETER);
@ -145,7 +145,7 @@ void initializeIgnitionActions(float advance, float dwellAngle,
break; break;
case IM_WASTED_SPARK: case IM_WASTED_SPARK:
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
float localAdvance = advance + 720.0f * i / engineConfiguration->cylindersCount; float localAdvance = advance + (float) engineConfiguration->engineCycle * i / engineConfiguration->cylindersCount;
int wastedIndex = i % (engineConfiguration->cylindersCount / 2); int wastedIndex = i % (engineConfiguration->cylindersCount / 2);
@ -160,7 +160,7 @@ void initializeIgnitionActions(float advance, float dwellAngle,
break; break;
case IM_INDIVIDUAL_COILS: case IM_INDIVIDUAL_COILS:
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
float localAdvance = advance + 720.0f * i / engineConfiguration->cylindersCount; float localAdvance = advance + (float) engineConfiguration->engineCycle * i / engineConfiguration->cylindersCount;
io_pin_e pin = (io_pin_e) ((int) SPARKOUT_1_OUTPUT + getCylinderId(engineConfiguration->firingOrder, i) - 1); io_pin_e pin = (io_pin_e) ((int) SPARKOUT_1_OUTPUT + getCylinderId(engineConfiguration->firingOrder, i) - 1);
registerSparkEvent(&engineConfiguration2->triggerShape, list, pin, localAdvance, registerSparkEvent(&engineConfiguration2->triggerShape, list, pin, localAdvance,
@ -219,13 +219,13 @@ void FuelSchedule::addFuelEvents(trigger_shape_s *s,
case IM_SEQUENTIAL: case IM_SEQUENTIAL:
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
io_pin_e pin = INJECTOR_PIN_BY_INDEX(getCylinderId(engineConfiguration->firingOrder, i) - 1); io_pin_e pin = INJECTOR_PIN_BY_INDEX(getCylinderId(engineConfiguration->firingOrder, i) - 1);
float angle = baseAngle + 1.0 * i * 720 / engineConfiguration->cylindersCount; float angle = baseAngle + (float) engineConfiguration->engineCycle * i / engineConfiguration->cylindersCount;
registerInjectionEvent(s, pin, angle, false PASS_ENGINE_PARAMETER); registerInjectionEvent(s, pin, angle, false PASS_ENGINE_PARAMETER);
} }
break; break;
case IM_SIMULTANEOUS: case IM_SIMULTANEOUS:
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
float angle = baseAngle + 1.0 * i * 720 / engineConfiguration->cylindersCount; float angle = baseAngle + (float) engineConfiguration->engineCycle * i / engineConfiguration->cylindersCount;
/** /**
* We do not need injector pin here because we will control all injectors * We do not need injector pin here because we will control all injectors
@ -238,7 +238,7 @@ void FuelSchedule::addFuelEvents(trigger_shape_s *s,
for (int i = 0; i < engineConfiguration->cylindersCount; i++) { for (int i = 0; i < engineConfiguration->cylindersCount; i++) {
int index = i % (engineConfiguration->cylindersCount / 2); int index = i % (engineConfiguration->cylindersCount / 2);
io_pin_e pin = INJECTOR_PIN_BY_INDEX(index); io_pin_e pin = INJECTOR_PIN_BY_INDEX(index);
float angle = baseAngle + 1.0 * i * 720 / engineConfiguration->cylindersCount; float angle = baseAngle + i * (float) engineConfiguration->engineCycle / engineConfiguration->cylindersCount;
registerInjectionEvent(s, pin, angle, false PASS_ENGINE_PARAMETER); registerInjectionEvent(s, pin, angle, false PASS_ENGINE_PARAMETER);
/** /**

2
firmware/rusefi.cpp
View File

@ -253,5 +253,5 @@ void firmwareError(const char *fmt, ...) {
} }
int getRusEfiVersion(void) { int getRusEfiVersion(void) {
return 20141115; return 20141117;
} }