From c171d5f1d3ca8a9525c74809bea07fc8c8fb0516 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 30 Jun 2021 21:05:42 -0700 Subject: [PATCH] not const getAirmass (#2883) * not const * test --- firmware/controllers/algo/airmass/airmass.h | 2 +- firmware/controllers/algo/airmass/alphan_airmass.cpp | 2 +- firmware/controllers/algo/airmass/alphan_airmass.h | 2 +- firmware/controllers/algo/airmass/maf_airmass.cpp | 2 +- firmware/controllers/algo/airmass/maf_airmass.h | 2 +- firmware/controllers/algo/airmass/speed_density_airmass.cpp | 2 +- firmware/controllers/algo/airmass/speed_density_airmass.h | 2 +- unit_tests/mocks.h | 2 +- unit_tests/tests/ignition_injection/test_fuel_math.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/airmass/airmass.h b/firmware/controllers/algo/airmass/airmass.h index 18e987e13c..bf6791ef17 100644 --- a/firmware/controllers/algo/airmass/airmass.h +++ b/firmware/controllers/algo/airmass/airmass.h @@ -10,7 +10,7 @@ struct AirmassResult { }; struct AirmassModelBase { - virtual AirmassResult getAirmass(int rpm) const = 0; + virtual AirmassResult getAirmass(int rpm) = 0; }; class AirmassVeModelBase : public AirmassModelBase { diff --git a/firmware/controllers/algo/airmass/alphan_airmass.cpp b/firmware/controllers/algo/airmass/alphan_airmass.cpp index f3257c9fad..fb5869493f 100644 --- a/firmware/controllers/algo/airmass/alphan_airmass.cpp +++ b/firmware/controllers/algo/airmass/alphan_airmass.cpp @@ -1,7 +1,7 @@ #include "alphan_airmass.h" #include "sensor.h" -AirmassResult AlphaNAirmass::getAirmass(int rpm) const { +AirmassResult AlphaNAirmass::getAirmass(int rpm) { auto tps = Sensor::get(SensorType::Tps1); if (!tps.Valid) { diff --git a/firmware/controllers/algo/airmass/alphan_airmass.h b/firmware/controllers/algo/airmass/alphan_airmass.h index c3b49bd18d..416b5eaa5f 100644 --- a/firmware/controllers/algo/airmass/alphan_airmass.h +++ b/firmware/controllers/algo/airmass/alphan_airmass.h @@ -6,5 +6,5 @@ class AlphaNAirmass : public SpeedDensityBase { public: explicit AlphaNAirmass(const ValueProvider3D& veTable) : SpeedDensityBase(veTable) {} - AirmassResult getAirmass(int rpm) const override; + AirmassResult getAirmass(int rpm) override; }; diff --git a/firmware/controllers/algo/airmass/maf_airmass.cpp b/firmware/controllers/algo/airmass/maf_airmass.cpp index 8205e52796..42a6c6a09c 100644 --- a/firmware/controllers/algo/airmass/maf_airmass.cpp +++ b/firmware/controllers/algo/airmass/maf_airmass.cpp @@ -5,7 +5,7 @@ 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); return getAirmassImpl(maf, rpm); } diff --git a/firmware/controllers/algo/airmass/maf_airmass.h b/firmware/controllers/algo/airmass/maf_airmass.h index e98ed06bb5..f74a12c30c 100644 --- a/firmware/controllers/algo/airmass/maf_airmass.h +++ b/firmware/controllers/algo/airmass/maf_airmass.h @@ -6,7 +6,7 @@ class MafAirmass final : public AirmassVeModelBase { public: 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 AirmassResult getAirmassImpl(float massAirFlow, int rpm) const; diff --git a/firmware/controllers/algo/airmass/speed_density_airmass.cpp b/firmware/controllers/algo/airmass/speed_density_airmass.cpp index 056ffa25cf..786fbb06da 100644 --- a/firmware/controllers/algo/airmass/speed_density_airmass.cpp +++ b/firmware/controllers/algo/airmass/speed_density_airmass.cpp @@ -5,7 +5,7 @@ EXTERN_ENGINE; -AirmassResult SpeedDensityAirmass::getAirmass(int rpm) const { +AirmassResult SpeedDensityAirmass::getAirmass(int rpm) { ScopePerf perf(PE::GetSpeedDensityFuel); /** diff --git a/firmware/controllers/algo/airmass/speed_density_airmass.h b/firmware/controllers/algo/airmass/speed_density_airmass.h index b9fd2ea3fc..2ccee63630 100644 --- a/firmware/controllers/algo/airmass/speed_density_airmass.h +++ b/firmware/controllers/algo/airmass/speed_density_airmass.h @@ -9,7 +9,7 @@ public: , m_mapEstimationTable(&mapEstimationTable) {} - AirmassResult getAirmass(int rpm) const override; + AirmassResult getAirmass(int rpm) override; float getMap(int rpm) const; diff --git a/unit_tests/mocks.h b/unit_tests/mocks.h index 3ce577b6f3..3e5a9f8be5 100644 --- a/unit_tests/mocks.h +++ b/unit_tests/mocks.h @@ -65,7 +65,7 @@ public: MockVp3d veTable; - MOCK_METHOD(AirmassResult, getAirmass, (int rpm), (const, override)); + MOCK_METHOD(AirmassResult, getAirmass, (int rpm), (override)); }; class MockInjectorModel2 : public IInjectorModel { diff --git a/unit_tests/tests/ignition_injection/test_fuel_math.cpp b/unit_tests/tests/ignition_injection/test_fuel_math.cpp index b5b336ae60..d583922a06 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_math.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_math.cpp @@ -115,7 +115,7 @@ TEST(AirmassModes, VeOverride) { struct DummyAirmassModel : public AirmassVeModelBase { DummyAirmassModel(const ValueProvider3D& veTable) : AirmassVeModelBase(veTable) {} - AirmassResult getAirmass(int rpm) const override { + AirmassResult getAirmass(int rpm) override { // Default load value 10, will be overriden getVe(rpm, 10.0f);