From 3ac83dc34eeefe8c906a1e2714b16c85085de76e Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 24 Jul 2019 22:00:48 -0400 Subject: [PATCH] setDefaultBoardConfiguration shouldn't have Frankenso pinout #852 --- firmware/config/engines/audi_aan.cpp | 4 ---- firmware/config/engines/citroenBerlingoTU3JP.cpp | 3 --- firmware/config/engines/custom_engine.cpp | 2 -- firmware/config/engines/dodge_neon.cpp | 2 -- firmware/config/engines/ford_1995_inline_6.cpp | 2 -- firmware/config/engines/rover_v8.cpp | 2 -- firmware/controllers/algo/engine_configuration.cpp | 14 ++++++++------ firmware/controllers/algo/engine_configuration.h | 1 - 8 files changed, 8 insertions(+), 22 deletions(-) diff --git a/firmware/config/engines/audi_aan.cpp b/firmware/config/engines/audi_aan.cpp index a208220c82..ff5265a069 100644 --- a/firmware/config/engines/audi_aan.cpp +++ b/firmware/config/engines/audi_aan.cpp @@ -38,8 +38,4 @@ static void configureShaftPositionEmulatorShapeWhat(PwmConfig *state) { weComplexInit("distributor", state, 0, 2, switchTimes, 1, pinStates); } -void setDefaultEngineConfiguration(EngineConfiguration *engineConfiguration) { - engineConfiguration2.shaftPositionEventCount = 2; -} - #endif /* EFI_ENGINE_AUDI_AAN */ diff --git a/firmware/config/engines/citroenBerlingoTU3JP.cpp b/firmware/config/engines/citroenBerlingoTU3JP.cpp index faf9c3d4b6..906ee2dacf 100644 --- a/firmware/config/engines/citroenBerlingoTU3JP.cpp +++ b/firmware/config/engines/citroenBerlingoTU3JP.cpp @@ -5,9 +5,6 @@ * set engine_type 15 * Board pin out for Frankenstein * - * This config overrides some values of the default configuration which is set by setDefaultConfiguration() method - * - * * @date Apr 15, 2014 * @author Andrey Belomutskiy, (c) 2012-2018 */ diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index bf4187983f..1e3e7bcbb5 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -273,7 +273,6 @@ void setBoschVNH2SP30Curve(DECLARE_ENGINE_PARAMETER_SIGNATURE) { // ETB_BENCH_ENGINE // set engine_type 58 void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE); // VAG test ETB // set tps_min 54 engineConfiguration->tpsMin = 54; @@ -326,7 +325,6 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // TLE8888_BENCH_ENGINE // set engine_type 59 void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { - setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE); engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index d578b73c8e..48118b972a 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -8,8 +8,6 @@ * set engine_type 23 * http://rusefi.com/wiki/index.php?title=Vehicle:Dodge_Neon_2003 * - * This config overrides some values of the default configuration which is set by setDefaultConfiguration() method - * * @date Dec 16, 2013 * @author Andrey Belomutskiy, (c) 2012-2018 */ diff --git a/firmware/config/engines/ford_1995_inline_6.cpp b/firmware/config/engines/ford_1995_inline_6.cpp index cf0b3c4311..6a7c83b663 100644 --- a/firmware/config/engines/ford_1995_inline_6.cpp +++ b/firmware/config/engines/ford_1995_inline_6.cpp @@ -4,8 +4,6 @@ * * http://rusefi.com/forum/viewtopic.php?f=3&t=469 * - * This config overrides some values of the default configuration which is set by setDefaultConfiguration() method - * * FORD_INLINE_6_1995 = 7 * set engine_type 7 * diff --git a/firmware/config/engines/rover_v8.cpp b/firmware/config/engines/rover_v8.cpp index cd9daa3798..08d9bbab1f 100644 --- a/firmware/config/engines/rover_v8.cpp +++ b/firmware/config/engines/rover_v8.cpp @@ -3,8 +3,6 @@ * * V8, firing order 18436572 * - * This config overrides some values of the default configuration which is set by setDefaultConfiguration() method - * * set engine_type 10 * * ROVER_V8 = 10 diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0c039ff063..dca904e357 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -542,7 +542,7 @@ static void setDefaultStepperIdleParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE) engineConfiguration->idleStepperTotalSteps = 150; } -static void setCanDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +static void setCanFrankensoDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) { boardConfiguration->canDeviceMode = CD_USE_CAN2; boardConfiguration->canTxPin = GPIOB_6; boardConfiguration->canRxPin = GPIOB_12; @@ -584,7 +584,7 @@ int getTargetRpmForIdleCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) { * * This method should NOT be setting any default pinout */ -void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { +static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { #if (! EFI_UNIT_TEST) memset(&persistentState.persistentConfiguration, 0, sizeof(persistentState.persistentConfiguration)); #endif @@ -966,10 +966,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { * @brief Hardware board-specific default configuration (GPIO pins, ADC channels, SPI configs etc.) */ void setDefaultBoardConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { - // set initial pin groups - setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE); - setCanDefaults(PASS_ENGINE_PARAMETER_SIGNATURE); + setCanFrankensoDefaults(PASS_ENGINE_PARAMETER_SIGNATURE); engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->clt.adcChannel = EFI_ADC_6; @@ -1036,7 +1034,11 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN /** * Let's apply global defaults first */ - setDefaultConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); + setDefaultEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE); + + // set initial pin groups + setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE); + /** * Let's apply global board defaults too, for most of the boards */ diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index d07f3423c9..90fd871544 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -49,7 +49,6 @@ typedef struct { } persistent_config_container_s; void prepareVoidConfiguration(engine_configuration_s *activeConfiguration); -void setDefaultConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE); void setTargetRpmCurve(int rpm DECLARE_CONFIG_PARAMETER_SUFFIX); int getTargetRpmForIdleCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); void setAfrMap(afr_table_t table, float value);