diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index 6af8c86960..13c273ca1e 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); 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_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index eeb1b29558..ae9753704c 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -155,8 +155,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/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp index 655b02e54b..d3fdf2ff2d 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -64,9 +64,6 @@ void setMazda626EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { 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_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/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..5825d3159e 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 @@ -846,8 +836,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/settings.cpp b/firmware/controllers/settings.cpp index 33bf9f94e9..131aac3793 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -541,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) { @@ -1329,7 +1320,6 @@ 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);