rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setDefaultBoardConfiguration shouldn't have Frankenso pinout #852

This commit is contained in:
rusefi 2019-07-24 22:00:48 -04:00
parent fc241ce665
commit 3ac83dc34e
8 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/audi_aan.cpp
View File

@ -38,8 +38,4 @@ static void configureShaftPositionEmulatorShapeWhat(PwmConfig *state) {
weComplexInit("distributor", state, 0, 2, switchTimes, 1, pinStates); weComplexInit("distributor", state, 0, 2, switchTimes, 1, pinStates);
} }
void setDefaultEngineConfiguration(EngineConfiguration *engineConfiguration) {
engineConfiguration2.shaftPositionEventCount = 2;
}
#endif /* EFI_ENGINE_AUDI_AAN */ #endif /* EFI_ENGINE_AUDI_AAN */

3
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -5,9 +5,6 @@
* set engine_type 15 * set engine_type 15
* Board pin out for Frankenstein * Board pin out for Frankenstein
* *
* This config overrides some values of the default configuration which is set by setDefaultConfiguration() method
*
*
* @date Apr 15, 2014 * @date Apr 15, 2014
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2018
*/ */

2
firmware/config/engines/custom_engine.cpp
View File

@ -273,7 +273,6 @@ void setBoschVNH2SP30Curve(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// ETB_BENCH_ENGINE // ETB_BENCH_ENGINE
// set engine_type 58 // set engine_type 58
void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// VAG test ETB // VAG test ETB
// set tps_min 54 // set tps_min 54
engineConfiguration->tpsMin = 54; engineConfiguration->tpsMin = 54;
@ -326,7 +325,6 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// TLE8888_BENCH_ENGINE // TLE8888_BENCH_ENGINE
// set engine_type 59 // set engine_type 59
void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.cylindersCount = 8;
engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3;
engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;

2
firmware/config/engines/dodge_neon.cpp
View File

@ -8,8 +8,6 @@
* set engine_type 23 * set engine_type 23
* http://rusefi.com/wiki/index.php?title=Vehicle:Dodge_Neon_2003 * 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 * @date Dec 16, 2013
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2018
*/ */

2
firmware/config/engines/ford_1995_inline_6.cpp
View File

@ -4,8 +4,6 @@
* *
* http://rusefi.com/forum/viewtopic.php?f=3&t=469 * 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 * FORD_INLINE_6_1995 = 7
* set engine_type 7 * set engine_type 7
* *

2
firmware/config/engines/rover_v8.cpp
View File

@ -3,8 +3,6 @@
* *
* V8, firing order 18436572 * V8, firing order 18436572
* *
* This config overrides some values of the default configuration which is set by setDefaultConfiguration() method
*
* set engine_type 10 * set engine_type 10
* *
* ROVER_V8 = 10 * ROVER_V8 = 10

14
firmware/controllers/algo/engine_configuration.cpp
View File

@ -542,7 +542,7 @@ static void setDefaultStepperIdleParameters(DECLARE_ENGINE_PARAMETER_SIGNATURE)
engineConfiguration->idleStepperTotalSteps = 150; engineConfiguration->idleStepperTotalSteps = 150;
} }
static void setCanDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) { static void setCanFrankensoDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
boardConfiguration->canDeviceMode = CD_USE_CAN2; boardConfiguration->canDeviceMode = CD_USE_CAN2;
boardConfiguration->canTxPin = GPIOB_6; boardConfiguration->canTxPin = GPIOB_6;
boardConfiguration->canRxPin = GPIOB_12; boardConfiguration->canRxPin = GPIOB_12;
@ -584,7 +584,7 @@ int getTargetRpmForIdleCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
* *
* This method should NOT be setting any default pinout * 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) #if (! EFI_UNIT_TEST)
memset(&persistentState.persistentConfiguration, 0, sizeof(persistentState.persistentConfiguration)); memset(&persistentState.persistentConfiguration, 0, sizeof(persistentState.persistentConfiguration));
#endif #endif
@ -966,10 +966,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
* @brief Hardware board-specific default configuration (GPIO pins, ADC channels, SPI configs etc.) * @brief Hardware board-specific default configuration (GPIO pins, ADC channels, SPI configs etc.)
*/ */
void setDefaultBoardConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { 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->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->clt.adcChannel = EFI_ADC_6; 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 * 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 * Let's apply global board defaults too, for most of the boards
*/ */

1
firmware/controllers/algo/engine_configuration.h
View File

@ -49,7 +49,6 @@ typedef struct {
} persistent_config_container_s; } persistent_config_container_s;
void prepareVoidConfiguration(engine_configuration_s *activeConfiguration); void prepareVoidConfiguration(engine_configuration_s *activeConfiguration);
void setDefaultConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setTargetRpmCurve(int rpm DECLARE_CONFIG_PARAMETER_SUFFIX); void setTargetRpmCurve(int rpm DECLARE_CONFIG_PARAMETER_SUFFIX);
int getTargetRpmForIdleCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE); int getTargetRpmForIdleCorrection(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void setAfrMap(afr_table_t table, float value); void setAfrMap(afr_table_t table, float value);