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 2014-09-11 15:03:00 -05:00
parent 7a2606450d
commit 1de0d3bfcb
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/status_loop.cpp
View File

@ -308,9 +308,9 @@ static void showFuelMap2(float rpm, float engineLoad) {
scheduleMsg(&logger2, "algo=%s", algorithmToString(engineConfiguration->algorithm)); scheduleMsg(&logger2, "algo=%s", algorithmToString(engineConfiguration->algorithm));
if (isCrankingR(rpm)) {
scheduleMsg(&logger2, "cranking fuel: %f", getCrankingFuel()); scheduleMsg(&logger2, "cranking fuel: %f", getCrankingFuel());
} else {
if (engine.rpmCalculator->isRunning()) {
float iatCorrection = getIatCorrection(getIntakeAirTemperature()); float iatCorrection = getIatCorrection(getIntakeAirTemperature());
float cltCorrection = getCltCorrection(getCoolantTemperature()); float cltCorrection = getCltCorrection(getCoolantTemperature());
float injectorLag = getInjectorLag(getVBatt()); float injectorLag = getInjectorLag(getVBatt());

8
firmware/controllers/map_multiplier_thread.cpp
View File

@ -51,10 +51,10 @@ static void maThread(int param) {
chThdSleepMilliseconds(100); chThdSleepMilliseconds(100);
systime_t now = chTimeNow(); systime_t now = chTimeNow();
if (!isRunning()) { //todo? if (!isRunning()) {
timeAtNotRunning = now; // timeAtNotRunning = now;
continue; // continue;
} // }
int wasNotRunningRecently = overflowDiff(now, timeAtNotRunning) < 60 * CH_FREQUENCY; int wasNotRunningRecently = overflowDiff(now, timeAtNotRunning) < 60 * CH_FREQUENCY;
if (!wasNotRunningRecently) if (!wasNotRunningRecently)

4
firmware/controllers/trigger/rpm_calculator.h
View File

@ -59,10 +59,6 @@ uint64_t getLastRpmEventTime(void);
int getRevolutionCounter(void); int getRevolutionCounter(void);
float getCrankshaftAngle(uint64_t timeUs); float getCrankshaftAngle(uint64_t timeUs);
/**
* @return true if engine is running
*/
bool isRunning(void);
bool isValidRpm(int rpm); bool isValidRpm(int rpm);
void addWaveChartEvent(const char *name, const char *msg, const char *msg2); void addWaveChartEvent(const char *name, const char *msg, const char *msg2);