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-11-11 13:06:07 -06:00
parent 2ce4e928b4
commit 5f7ed9c6a0
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ RpmCalculator::RpmCalculator() {
#if !EFI_PROD_CODE
mockRpm = MOCK_UNDEFINED;
#endif
rpmValue = 0;
setRpmValue(0);
// we need this initial to have not_running at first invocation
lastRpmEventTimeNt = (uint64_t) -10 * US2NT(US_PER_SECOND_LL);
@ -75,6 +75,15 @@ bool RpmCalculator::isRunning(void) {
return nowNt - lastRpmEventTimeNt < US2NT(US_PER_SECOND);
}
void RpmCalculator::setRpmValue(int value) {
rpmValue = value;
// if (rpmValue <= 0) {
// oneDegreeUs = NAN;
// } else {
// oneDegreeUs = getOneDegreeTimeUs(rpmValue);
// }
}
void RpmCalculator::onNewEngineCycle() {
revolutionCounterSinceBoot++;
revolutionCounterSinceStart++;
@ -154,11 +163,11 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, Rpm
*
*/
if (diffNt == 0) {
rpmState->rpmValue = NOISY_RPM;
rpmState->setRpmValue(NOISY_RPM);
} else {
// todo: interesting what is this *2 about? four stroke magic constant?
int rpm = (int) (60 * US2NT(US_PER_SECOND_LL) * 2 / diffNt);
rpmState->rpmValue = rpm > UNREALISTIC_RPM ? NOISY_RPM : rpm;
rpmState->setRpmValue(rpm > UNREALISTIC_RPM ? NOISY_RPM : rpm);
}
}
rpmState->lastRpmEventTimeNt = nowNt;

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

@ -32,8 +32,13 @@ public:
int rpm(void);
void onNewEngineCycle();
uint32_t getRevolutionCounter(void);
void setRpmValue(int value);
uint32_t getRevolutionCounterSinceStart(void);
volatile int rpmValue;
/**
* This is a performance optimization: let's pre-calulate this each time RPM changes
*/
// volatile float oneDegreeUs;
volatile uint64_t lastRpmEventTimeNt;
private:
/**