minor simplification to TableFunc template params

FOME-Tech · Sep 26, 2024 · 2c7a902 · 2c7a902
1 parent 0f1843f
commit 2c7a902
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/firmware/controllers/sensors/converters/table_func.h b/firmware/controllers/sensors/converters/table_func.h
@@ -11,7 +11,7 @@
 
 #include <rusefi/interpolation.h>
 
-template <class TBin, class TValue, int TSize, typename TOutputScale = efi::ratio<1>>
+template <class TBin, class TValue, size_t TSize>
 class TableFunc final : public SensorConverter {
 public:
 	TableFunc(TBin (&bins)[TSize], TValue (&values)[TSize])
@@ -21,7 +21,7 @@ class TableFunc final : public SensorConverter {
 	}
 
 	SensorResult convert(float inputValue) const override {
-		return interpolate2d(inputValue, m_bins, m_values) * TOutputScale::asFloat();
+		return interpolate2d(inputValue, m_bins, m_values);
 	}
 
 	void showInfo(float /*testInputValue*/) const override { }

diff --git a/firmware/init/sensor/init_fuel_level.cpp b/firmware/init/sensor/init_fuel_level.cpp
@@ -12,11 +12,7 @@ static FunctionalSensor fuelSensor(SensorType::FuelLevel, /* timeout = */ MS2NT(
 using BinType = std::remove_extent_t<decltype(config->fuelLevelBins)>;
 using ValueType = std::remove_extent_t<decltype(config->fuelLevelValues)>;
 
-static TableFunc
-	<BinType, ValueType, FUEL_LEVEL_TABLE_COUNT,
-		// Values are stored in percent
-		efi::ratio<1>>
-			fuelCurve(config->fuelLevelBins, config->fuelLevelValues);
+static TableFunc fuelCurve(config->fuelLevelBins, config->fuelLevelValues);
 
 void initFuelLevel() {
 	adc_channel_e channel = engineConfiguration->fuelLevelSensor;

diff --git a/unit_tests/tests/sensor/table_func.cpp b/unit_tests/tests/sensor/table_func.cpp
@@ -14,18 +14,3 @@ TEST(TableFuncTest, basic) {
 	EXPECT_EQ(40, dut.convert(10).value_or(0));
 	EXPECT_EQ(40, dut.convert(20).value_or(0));
 }
-
-TEST(TableFuncTest, scaled) {
-	scaled_channel<uint16_t, 1000> in[] = { 0, 1, 2 };
-	uint8_t out[] = { 70, 60, 50 };
-
-	using BinType = std::remove_extent_t<decltype(in)>;
-
-	TableFunc<BinType, uint8_t, 3,
-		// output units are 1/100
-		efi::ratio<1, 100>>
-			dut(in, out);
-
-	EXPECT_EQ(0.65f, dut.convert(0.5f).value_or(0));
-	EXPECT_EQ(0.55f, dut.convert(1.5f).value_or(0));
-}