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

auto-sync

This commit is contained in:
rusEfi 2016-01-25 12:01:30 -05:00
parent 0169796436
commit d0650ba0e0
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,6 +277,24 @@ void Engine::watchdog() {
#endif
}
void Engine::prepareFuelSchedule(DECLARE_ENGINE_PARAMETER_F) {
int rpm = rpmCalculator.rpmValue;
ENGINE(m.beforeInjectonSch) = GET_TIMESTAMP();
injection_mode_e mode = isCrankingR(rpm) ? CONFIG(crankingInjectionMode) : CONFIG(injectionMode);
ENGINE(engineConfiguration2)->processing->addFuelEvents(
mode PASS_ENGINE_PARAMETER);
ENGINE(m.injectonSchTime) = GET_TIMESTAMP() - ENGINE(m.beforeInjectonSch);
/**
* Swap pointers. This way we are always reading from one instance while adjusting scheduling of another instance.
*/
FuelSchedule * t = ENGINE(engineConfiguration2)->injectionEvents;
ENGINE(engineConfiguration2)->injectionEvents = ENGINE(engineConfiguration2)->processing;
ENGINE(engineConfiguration2)->processing = t;
}
/**
* The idea of this method is to execute all heavy calculations in a lower-priority thread,
@ -307,20 +325,7 @@ void Engine::periodicFastCallback(DECLARE_ENGINE_PARAMETER_F) {
engineState.periodicFastCallback(PASS_ENGINE_PARAMETER_F);
ENGINE(m.beforeInjectonSch) = GET_TIMESTAMP();
injection_mode_e mode = isCrankingR(rpm) ? CONFIG(crankingInjectionMode) : CONFIG(injectionMode);
ENGINE(engineConfiguration2)->processing->addFuelEvents(
mode PASS_ENGINE_PARAMETER);
ENGINE(m.injectonSchTime) = GET_TIMESTAMP() - ENGINE(m.beforeInjectonSch);
/**
* Swap pointers. This way we are always reading from one instance while adjusting scheduling of another instance.
*/
FuelSchedule * t = ENGINE(engineConfiguration2)->injectionEvents;
ENGINE(engineConfiguration2)->injectionEvents = ENGINE(engineConfiguration2)->processing;
ENGINE(engineConfiguration2)->processing = t;
// prepareFuelSchedule(PASS_ENGINE_PARAMETER_F);
}
StartupFuelPumping::StartupFuelPumping() {

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

@ -216,6 +216,8 @@ class Engine {
public:
Engine(persistent_config_s *config);
void init(persistent_config_s *config);
void prepareFuelSchedule(DECLARE_ENGINE_PARAMETER_F);
RpmCalculator rpmCalculator;
persistent_config_s *config;
engine_configuration_s *engineConfiguration;

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

@ -360,6 +360,7 @@ static ALWAYS_INLINE void scheduleIgnitionAndFuelEvents(int rpm, int revolutionI
initializeIgnitionActions(ENGINE(engineState.timingAdvance), ENGINE(engineState.dwellAngle), list PASS_ENGINE_PARAMETER);
engine->m.ignitionSchTime = GET_TIMESTAMP() - engine->m.beforeIgnitionSch;
engine->prepareFuelSchedule(PASS_ENGINE_PARAMETER_F);
}
/**