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

Good news RPM is now float 

open question if I've affected performance negativelly or not.
This commit is contained in:
Andrey 2022-01-21 00:56:13 -05:00
parent 33df88d3f7
commit 365f2f24f0
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_cycle/main_trigger_callback.cpp
View File

@ -384,7 +384,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp) {
return;
}
int rpm = engine->rpmCalculator.getRpm();
int rpm = engine->rpmCalculator.getCachedRpm();
if (rpm == 0) {
// this happens while we just start cranking

23
firmware/controllers/engine_cycle/rpm_calculator.cpp
View File

@ -45,12 +45,12 @@ float RpmCalculator::getRpmAcceleration() const {
bool RpmCalculator::isStopped() const {
// Spinning-up with zero RPM means that the engine is not ready yet, and is treated as 'stopped'.
return state == STOPPED || (state == SPINNING_UP && rpmValue == 0);
return state == STOPPED || (state == SPINNING_UP && cachedRpmValue == 0);
}
bool RpmCalculator::isCranking() const {
// Spinning-up with non-zero RPM is suitable for all engine math, as good as cranking
return state == CRANKING || (state == SPINNING_UP && rpmValue > 0);
return state == CRANKING || (state == SPINNING_UP && cachedRpmValue > 0);
}
bool RpmCalculator::isSpinningUp() const {
@ -65,9 +65,8 @@ uint32_t RpmCalculator::getRevolutionCounterSinceStart(void) const {
* @return -1 in case of isNoisySignal(), current RPM otherwise
* See NOISY_RPM
*/
// todo: migrate to float return result or add a float version? this would have with calculations
int RpmCalculator::getRpm() const {
return rpmValue;
float RpmCalculator::getCachedRpm() const {
return cachedRpmValue;
}
#if EFI_SHAFT_POSITION_INPUT
@ -105,14 +104,12 @@ bool RpmCalculator::checkIfSpinning(efitick_t nowNt) const {
}
void RpmCalculator::assignRpmValue(float floatRpmValue) {
previousRpmValue = rpmValue;
previousRpmValue = cachedRpmValue;
// Round to the nearest integer RPM - some other parts of the ECU expect integer, so that's what we hand out.
// TODO: RPM should eventually switch to floating point across the ECU
rpmValue = efiRound(floatRpmValue, 1);
cachedRpmValue = floatRpmValue;
setValidValue(floatRpmValue, 0); // 0 for current time since RPM sensor never times out
if (rpmValue <= 0) {
if (cachedRpmValue <= 0) {
oneDegreeUs = NAN;
} else {
// here it's really important to have more precise float RPM value, see #796
@ -131,9 +128,9 @@ void RpmCalculator::setRpmValue(float value) {
assignRpmValue(value);
spinning_state_e oldState = state;
// Change state
if (rpmValue == 0) {
if (cachedRpmValue == 0) {
state = STOPPED;
} else if (rpmValue >= engineConfiguration->cranking.rpm) {
} else if (cachedRpmValue >= engineConfiguration->cranking.rpm) {
if (state != RUNNING) {
// Store the time the engine started
engineStartTimer.reset();
@ -190,7 +187,7 @@ void RpmCalculator::setStopped() {
rpmRate = 0;
if (rpmValue != 0) {
if (cachedRpmValue != 0) {
assignRpmValue(0);
// needed by 'useNoiselessTriggerDecoder'
engine->triggerCentral.noiseFilter.resetAccumSignalData();

16
firmware/controllers/engine_cycle/rpm_calculator.h
View File

@ -37,6 +37,9 @@ typedef enum {
RUNNING,
} spinning_state_e;
/**
* Most consumers should access value via Sensor framework by SensorType::Rpm key
*/
class RpmCalculator : public StoredValueSensor {
public:
RpmCalculator();
@ -77,9 +80,11 @@ public:
void setStopSpinning();
/**
* Just a getter for rpmValue
* Just a quick getter for rpmValue
* Should be same exact value as Sensor::get(SensorType::Rpm).Value just quicker.
* Open question if we have any cases where this opimization is needed.
*/
int getRpm() const;
float getCachedRpm() const;
/**
* This method is invoked once per engine cycle right after we calculate new RPM value
*/
@ -122,10 +127,11 @@ protected:
private:
/**
* Sometimes we cannot afford to call isRunning() and the value is good enough
* Zero if engine is not running
* At this point this value is same exact value as in private m_value variable
* At this point all this is performance optimization?
* Open question is when do we need it for performance reasons.
*/
int rpmValue = 0;
float cachedRpmValue = 0;
/**
* Should be called once we've realized engine is not spinning any more.