diff --git a/firmware/config/engines/GY6_139QMB.cpp b/firmware/config/engines/GY6_139QMB.cpp
index de6750edb2..77093b272c 100644
--- a/firmware/config/engines/GY6_139QMB.cpp
+++ b/firmware/config/engines/GY6_139QMB.cpp
@@ -21,9 +21,6 @@
EXTERN_CONFIG;
static void setDefault139qmbMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-
- setFuelLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(1000, 11000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(1000, 11000 PASS_CONFIG_PARAMETER_SUFFIX);
}
diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp
index 070135a49d..a95e25e619 100644
--- a/firmware/config/engines/citroenBerlingoTU3JP.cpp
+++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp
@@ -75,8 +75,6 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
* Algorithm Alpha-N setting
*/
setAlgorithm(LM_ALPHA_N_2 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
/**
diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp
index 6af8c86960..49a266e3c7 100644
--- a/firmware/config/engines/dodge_neon.cpp
+++ b/firmware/config/engines/dodge_neon.cpp
@@ -134,8 +134,6 @@ void setDodgeNeon1995EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
* that's 1995 config
*/
- // set_whole_fuel_map 9
- setWholeFuelMap(9 PASS_CONFIG_PARAMETER_SUFFIX);
setWholeTimingTable_d(12 PASS_CONFIG_PARAMETER_SUFFIX);
// set cranking_injection_mode 0
@@ -234,9 +232,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
* 88C
* fuel 2.8
*
- * set_whole_fuel_map 12
*/
- //setWholeFuelMap(12 PASS_CONFIG_PARAMETER_SUFFIX);
//setWholeTimingTable_d(12 PASS_CONFIG_PARAMETER_SUFFIX);
#if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
MEMCPY(config->ignitionTable, fromODB);
@@ -259,7 +255,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
*/
engineConfiguration->injector.flow = 199;
- setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX);
setLinearCurve(config->ignitionLoadBins, 20, 120, 1);
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/config/engines/dodge_ram.cpp b/firmware/config/engines/dodge_ram.cpp
index e7b9c40ac8..fd53eb5ad0 100644
--- a/firmware/config/engines/dodge_ram.cpp
+++ b/firmware/config/engines/dodge_ram.cpp
@@ -27,9 +27,6 @@ void setDodgeRam1996(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// set cranking_charge_angle 30
engineConfiguration->crankingChargeAngle = 30;
- // set_whole_fuel_map 6
- setWholeFuelMap(6 PASS_CONFIG_PARAMETER_SUFFIX);
-
//Base engine setting
engineConfiguration->specs.cylindersCount = 8;
engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2;
diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp
index d8f4543d18..9d0277b10f 100644
--- a/firmware/config/engines/ford_aspire.cpp
+++ b/firmware/config/engines/ford_aspire.cpp
@@ -43,9 +43,6 @@ static const ignition_table_t default_aspire_timing_table = {
EXTERN_CONFIG;
static void setDefaultAspireMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-
- setFuelLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp
index eeb1b29558..6429b3354e 100644
--- a/firmware/config/engines/ford_festiva.cpp
+++ b/firmware/config/engines/ford_festiva.cpp
@@ -82,9 +82,6 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->specs.displacement = 1.839;
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
-
static const float veRpmBins[] =
{
800,
@@ -155,8 +152,6 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setLinearCurve(config->ignitionLoadBins, 20, 105, 5);
setWholeTimingTable_d(10 PASS_CONFIG_PARAMETER_SUFFIX);
- // set_whole_fuel_map 5
- setWholeFuelMap(5 PASS_CONFIG_PARAMETER_SUFFIX);
setAfrMap(config->afrTable, 13.5);
setSingleCoilDwell(PASS_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp
index 9ef41adee8..620ec0ddf9 100644
--- a/firmware/config/engines/honda_600.cpp
+++ b/firmware/config/engines/honda_600.cpp
@@ -37,9 +37,6 @@ static const ignition_table_t default_custom_timing_table = {
EXTERN_CONFIG;
static void setDefaultCustomMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
-
- setFuelLoadBin(0,100 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(0, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingLoadBin(0,100 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(0,7000 PASS_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/config/engines/honda_accord.cpp b/firmware/config/engines/honda_accord.cpp
index c134720abe..b23a226925 100644
--- a/firmware/config/engines/honda_accord.cpp
+++ b/firmware/config/engines/honda_accord.cpp
@@ -57,7 +57,6 @@ static void setHondaAccordConfigurationCommon(DECLARE_CONFIG_PARAMETER_SIGNATURE
engineConfiguration->injector.flow = 248;
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX);
buildTimingMap(35 PASS_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp
index 655b02e54b..eba7ed5006 100644
--- a/firmware/config/engines/mazda_626.cpp
+++ b/firmware/config/engines/mazda_626.cpp
@@ -62,10 +62,6 @@ void setMazda626EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->tpsMax = 764;
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelLoadBin(0, 100 PASS_CONFIG_PARAMETER_SUFFIX);
-
- // set_whole_fuel_map 9
- setWholeFuelMap(9 PASS_CONFIG_PARAMETER_SUFFIX);
// set_whole_timing_map 10
setWholeTimingTable_d(10 PASS_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp
index 376a1db0a9..8c8294f7b4 100644
--- a/firmware/config/engines/mazda_miata.cpp
+++ b/firmware/config/engines/mazda_miata.cpp
@@ -92,8 +92,6 @@ static void commonMiataNa(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
- setFuelLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
engineConfiguration->idle.solenoidFrequency = 160;
diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp
index 5d61b5470e..9a545ea134 100644
--- a/firmware/config/engines/mazda_miata_1_6.cpp
+++ b/firmware/config/engines/mazda_miata_1_6.cpp
@@ -136,8 +136,6 @@ static void setMiataNA6_settings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setVeTable(PASS_CONFIG_PARAMETER_SIGNATURE);
- setWholeFuelMap(6 PASS_CONFIG_PARAMETER_SUFFIX);
-
engineConfiguration->idleMode = IM_AUTO;
// below 20% this valve seems to be opening for fail-safe idle air
engineConfiguration->idleRpmPid.minValue = 20;
diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp
index c1912a7a6d..44ddcacac4 100644
--- a/firmware/config/engines/mazda_miata_nb.cpp
+++ b/firmware/config/engines/mazda_miata_nb.cpp
@@ -73,10 +73,6 @@ void setMazdaMiataNb1EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->clutchDownPin = GPIO_UNASSIGNED;
- // set_whole_fuel_map 3
- setWholeFuelMap(3 PASS_CONFIG_PARAMETER_SUFFIX);
-
-
// 10 deg before TDC is default timing
// VICS solenoid
diff --git a/firmware/config/engines/mitsubishi.cpp b/firmware/config/engines/mitsubishi.cpp
index b01db61cb1..8d89d69801 100644
--- a/firmware/config/engines/mitsubishi.cpp
+++ b/firmware/config/engines/mitsubishi.cpp
@@ -40,9 +40,6 @@ void setMitsubishiConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// set cranking_timing_angle 715
engineConfiguration->crankingTimingAngle = -715;
- // set_whole_fuel_map 3
- setWholeFuelMap(3 PASS_CONFIG_PARAMETER_SUFFIX);
-
// /**
// * 29150 Ohm @ 40C
// * 10160 Ohm @ 70C
diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp
index 15b4c30580..e2e3eeae3c 100644
--- a/firmware/config/engines/rover_v8.cpp
+++ b/firmware/config/engines/rover_v8.cpp
@@ -48,9 +48,6 @@ void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// set_cranking_rpm 350
engineConfiguration->cranking.rpm = 350;
- // set_whole_fuel_map 3
- setWholeFuelMap(3 PASS_CONFIG_PARAMETER_SUFFIX);
-
// set cranking_injection_mode 0
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
// set injection_mode 1
diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp
index a47e3ad9fb..4d6021c0af 100644
--- a/firmware/config/engines/sachs.cpp
+++ b/firmware/config/engines/sachs.cpp
@@ -83,7 +83,6 @@ void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->fuelPumpPin = GPIOE_6;
// todo: extract a method? figure out something smarter
- setFuelRpmBin(800, 15000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(800, 15000 PASS_CONFIG_PARAMETER_SUFFIX);
setLinearCurve(config->veRpmBins, 15000, 7000, 1);
setLinearCurve(config->afrRpmBins, 15000, 7000, 1);
diff --git a/firmware/config/engines/vw.cpp b/firmware/config/engines/vw.cpp
index 300d223ed2..690f947521 100644
--- a/firmware/config/engines/vw.cpp
+++ b/firmware/config/engines/vw.cpp
@@ -25,9 +25,6 @@ void setVwAba(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->isCylinderCleanupEnabled = true;
- // set_whole_fuel_map 12
- setWholeFuelMap(12 PASS_CONFIG_PARAMETER_SUFFIX);
-
// set global_trigger_offset_angle 93
engineConfiguration->globalTriggerAngleOffset = 93;
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 216b39516a..93961c6972 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -145,21 +145,6 @@ void printTsStats(void) {
#endif /* EFI_PROD_CODE */
printErrorCounters();
-
-// scheduleMsg(logger, "analogChartFrequency %d",
-// (int) (&engineConfiguration->analogChartFrequency) - (int) engineConfiguration);
-//
-// int fuelMapOffset = (int) (&engineConfiguration->fuelTable) - (int) engineConfiguration;
-// scheduleMsg(logger, "fuelTable %d", fuelMapOffset);
-//
-// int offset = (int) (&CONFIG(hip9011Gain)) - (int) engineConfiguration;
-// scheduleMsg(&tsLogger, "hip9011Gain %d", offset);
-//
-// offset = (int) (&engineConfiguration->crankingCycleBins) - (int) engineConfiguration;
-// scheduleMsg(&tsLogger, "crankingCycleBins %d", offset);
-//
-// offset = (int) (&engineConfiguration->engineCycle) - (int) engineConfiguration;
-// scheduleMsg(&tsLogger, "engineCycle %d", offset);
}
static void setTsSpeed(int value) {
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 2d7626425c..c319261f7d 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -267,16 +267,6 @@ void setMap(fuel_table_t table, float value) {
}
}
-#if 0
-static void setWholeVEMap(float value DECLARE_CONFIG_PARAMETER_SUFFIX) {
- setMap(config->veTable, value);
-}
-#endif
-
-void setWholeFuelMap(float value DECLARE_CONFIG_PARAMETER_SUFFIX) {
- setMap(config->fuelTable, value);
-}
-
void setWholeIgnitionIatCorr(float value DECLARE_CONFIG_PARAMETER_SUFFIX) {
#if (IGN_LOAD_COUNT == FUEL_LOAD_COUNT) && (IGN_RPM_COUNT == FUEL_RPM_COUNT)
// todo: make setMap a template
@@ -836,8 +826,6 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->useConstantDwellDuringCranking = true;
engineConfiguration->ignitionDwellForCrankingMs = 6;
- setFuelLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
- setFuelRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingLoadBin(1.2, 4.4 PASS_CONFIG_PARAMETER_SUFFIX);
setTimingRpmBin(800, 7000 PASS_CONFIG_PARAMETER_SUFFIX);
@@ -846,8 +834,6 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setLinearCurve(engineConfiguration->map.samplingWindowBins, 800, 7000, 1);
setLinearCurve(engineConfiguration->map.samplingWindow, 50, 50, 1);
- // set_whole_timing_map 3
- setWholeFuelMap(3 PASS_CONFIG_PARAMETER_SUFFIX);
setAfrMap(config->afrTable, 14.7);
setDefaultVETable(PASS_ENGINE_PARAMETER_SIGNATURE);
diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index 8ed096207e..c9bbb5a2ca 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -32,7 +32,6 @@ void setAfrMap(afr_table_t table, float value);
* See also setLinearCurve()
*/
void setMap(fuel_table_t table, float value);
-void setWholeFuelMap(float value DECLARE_CONFIG_PARAMETER_SUFFIX);
void setWholeIgnitionIatCorr(float value DECLARE_CONFIG_PARAMETER_SUFFIX);
void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_CONFIG_PARAMETER_SUFFIX);
void setWholeIatCorrTimingTable(float value DECLARE_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/controllers/algo/fuel_math.cpp b/firmware/controllers/algo/fuel_math.cpp
index 31ee2105d8..06d01fc034 100644
--- a/firmware/controllers/algo/fuel_math.cpp
+++ b/firmware/controllers/algo/fuel_math.cpp
@@ -39,7 +39,6 @@
EXTERN_ENGINE;
-fuel_Map3D_t fuelMap("fuel");
fuel_Map3D_t fuelPhaseMap("fl ph");
extern fuel_Map3D_t veMap;
extern afr_Map3D_t afrMap;
@@ -347,7 +346,6 @@ void initFuelMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
INJECT_ENGINE_REFERENCE(&sdAirmass);
INJECT_ENGINE_REFERENCE(&mafAirmass);
- fuelMap.init(config->fuelTable, config->fuelLoadBins, config->fuelRpmBins);
#if (IGN_LOAD_COUNT == FUEL_LOAD_COUNT) && (IGN_RPM_COUNT == FUEL_RPM_COUNT)
fuelPhaseMap.init(config->injectionPhase, config->injPhaseLoadBins, config->injPhaseRpmBins);
#endif /* (IGN_LOAD_COUNT == FUEL_LOAD_COUNT) && (IGN_RPM_COUNT == FUEL_RPM_COUNT) */
diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp
index 45423fd710..68d6ceeb7b 100644
--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@@ -417,14 +417,6 @@ void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
TRIGGER_WAVEFORM(prepareShape());
}
-void setFuelRpmBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX) {
- setLinearCurve(config->fuelRpmBins, from, to);
-}
-
-void setFuelLoadBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX) {
- setLinearCurve(config->fuelLoadBins, from, to);
-}
-
void setTimingRpmBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX) {
setRpmBin(config->ignitionRpmBins, IGN_RPM_COUNT, from, to);
}
diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h
index 5ec14659db..625986bddd 100644
--- a/firmware/controllers/math/engine_math.h
+++ b/firmware/controllers/math/engine_math.h
@@ -59,8 +59,6 @@ void prepareIgnitionPinIndices(ignition_mode_e ignitionMode DECLARE_ENGINE_PARAM
int getCylinderId(int index DECLARE_ENGINE_PARAMETER_SUFFIX);
-void setFuelRpmBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX);
-void setFuelLoadBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX);
void setTimingRpmBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX);
void setTimingLoadBin(float from, float to DECLARE_CONFIG_PARAMETER_SUFFIX);
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 9cbe37b392..131aac3793 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -184,14 +184,6 @@ void printConfiguration(const engine_configuration_s *engineConfiguration) {
scheduleMsg(&logger, "configurationVersion=%d", engine->getGlobalConfigurationVersion());
- for (int k = 0; k < FUEL_LOAD_COUNT; k++) {
-// print("line %d (%.2f): ", k, engineConfiguration->fuelKeyBins[k]);
-// for (int r = 0; r < FUEL_RPM_COUNT; r++) {
-// print("%.2f ", engineConfiguration->fuelTable[k][r]);
-// }
-// print("\r\n");
- }
-
scheduleMsg(&logger, "rpmHardLimit: %d/operationMode=%d", engineConfiguration->rpmHardLimit,
engine->getOperationMode(PASS_ENGINE_PARAMETER_SIGNATURE));
@@ -549,15 +541,6 @@ static void setWholeVeCmd(float value) {
engine->resetEngineSnifferIfInTestMode();
}
-static void setWholeFuelMapCmd(float value) {
- scheduleMsg(&logger, "Setting whole fuel map to %.2f", value);
- if (engineConfiguration->fuelAlgorithm == LM_SPEED_DENSITY) {
- scheduleMsg(&logger, "WARNING: setting fuel map in SD mode is pointless");
- }
- setWholeFuelMap(value PASS_CONFIG_PARAMETER_SUFFIX);
- engine->resetEngineSnifferIfInTestMode();
-}
-
#if EFI_PROD_CODE
static void setEgtSpi(int spi) {
@@ -808,21 +791,6 @@ static void setTimingMap(const char * rpmStr, const char *loadStr, const char *v
scheduleMsg(&logger, "Setting timing map entry %d:%d to %.2f", rpmIndex, loadIndex, value);
}
-static void setFuelMap(const char * rpmStr, const char *loadStr, const char *valueStr) {
- float rpm = atoff(rpmStr);
- float engineLoad = atoff(loadStr);
- float value = atoff(valueStr);
-
- int rpmIndex = findIndexMsg("setFM", config->fuelRpmBins, FUEL_RPM_COUNT, rpm);
- rpmIndex = rpmIndex < 0 ? 0 : rpmIndex;
- int loadIndex = findIndexMsg("setTM", config->fuelLoadBins, FUEL_LOAD_COUNT, engineLoad);
- loadIndex = loadIndex < 0 ? 0 : loadIndex;
-
- config->fuelTable[loadIndex][rpmIndex] = value;
- scheduleMsg(&logger, "Setting fuel map entry %d:%d to %.2f", rpmIndex, loadIndex, value);
- engine->resetEngineSnifferIfInTestMode();
-}
-
static void setSpiMode(int index, bool mode) {
switch (index) {
case 1:
@@ -1352,10 +1320,8 @@ void initSettings(void) {
addConsoleActionF("set_whole_phase_map", setWholePhaseMapCmd);
addConsoleActionF("set_whole_timing_map", setWholeTimingMapCmd);
- addConsoleActionF("set_whole_fuel_map", setWholeFuelMapCmd);
addConsoleActionF("set_whole_ve_map", setWholeVeCmd);
addConsoleActionF("set_whole_ign_corr_map", setWholeIgnitionIatCorr);
- addConsoleActionSSS("set_fuel_map", setFuelMap);
addConsoleActionSSS("set_timing_map", setTimingMap);
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index f276a4d3cb..cb7d8a5428 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -1384,9 +1384,7 @@ angle_table_t injectionPhase;
float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 500.0, 2
float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
-fuel_table_t fuelTable;
-float[FUEL_LOAD_COUNT] fuelLoadBins;;"V", 1, 0, 0.0, 500.0, 2
-float[FUEL_RPM_COUNT] fuelRpmBins;RPM is float and not integer in order to use unified methods for interpolation;"RPM", 1, 0, 0.0, 25500.0, 2
+uint8_t[1152] unused15136;;"units", 1, 0, -20, 100, 0
ignition_table_t ignitionTable;
float[IGN_LOAD_COUNT] ignitionLoadBins;;"Load", 1, 0.0, 0, 500.0, 2
diff --git a/firmware/integration/rusefi_template.xml b/firmware/integration/rusefi_template.xml
index ee78b85324..1b6b1ea094 100644
--- a/firmware/integration/rusefi_template.xml
+++ b/firmware/integration/rusefi_template.xml
@@ -64,23 +64,6 @@
-
-
fuelRpmBins[0]);
- ASSERT_EQ(7000, config->fuelRpmBins[15]);
-
engineConfiguration->crankingChargeAngle = 65;
engineConfiguration->crankingTimingAngle = 31;
engineConfiguration->useConstantDwellDuringCranking = false;
@@ -732,13 +729,6 @@ void doTestFuelSchedulerBug299smallAndMedium(int startUpDelayMs) {
assertInjectors("#0_inj", 0, 0);
-
- int engineLoadIndex = findIndex(config->fuelLoadBins, FUEL_LOAD_COUNT, getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE));
- ASSERT_EQ(8, engineLoadIndex);
- setArray(fuelMap.pointers[engineLoadIndex], FUEL_RPM_COUNT, 25);
- setArray(fuelMap.pointers[engineLoadIndex + 1], FUEL_RPM_COUNT, 25);
-
-
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
engine->injectionDuration = 12.5f;
assertEqualsM("duty for maf=3", 62.5, getInjectorDutyCycle(GET_RPM() PASS_ENGINE_PARAMETER_SUFFIX));
@@ -1047,12 +1037,6 @@ TEST(big, testFuelSchedulerBug299smallAndLarge) {
setTestBug299(ð);
ASSERT_EQ( 4, engine->executor.size()) << "Lqs#0";
- // set fuel map values - extract method?
- int engineLoadIndex = findIndex(config->fuelLoadBins, FUEL_LOAD_COUNT, getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE));
- ASSERT_EQ(8, engineLoadIndex);
- setArray(fuelMap.pointers[engineLoadIndex], FUEL_RPM_COUNT, 35);
- setArray(fuelMap.pointers[engineLoadIndex + 1], FUEL_RPM_COUNT, 35);
-
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
engine->injectionDuration = 17.5f;
assertEqualsM("Lduty for maf=3", 87.5, getInjectorDutyCycle(GET_RPM() PASS_ENGINE_PARAMETER_SUFFIX));
@@ -1114,9 +1098,6 @@ TEST(big, testFuelSchedulerBug299smallAndLarge) {
eth.executeActions();
ASSERT_EQ( 0, engine->executor.size()) << "Lqs#04";
- setArray(fuelMap.pointers[engineLoadIndex], FUEL_RPM_COUNT, 4);
- setArray(fuelMap.pointers[engineLoadIndex + 1], FUEL_RPM_COUNT, 4);
-
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
engine->injectionDuration = 2.0f;
ASSERT_EQ( 10, getInjectorDutyCycle(GET_RPM() PASS_ENGINE_PARAMETER_SUFFIX)) << "Lduty for maf=3";