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

auto-sync

This commit is contained in:
rusEfi 2015-02-12 17:04:08 -06:00
parent 13b5c7948a
commit 1c634db0f5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,9 +159,16 @@ void FuelSchedule::addFuelEvents(OutputSignalList *sourceList, injection_mode_e
efiAssertVoid(engine!=NULL, "engine is NULL");
// float baseAngle = engineConfiguration->injectionAngle - MS2US(engine->fuelMs) / engine->rpmCalculator.oneDegreeUs;
float baseAngle = engineConfiguration->injectionAngle - engine->fuelMs;
if (cisnan(engine->rpmCalculator.oneDegreeUs))
return;
efiAssertVoid(!cisnan(engine->rpmCalculator.oneDegreeUs), "NAN one deg");
/**
* injection phase is scheduled by injection end, so we need to step the angle back
* for the duration of the injection
*/
float baseAngle = engineConfiguration->injectionAngle - MS2US(engine->fuelMs) / engine->rpmCalculator.oneDegreeUs;
switch (mode) {
case IM_SEQUENTIAL:
@ -303,7 +310,8 @@ int getCylinderId(firing_order_e firingOrder, int index) {
return -1;
}
static NamedOutputPin * getIgnitionPinForIndex(int i DECLARE_ENGINE_PARAMETER_S) {
static NamedOutputPin * getIgnitionPinForIndex(int i DECLARE_ENGINE_PARAMETER_S
) {
switch (CONFIG(ignitionMode)) {
case IM_ONE_COIL:
return &enginePins.coils[0];
@ -344,8 +352,7 @@ void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_F) {
TRIGGER_SHAPE(triggerIndexByAngle[angle])= findAngleIndex(angle PASS_ENGINE_PARAMETER);
}
engineConfiguration2->crankingInjectionEvents.addFuelEvents(
&crankingInjectonSignals,
engineConfiguration2->crankingInjectionEvents.addFuelEvents(&crankingInjectonSignals,
engineConfiguration->crankingInjectionMode PASS_ENGINE_PARAMETER);
engineConfiguration2->injectionEvents.addFuelEvents(&runningInjectonSignals,
engineConfiguration->injectionMode PASS_ENGINE_PARAMETER);

1
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -51,6 +51,7 @@ RpmCalculator::RpmCalculator() {
revolutionCounterSinceBoot = 0;
lastRpmEventTimeNt = 0;
oneDegreeUs = NAN;
}
/**