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

not const getAirmass (#2883) 

* not const

* test
This commit is contained in:
Matthew Kennedy 2021-06-30 21:05:42 -07:00 committed by GitHub
parent 942f23a6b3
commit c171d5f1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/airmass/airmass.h
View File

@ -10,7 +10,7 @@ struct AirmassResult {
}; };
struct AirmassModelBase { struct AirmassModelBase {
virtual AirmassResult getAirmass(int rpm) const = 0; virtual AirmassResult getAirmass(int rpm) = 0;
}; };
class AirmassVeModelBase : public AirmassModelBase { class AirmassVeModelBase : public AirmassModelBase {

2
firmware/controllers/algo/airmass/alphan_airmass.cpp
View File

@ -1,7 +1,7 @@
#include "alphan_airmass.h" #include "alphan_airmass.h"
#include "sensor.h" #include "sensor.h"
AirmassResult AlphaNAirmass::getAirmass(int rpm) const { AirmassResult AlphaNAirmass::getAirmass(int rpm) {
auto tps = Sensor::get(SensorType::Tps1); auto tps = Sensor::get(SensorType::Tps1);
if (!tps.Valid) { if (!tps.Valid) {

2
firmware/controllers/algo/airmass/alphan_airmass.h
View File

@ -6,5 +6,5 @@ class AlphaNAirmass : public SpeedDensityBase {
public: public:
explicit AlphaNAirmass(const ValueProvider3D& veTable) : SpeedDensityBase(veTable) {} explicit AlphaNAirmass(const ValueProvider3D& veTable) : SpeedDensityBase(veTable) {}
AirmassResult getAirmass(int rpm) const override; AirmassResult getAirmass(int rpm) override;
}; };

2
firmware/controllers/algo/airmass/maf_airmass.cpp
View File

@ -5,7 +5,7 @@
EXTERN_ENGINE; EXTERN_ENGINE;
AirmassResult MafAirmass::getAirmass(int rpm) const { AirmassResult MafAirmass::getAirmass(int rpm) {
float maf = Sensor::get(SensorType::Maf).value_or(0) + engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_SIGNATURE); float maf = Sensor::get(SensorType::Maf).value_or(0) + engine->engineLoadAccelEnrichment.getEngineLoadEnrichment(PASS_ENGINE_PARAMETER_SIGNATURE);
return getAirmassImpl(maf, rpm); return getAirmassImpl(maf, rpm);
} }

2
firmware/controllers/algo/airmass/maf_airmass.h
View File

@ -6,7 +6,7 @@ class MafAirmass final : public AirmassVeModelBase {
public: public:
explicit MafAirmass(const ValueProvider3D& veTable) : AirmassVeModelBase(veTable) {} explicit MafAirmass(const ValueProvider3D& veTable) : AirmassVeModelBase(veTable) {}
AirmassResult getAirmass(int rpm) const override; AirmassResult getAirmass(int rpm) override;
// Compute airmass based on flow & engine speed // Compute airmass based on flow & engine speed
AirmassResult getAirmassImpl(float massAirFlow, int rpm) const; AirmassResult getAirmassImpl(float massAirFlow, int rpm) const;

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

@ -5,7 +5,7 @@
EXTERN_ENGINE; EXTERN_ENGINE;
AirmassResult SpeedDensityAirmass::getAirmass(int rpm) const { AirmassResult SpeedDensityAirmass::getAirmass(int rpm) {
ScopePerf perf(PE::GetSpeedDensityFuel); ScopePerf perf(PE::GetSpeedDensityFuel);
/** /**

2
firmware/controllers/algo/airmass/speed_density_airmass.h
View File

@ -9,7 +9,7 @@ public:
, m_mapEstimationTable(&mapEstimationTable) , m_mapEstimationTable(&mapEstimationTable)
{} {}
AirmassResult getAirmass(int rpm) const override; AirmassResult getAirmass(int rpm) override;
float getMap(int rpm) const; float getMap(int rpm) const;

2
unit_tests/mocks.h
View File

@ -65,7 +65,7 @@ public:
MockVp3d veTable; MockVp3d veTable;
MOCK_METHOD(AirmassResult, getAirmass, (int rpm), (const, override)); MOCK_METHOD(AirmassResult, getAirmass, (int rpm), (override));
}; };
class MockInjectorModel2 : public IInjectorModel { class MockInjectorModel2 : public IInjectorModel {

2
unit_tests/tests/ignition_injection/test_fuel_math.cpp
View File

@ -115,7 +115,7 @@ TEST(AirmassModes, VeOverride) {
struct DummyAirmassModel : public AirmassVeModelBase { struct DummyAirmassModel : public AirmassVeModelBase {
DummyAirmassModel(const ValueProvider3D& veTable) : AirmassVeModelBase(veTable) {} DummyAirmassModel(const ValueProvider3D& veTable) : AirmassVeModelBase(veTable) {}
AirmassResult getAirmass(int rpm) const override { AirmassResult getAirmass(int rpm) override {
// Default load value 10, will be overriden // Default load value 10, will be overriden
getVe(rpm, 10.0f); getVe(rpm, 10.0f);