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

fixing NOISY_RPM handling via Sensor framework

This commit is contained in:
Andrey 2022-01-21 00:21:45 -05:00
parent 1bd71e4b2e
commit 33df88d3f7
4 changed files with 3 additions and 8 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; return;
} }
int rpm = GET_RPM(); int rpm = engine->rpmCalculator.getRpm();
if (rpm == 0) { if (rpm == 0) {
// this happens while we just start cranking // this happens while we just start cranking

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

@ -111,12 +111,10 @@ void RpmCalculator::assignRpmValue(float floatRpmValue) {
// TODO: RPM should eventually switch to floating point across the ECU // TODO: RPM should eventually switch to floating point across the ECU
rpmValue = efiRound(floatRpmValue, 1); rpmValue = efiRound(floatRpmValue, 1);
setValidValue(floatRpmValue, 0); // 0 for current time since RPM sensor never times out
if (rpmValue <= 0) { if (rpmValue <= 0) {
oneDegreeUs = NAN; oneDegreeUs = NAN;
setValidValue(0, 0); // 0 for current time since RPM sensor never times out
} else { } else {
setValidValue(floatRpmValue, 0); // 0 for current time since RPM sensor never times out
// here it's really important to have more precise float RPM value, see #796 // here it's really important to have more precise float RPM value, see #796
oneDegreeUs = getOneDegreeTimeUs(floatRpmValue); oneDegreeUs = getOneDegreeTimeUs(floatRpmValue);
if (previousRpmValue == 0) { if (previousRpmValue == 0) {

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

@ -153,9 +153,6 @@ private:
Timer engineStartTimer; Timer engineStartTimer;
}; };
// Just a getter for rpmValue
#define GET_RPM() ( engine->rpmCalculator.getRpm() )
#define isValidRpm(rpm) ((rpm) > 0 && (rpm) < UNREALISTIC_RPM) #define isValidRpm(rpm) ((rpm) > 0 && (rpm) < UNREALISTIC_RPM)
void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, efitick_t edgeTimestamp); void rpmShaftPositionCallback(trigger_event_e ckpSignalType, uint32_t index, efitick_t edgeTimestamp);

2
unit_tests/tests/trigger/test_cam_vvt_input.cpp
View File

@ -72,7 +72,7 @@ TEST(trigger, testNoisyInput) {
eth.firePrimaryTriggerRise(); eth.firePrimaryTriggerRise();
eth.firePrimaryTriggerFall(); eth.firePrimaryTriggerFall();
// error condition since events happened too quick while time does not move // error condition since events happened too quick while time does not move
ASSERT_EQ(NOISY_RPM, GET_RPM()) << "testNoisyInput RPM should be noisy"; ASSERT_EQ(NOISY_RPM, Sensor::getOrZero(SensorType::Rpm)) << "testNoisyInput RPM should be noisy";
ASSERT_EQ( 2, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testNoisyInput"; ASSERT_EQ( 2, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testNoisyInput";
ASSERT_EQ(CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarnings.get(0)) << "@0"; ASSERT_EQ(CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarnings.get(0)) << "@0";