From 2ba340bce4156b16556ad43a5bd0994ee98716c7 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 3 Aug 2020 12:21:49 -0700 Subject: [PATCH] no bins --- firmware/config/engines/GY6_139QMB.cpp | 3 --- firmware/config/engines/citroenBerlingoTU3JP.cpp | 2 -- firmware/config/engines/dodge_neon.cpp | 1 - firmware/config/engines/ford_aspire.cpp | 3 --- firmware/config/engines/ford_festiva.cpp | 3 --- firmware/config/engines/honda_600.cpp | 3 --- firmware/config/engines/honda_accord.cpp | 1 - firmware/config/engines/mazda_626.cpp | 1 - firmware/config/engines/mazda_miata.cpp | 2 -- firmware/config/engines/sachs.cpp | 1 - firmware/controllers/math/engine_math.cpp | 8 -------- firmware/controllers/math/engine_math.h | 2 -- 12 files changed, 30 deletions(-) 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 13c273ca1e..49a266e3c7 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -255,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/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 ae9753704c..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, 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 d3fdf2ff2d..eba7ed5006 100644 --- a/firmware/config/engines/mazda_626.cpp +++ b/firmware/config/engines/mazda_626.cpp @@ -62,7 +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_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/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/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);