From 911523ffbca18362ae640f49d90ae95b3f688726 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 14 Dec 2022 19:10:00 -0500 Subject: [PATCH] random Frankenso clean-up --- firmware/config/engines/citroenBerlingoTU3JP.cpp | 2 -- firmware/config/engines/custom_engine.cpp | 2 -- firmware/config/engines/dodge_neon.cpp | 3 --- firmware/config/engines/ford_1995_inline_6.cpp | 2 -- firmware/config/engines/ford_aspire.cpp | 2 -- firmware/config/engines/honda_600.cpp | 2 +- firmware/config/engines/mazda_miata.cpp | 1 - firmware/config/engines/mazda_miata_1_6.cpp | 1 - firmware/config/engines/mitsubishi.cpp | 1 - firmware/config/engines/nissan_primera.cpp | 2 -- firmware/config/engines/sachs.cpp | 1 - firmware/config/engines/test_engine.cpp | 3 --- firmware/controllers/algo/engine_configuration.cpp | 5 ----- firmware/controllers/algo/engine_configuration.h | 1 - 14 files changed, 1 insertion(+), 27 deletions(-) diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index 1b7d40a6af..ba92f6cc44 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -15,8 +15,6 @@ #include "custom_engine.h" void setCitroenBerlingoTU3JPConfiguration() { - setDefaultFrankensoConfiguration(); - /** * Base engine setting */ diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 43f19b9e24..99601db0db 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -81,7 +81,6 @@ void disableLCD(engine_configuration_s *engineConfiguration) { // todo: should this be part of more default configurations? void setFrankensoConfiguration() { - setDefaultFrankensoConfiguration(); engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; setFrankenso_01_LCD(engineConfiguration); @@ -238,7 +237,6 @@ void setFrankensoBoardTestConfiguration() { // ETB_BENCH_ENGINE // set engine_type 58 void setEtbTestConfiguration() { - setDefaultFrankensoConfiguration(); // VAG test ETB // set tps_min 54 engineConfiguration->tpsMin = 54; diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index c106d1c10a..8ef16b074b 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -19,8 +19,6 @@ #include "custom_engine.h" void setDodgeNeon1995EngineConfiguration() { - setDefaultFrankensoConfiguration(); - engineConfiguration->trigger.type = TT_DODGE_NEON_1995; engineConfiguration->fuelAlgorithm = LM_ALPHA_N; @@ -110,7 +108,6 @@ void setDodgeNeon1995EngineConfiguration() { } void setDodgeNeonNGCEngineConfiguration() { - setDefaultFrankensoConfiguration(); engineConfiguration->trigger.type = TT_DODGE_NEON_2003_CAM; setFrankenso_01_LCD(engineConfiguration); setFrankenso0_1_joystick(engineConfiguration); diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index 82e78b80aa..5f5b38a52d 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -19,8 +19,6 @@ * @brief Default values for persistent properties */ void setFordInline6() { - setDefaultFrankensoConfiguration(); - engineConfiguration->specs.cylindersCount = 6; setCamOperationMode(); diff --git a/firmware/config/engines/ford_aspire.cpp b/firmware/config/engines/ford_aspire.cpp index 9e3a8877a4..44778660bb 100644 --- a/firmware/config/engines/ford_aspire.cpp +++ b/firmware/config/engines/ford_aspire.cpp @@ -44,8 +44,6 @@ static void setDefaultAspireMaps() { } void setFordAspireEngineConfiguration() { - setDefaultFrankensoConfiguration(); - engineConfiguration->tpsMin = 100; engineConfiguration->tpsMax = 750; diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp index 4887430ca4..cbc947c2b6 100644 --- a/firmware/config/engines/honda_600.cpp +++ b/firmware/config/engines/honda_600.cpp @@ -23,7 +23,7 @@ static void setDefaultCustomMaps() { } void setHonda600() { - setDefaultFrankensoConfiguration(); + engineConfiguration->trigger.type = TT_HONDA_CBR_600; engineConfiguration->fuelAlgorithm = LM_ALPHA_N; diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 2c9cdccc0c..08cfda8fdd 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -106,7 +106,6 @@ static void commonMiataNa() { } void common079721_2351() { - setDefaultFrankensoConfiguration(); engineConfiguration->engineChartSize = 300; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 7c4d384478..8a062fcb31 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -255,7 +255,6 @@ static void miataNAcommon() { * MIATA_NA6_MAP */ void setMiataNA6_MAP_Frankenso() { - setDefaultFrankensoConfiguration(); setFrankensoConfiguration(); miataNAcommonEngineSettings(); diff --git a/firmware/config/engines/mitsubishi.cpp b/firmware/config/engines/mitsubishi.cpp index 667f53e20c..2dc127f93a 100644 --- a/firmware/config/engines/mitsubishi.cpp +++ b/firmware/config/engines/mitsubishi.cpp @@ -14,7 +14,6 @@ #include "mitsubishi.h" void setMitsubishiConfiguration() { - setDefaultFrankensoConfiguration(); engineConfiguration->trigger.type = TT_MITSUBISHI; // same trigger as 4G63? diff --git a/firmware/config/engines/nissan_primera.cpp b/firmware/config/engines/nissan_primera.cpp index 9a505fdae7..70d6171683 100644 --- a/firmware/config/engines/nissan_primera.cpp +++ b/firmware/config/engines/nissan_primera.cpp @@ -13,8 +13,6 @@ #include "nissan_primera.h" void setNissanPrimeraEngineConfiguration() { - setDefaultFrankensoConfiguration(); - engineConfiguration->trigger.type = TT_NISSAN_SR20VE; engineConfiguration->auxValves[0] = Gpio::E14; diff --git a/firmware/config/engines/sachs.cpp b/firmware/config/engines/sachs.cpp index 1aa18b8444..f720c3875f 100644 --- a/firmware/config/engines/sachs.cpp +++ b/firmware/config/engines/sachs.cpp @@ -13,7 +13,6 @@ #include "sachs.h" void setSachs() { - setDefaultFrankensoConfiguration(); engineConfiguration->specs.displacement = 0.1; // 100cc engineConfiguration->specs.cylindersCount = 1; diff --git a/firmware/config/engines/test_engine.cpp b/firmware/config/engines/test_engine.cpp index 0edfd5f6c2..357263753c 100644 --- a/firmware/config/engines/test_engine.cpp +++ b/firmware/config/engines/test_engine.cpp @@ -16,8 +16,6 @@ // TEST_ENGINE void setTestCamEngineConfiguration() { - setDefaultFrankensoConfiguration(); - engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; setCamOperationMode(); @@ -60,7 +58,6 @@ void setTestCrankEngineConfiguration() { } void setTestVVTEngineConfiguration() { - setDefaultFrankensoConfiguration(); setCrankOperationMode(); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index ed4333dbd6..6c725142e5 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -632,11 +632,6 @@ static void setDefaultEngineConfiguration() { strncpy(config->luaScript, "function onTick()\nend", efi::size(config->luaScript)); } - -void setDefaultFrankensoConfiguration() { - -} - #ifdef CONFIG_RESET_SWITCH_PORT // this pin is not configurable at runtime so that we have a reliable way to reset configuration #define SHOULD_IGNORE_FLASH() (palReadPad(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN) == 0) diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 2f62d609bc..224a6c09b3 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -46,7 +46,6 @@ void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration); void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration); void emptyCallbackWithConfiguration(engine_configuration_s * engine); -void setDefaultFrankensoConfiguration(); typedef void (*configuration_callback_t)(engine_configuration_s*);