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

refactoring

This commit is contained in:
rusefillc 2021-10-16 23:17:45 -04:00
parent 6e67697284
commit 296f83ea4d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/controllers/algo/airmass/speed_density_airmass.cpp
View File

@ -34,13 +34,17 @@ AirmassResult SpeedDensityAirmass::getAirmass(int rpm) {
} }
float SpeedDensityAirmass::getMap(int rpm) const { float SpeedDensityAirmass::getMap(int rpm) const {
float fallbackMap; SensorResult map = Sensor::get(SensorType::Map);
if (CONFIG(enableMapEstimationTableFallback)) { if (map) {
// if the map estimation table is enabled, estimate map based on the TPS and RPM return map.Value;
fallbackMap = m_mapEstimationTable->getValue(rpm, TPS_2_BYTE_PACKING_MULT * Sensor::getOrZero(SensorType::Tps1));
} else { } else {
fallbackMap = CONFIG(failedMapFallback); float fallbackMap;
} if (CONFIG(enableMapEstimationTableFallback)) {
// if the map estimation table is enabled, estimate map based on the TPS and RPM
fallbackMap = m_mapEstimationTable->getValue(rpm, TPS_2_BYTE_PACKING_MULT * Sensor::getOrZero(SensorType::Tps1));
} else {
fallbackMap = CONFIG(failedMapFallback);
}
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
if (CONFIG(debugMode) == DBG_MAP) { if (CONFIG(debugMode) == DBG_MAP) {
@ -48,5 +52,6 @@ float SpeedDensityAirmass::getMap(int rpm) const {
} }
#endif // EFI_TUNER_STUDIO #endif // EFI_TUNER_STUDIO
return Sensor::get(SensorType::Map).value_or(fallbackMap); return fallbackMap;
}
} }