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

auto-sync

This commit is contained in:
rusEfi 2014-11-24 09:03:19 -06:00
parent f053b9b18e
commit 1323b5b51a
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,15 +36,6 @@ extern WaveChart waveChart;
#define TOP_DEAD_CENTER_MESSAGE "r"
/**
* WARNING: this is a heavy method because 'getRpm()' is relatively heavy
*
* @return -1 in case of isNoisySignal(), current RPM otherwise
*/
int getRpmE(Engine *engine) {
return engine->rpmCalculator.rpm();
}
EXTERN_ENGINE;
#if EFI_PROD_CODE || EFI_SIMULATOR
@ -96,6 +87,11 @@ uint32_t RpmCalculator::getRevolutionCounterSinceStart(void) {
return revolutionCounterSinceStart;
}
/**
* WARNING: this is a heavy method because 'getRpm()' is relatively heavy
*
* @return -1 in case of isNoisySignal(), current RPM otherwise
*/
// todo: migrate to float return result or add a float verion? this would have with calculations
// todo: add a version which does not check time & saves time? need to profile
int RpmCalculator::rpm(void) {

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

@ -59,7 +59,8 @@ private:
/**
* @brief Current RPM
*/
int getRpmE(Engine *engine);
#define getRpmE(engine) (engine)->rpmCalculator.rpm()
bool isCrankingE(Engine *engine);
void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, Engine *engine);
/**

2
firmware/rusefi.cpp
View File

@ -270,5 +270,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array
return 20141123;
return 20141124;
}