From d63f1af40d0ae0c1898c98b7a6b99d7acb5f45cf Mon Sep 17 00:00:00 2001
From: rusefillc <48498823+rusefillc@users.noreply.github.com>
Date: Sat, 26 Nov 2022 11:23:54 -0500
Subject: [PATCH] without ValueProvider3D interface how do we mock? (#4829)

Co-authored-by: rusefillc <sdfsdfqsf2334234234>
---
 firmware/controllers/algo/fuel/fuel_computer.cpp    | 11 ++++++-----
 firmware/controllers/algo/fuel/fuel_computer.h      |  5 -----
 firmware/controllers/algo/fuel_math.cpp             |  3 +--
 firmware/controllers/math/speed_density.cpp         |  3 ---
 .../tests/ignition_injection/test_fuel_computer.cpp | 13 +------------
 5 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/firmware/controllers/algo/fuel/fuel_computer.cpp b/firmware/controllers/algo/fuel/fuel_computer.cpp
index 978ee94915..526c745628 100644
--- a/firmware/controllers/algo/fuel/fuel_computer.cpp
+++ b/firmware/controllers/algo/fuel/fuel_computer.cpp
@@ -23,8 +23,6 @@ mass_t FuelComputerBase::getCycleFuel(mass_t airmass, int rpm, float load) {
 	return airmass / afr;
 }
 
-FuelComputer::FuelComputer(const ValueProvider3D& lambdaTable) : m_lambdaTable(&lambdaTable) {}
-
 float FuelComputer::getStoichiometricRatio() const {
 	float primary = engineConfiguration->stoichRatioPrimary;
 
@@ -57,10 +55,13 @@ float FuelComputer::getStoichiometricRatio() const {
 	return interpolateClamped(0, primary, 100, secondary, flex.Value);
 }
 
-float FuelComputer::getTargetLambda(int rpm, float load) const {
-	efiAssert(OBD_PCM_Processor_Fault, m_lambdaTable != nullptr, "AFR table null", 0);
 
-	return m_lambdaTable->getValue(rpm, load);
+float FuelComputer::getTargetLambda(int rpm, float load) const {
+	return interpolate3d(
+		config->lambdaTable,
+		config->lambdaLoadBins, load,
+		config->lambdaRpmBins, rpm
+	);
 }
 
 float FuelComputer::getTargetLambdaLoadAxis(float defaultLoad) const {
diff --git a/firmware/controllers/algo/fuel/fuel_computer.h b/firmware/controllers/algo/fuel/fuel_computer.h
index dbf279eb44..59d65e75c4 100644
--- a/firmware/controllers/algo/fuel/fuel_computer.h
+++ b/firmware/controllers/algo/fuel/fuel_computer.h
@@ -30,14 +30,9 @@ public:
 // This class is a usable implementation of a fuel model that reads real configuration
 class FuelComputer final : public FuelComputerBase {
 public:
-	FuelComputer(const ValueProvider3D& lambdaTable);
-
 	float getStoichiometricRatio() const override;
 	float getTargetLambda(int rpm, float load) const override;
 	float getTargetLambdaLoadAxis(float defaultLoad) const override;
-
-private:
-	const ValueProvider3D* const m_lambdaTable;
 };
 
 float getLoadOverride(float defaultLoad, load_override_e overrideMode);
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 015b1e342d..c2793fe634 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -35,7 +35,6 @@
 #include "lua_hooks.h"
 
 extern fuel_Map3D_t veMap;
-extern lambda_Map3D_t lambdaMap;
 static mapEstimate_Map3D_t mapEstimationTable;
 
 #if EFI_ENGINE_CONTROL
@@ -331,7 +330,7 @@ float getInjectionMass(int rpm) {
 #endif
 }
 
-static FuelComputer fuelComputer(lambdaMap);
+static FuelComputer fuelComputer;
 
 /**
  * @brief	Initialize fuel map data structure
diff --git a/firmware/controllers/math/speed_density.cpp b/firmware/controllers/math/speed_density.cpp
index 8069bdbe0c..a1d5fb1a6e 100644
--- a/firmware/controllers/math/speed_density.cpp
+++ b/firmware/controllers/math/speed_density.cpp
@@ -26,7 +26,6 @@
 #define rpmMax 8000
 
 fuel_Map3D_t veMap;
-lambda_Map3D_t lambdaMap;
 
 #define tpMin 0
 #define tpMax 100
@@ -119,6 +118,4 @@ temperature_t IFuelComputer::getTCharge(int rpm, float tps) {
 
 void initSpeedDensity() {
 	veMap.init(config->veTable, config->veLoadBins, config->veRpmBins);
-//	ve2Map.init(engineConfiguration->ve2Table, engineConfiguration->ve2LoadBins, engineConfiguration->ve2RpmBins);
-	lambdaMap.init(config->lambdaTable, config->lambdaLoadBins, config->lambdaRpmBins);
 }
diff --git a/unit_tests/tests/ignition_injection/test_fuel_computer.cpp b/unit_tests/tests/ignition_injection/test_fuel_computer.cpp
index fd3d751ea7..a22c971269 100644
--- a/unit_tests/tests/ignition_injection/test_fuel_computer.cpp
+++ b/unit_tests/tests/ignition_injection/test_fuel_computer.cpp
@@ -29,21 +29,10 @@ TEST(FuelComputer, getCycleFuel) {
 	EXPECT_FLOAT_EQ(result, 7.0f / (5 * 3));
 }
 
-TEST(FuelComputer, LambdaLookup) {
-	MockVp3d lambdaTable;
-	FuelComputer dut(lambdaTable);
-
-	EXPECT_CALL(lambdaTable, getValue(1500, FloatEq(0.7f)))
-		.WillOnce(Return(0.85f));
-
-	EXPECT_FLOAT_EQ(dut.getTargetLambda(1500, 0.7f), 0.85f);
-}
-
 TEST(FuelComputer, FlexFuel) {
 	EngineTestHelper eth(TEST_ENGINE);
 
-	MockVp3d lambdaTable;
-	FuelComputer dut(lambdaTable);
+	FuelComputer dut;
 
 	// easier values for testing
 	engineConfiguration->stoichRatioPrimary = 15;