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

fixing

This commit is contained in:
Matthew Kennedy 2020-07-28 12:11:56 -07:00
parent 2289c465b5
commit 53b864bdda
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/algo/fuel_math.cpp
View File

@ -201,7 +201,8 @@ floatms_t getBaseFuel(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
if ((CONFIG(fuelAlgorithm) == LM_SPEED_DENSITY) || if ((CONFIG(fuelAlgorithm) == LM_SPEED_DENSITY) ||
(engineConfiguration->fuelAlgorithm == LM_REAL_MAF) || (engineConfiguration->fuelAlgorithm == LM_REAL_MAF) ||
(engineConfiguration->fuelAlgorithm == LM_ALPHA_N_2)) { (engineConfiguration->fuelAlgorithm == LM_ALPHA_N_2) ||
(engineConfiguration->fuelAlgorithm == LM_MOCK)) {
// airmass modes - get airmass first, then convert to fuel // airmass modes - get airmass first, then convert to fuel
auto model = getAirmassModel(PASS_ENGINE_PARAMETER_SIGNATURE); auto model = getAirmassModel(PASS_ENGINE_PARAMETER_SIGNATURE);
efiAssert(CUSTOM_ERR_ASSERT, model != nullptr, "Invalid airmass mode", 0.0f); efiAssert(CUSTOM_ERR_ASSERT, model != nullptr, "Invalid airmass mode", 0.0f);

7
unit_tests/mocks.h
View File

@ -1,7 +1,10 @@
#pragma once
#include "electronic_throttle.h" #include "electronic_throttle.h"
#include "dc_motor.h" #include "dc_motor.h"
#include "table_helper.h" #include "table_helper.h"
#include "pwm_generator_logic.h" #include "pwm_generator_logic.h"
#include "airmass.h"
#include "gmock/gmock.h" #include "gmock/gmock.h"
@ -55,5 +58,9 @@ public:
class MockAirmass : public AirmassModelBase { class MockAirmass : public AirmassModelBase {
public: public:
MockAirmass() : AirmassModelBase(veTable) {}
MockVp3d veTable;
MOCK_METHOD(AirmassResult, getAirmass, (int rpm), (override)); MOCK_METHOD(AirmassResult, getAirmass, (int rpm), (override));
}; };