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

moving setDefaultFrankensoConfiguration down is the way of righteousness

This commit is contained in:
rusefi 2019-11-03 19:36:56 -05:00
parent 8bbad6cd8f
commit a2bee7f46b
14 changed files with 19 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/engines/bmw_e34.cpp
View File

@ -20,6 +20,7 @@ EXTERN_CONFIG
; ;
void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setBmwE34(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
// chartsize 450 // chartsize 450
engineConfiguration->engineChartSize = 450; engineConfiguration->engineChartSize = 450;

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

@ -71,6 +71,8 @@ static const ignition_table_t default_tps_advance_table = {
EXTERN_CONFIG; EXTERN_CONFIG;
void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setCitroenBerlingoTU3JPConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->engineType = CITROEN_TU3JP; engineConfiguration->engineType = CITROEN_TU3JP;
/** /**

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

@ -85,6 +85,7 @@ void disableLCD(board_configuration_s *boardConfiguration) {
// todo: should this be part of more default configurations? // todo: should this be part of more default configurations?
void setFrankensoConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setFrankensoConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->trigger.type = TT_ONE_PLUS_ONE; engineConfiguration->trigger.type = TT_ONE_PLUS_ONE;
setFrankenso_01_LCD(boardConfiguration); setFrankenso_01_LCD(boardConfiguration);
@ -244,6 +245,7 @@ void setFrankensoBoardTestConfiguration(DECLARE_CONFIG_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) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
// VAG test ETB // VAG test ETB
// set tps_min 54 // set tps_min 54
engineConfiguration->tpsMin = 54; engineConfiguration->tpsMin = 54;

1
firmware/config/engines/engines.mk
View File

@ -36,7 +36,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp \ $(PROJECT_DIR)/config/engines/chevrolet_c20_1973.cpp \
$(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \ $(PROJECT_DIR)/config/engines/toyota_jzs147.cpp \
$(PROJECT_DIR)/config/engines/lada_kalina.cpp \ $(PROJECT_DIR)/config/engines/lada_kalina.cpp \
$(PROJECT_DIR)/config/engines/geo_storm.cpp \
$(PROJECT_DIR)/config/engines/zil130.cpp \ $(PROJECT_DIR)/config/engines/zil130.cpp \
$(PROJECT_DIR)/config/engines/honda_600.cpp \ $(PROJECT_DIR)/config/engines/honda_600.cpp \
$(PROJECT_DIR)/config/engines/me7pnp.cpp \ $(PROJECT_DIR)/config/engines/me7pnp.cpp \

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

@ -24,6 +24,8 @@ EXTERN_CONFIG;
* @brief Default values for persistent properties * @brief Default values for persistent properties
*/ */
void setFordInline6(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setFordInline6(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->specs.cylindersCount = 6; engineConfiguration->specs.cylindersCount = 6;
setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CAM_SENSOR);

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

@ -88,6 +88,8 @@ static void setDefaultAspireMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
} }
void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->tpsMin = 100; engineConfiguration->tpsMin = 100;
engineConfiguration->tpsMax = 750; engineConfiguration->tpsMax = 750;

16
firmware/config/engines/geo_storm.cpp
View File

@ -1,16 +0,0 @@
/*
* @file geo_storm.h
*
* @date Mar 26, 2016
* @author Andrey Belomutskiy, (c) 2012-2018
*/
#include "geo_storm.h"
#include "custom_engine.h"
EXTERN_CONFIG;
void setGeoStormConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
}

15
firmware/config/engines/geo_storm.h
View File

@ -1,15 +0,0 @@
/*
* @file geo_storm.h
*
* @date Mar 26, 2016
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef CONFIG_ENGINES_GEO_STORM_H_
#define CONFIG_ENGINES_GEO_STORM_H_
#include "engine_configuration.h"
void setGeoStormConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE);
#endif /* CONFIG_ENGINES_GEO_STORM_H_ */

1
firmware/config/engines/honda_600.cpp
View File

@ -64,6 +64,7 @@ static void setDefaultCustomMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
} }
void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM; engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM;
engineConfiguration->fuelAlgorithm = LM_ALPHA_N; engineConfiguration->fuelAlgorithm = LM_ALPHA_N;

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

@ -17,6 +17,8 @@
EXTERN_CONFIG; EXTERN_CONFIG;
void setMitsubishiConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setMitsubishiConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->engineType = MITSU_4G93; engineConfiguration->engineType = MITSU_4G93;
engineConfiguration->trigger.type = TT_MITSUBISHI; // same trigger as 4G63? engineConfiguration->trigger.type = TT_MITSUBISHI; // same trigger as 4G63?

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

@ -28,6 +28,8 @@ void setFrankenstein_01_LCD(board_configuration_s *boardConfiguration) {
EXTERN_CONFIG; EXTERN_CONFIG;
void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
// set trigger_type 9 // set trigger_type 9
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1;

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

@ -15,6 +15,8 @@
EXTERN_CONFIG; EXTERN_CONFIG;
void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setSachs(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->specs.displacement = 0.1; // 100cc engineConfiguration->specs.displacement = 0.1; // 100cc
engineConfiguration->specs.cylindersCount = 1; engineConfiguration->specs.cylindersCount = 1;

1
firmware/config/engines/test_engine.cpp
View File

@ -54,6 +54,7 @@ void setTestEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
} }
void setTestVVTEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setTestVVTEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL;

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

@ -74,7 +74,6 @@
#include "toyota_jzs147.h" #include "toyota_jzs147.h"
#include "ford_festiva.h" #include "ford_festiva.h"
#include "lada_kalina.h" #include "lada_kalina.h"
#include "geo_storm.h"
#include "zil130.h" #include "zil130.h"
#include "honda_600.h" #include "honda_600.h"
@ -1047,6 +1046,8 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
*/ */
switch (engineType) { switch (engineType) {
case DEFAULT_FRANKENSO: case DEFAULT_FRANKENSO:
case GEO_STORM:
case FRANKENSO_QA_ENGINE:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
@ -1080,7 +1081,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
#endif /* EFI_SUPPORT_DODGE_NEON */ #endif /* EFI_SUPPORT_DODGE_NEON */
#if EFI_SUPPORT_FORD_ASPIRE #if EFI_SUPPORT_FORD_ASPIRE
case FORD_ASPIRE_1996: case FORD_ASPIRE_1996:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setFordAspireEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setFordAspireEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
#endif /* EFI_SUPPORT_FORD_ASPIRE */ #endif /* EFI_SUPPORT_FORD_ASPIRE */
@ -1107,7 +1107,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setMiataNA6_VAF_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE); setMiataNA6_VAF_Frankenso(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case ETB_BENCH_ENGINE: case ETB_BENCH_ENGINE:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setEtbTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setEtbTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MICRO_RUS_EFI: case MICRO_RUS_EFI:
@ -1131,20 +1130,14 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case HONDA_ACCORD_1_24_SHIFTED: case HONDA_ACCORD_1_24_SHIFTED:
setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE); setHondaAccordConfiguration1_24_shifted(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case FRANKENSO_QA_ENGINE:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setFrankensoBoardTestConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case HONDA_ACCORD_CD_DIP: case HONDA_ACCORD_CD_DIP:
setHondaAccordConfigurationDip(PASS_CONFIG_PARAMETER_SIGNATURE); setHondaAccordConfigurationDip(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MITSU_4G93: case MITSU_4G93:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMitsubishiConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setMitsubishiConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
#if EFI_SUPPORT_1995_FORD_INLINE_6 #if EFI_SUPPORT_1995_FORD_INLINE_6
case FORD_INLINE_6_1995: case FORD_INLINE_6_1995:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setFordInline6(PASS_CONFIG_PARAMETER_SIGNATURE); setFordInline6(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
#endif /* EFI_SUPPORT_1995_FORD_INLINE_6 */ #endif /* EFI_SUPPORT_1995_FORD_INLINE_6 */
@ -1152,7 +1145,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setGy6139qmbDefaultEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setGy6139qmbDefaultEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case HONDA_600: case HONDA_600:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setHonda600(PASS_CONFIG_PARAMETER_SIGNATURE); setHonda600(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_NB1: case MAZDA_MIATA_NB1:
@ -1181,18 +1173,15 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setMiata1996(PASS_CONFIG_PARAMETER_SIGNATURE); setMiata1996(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case CITROEN_TU3JP: case CITROEN_TU3JP:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setCitroenBerlingoTU3JPConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setCitroenBerlingoTU3JPConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case ROVER_V8: case ROVER_V8:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setRoverv8(PASS_CONFIG_PARAMETER_SIGNATURE); setRoverv8(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case SUBARU_2003_WRX: case SUBARU_2003_WRX:
setSubaru2003Wrx(PASS_CONFIG_PARAMETER_SIGNATURE); setSubaru2003Wrx(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case BMW_E34: case BMW_E34:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setBmwE34(PASS_CONFIG_PARAMETER_SIGNATURE); setBmwE34(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case DODGE_RAM: case DODGE_RAM:
@ -1202,7 +1191,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setDodgeStratus(PASS_CONFIG_PARAMETER_SIGNATURE); setDodgeStratus(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case VW_ABA: case VW_ABA:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setVwAba(PASS_CONFIG_PARAMETER_SIGNATURE); setVwAba(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
@ -1222,15 +1210,12 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setTestEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_2003: case MAZDA_MIATA_2003:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMazdaMiata2003EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiata2003EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_2003_NA_RAIL: case MAZDA_MIATA_2003_NA_RAIL:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMazdaMiata2003EngineConfigurationNaFuelRail(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiata2003EngineConfigurationNaFuelRail(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case MAZDA_MIATA_2003_BOARD_TEST: case MAZDA_MIATA_2003_BOARD_TEST:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMazdaMiata2003EngineConfigurationBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE); setMazdaMiata2003EngineConfigurationBoardTest(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case PROMETHEUS_DEFAULTS: case PROMETHEUS_DEFAULTS:
@ -1240,18 +1225,15 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setSubaruEJ20GDefaults(PASS_CONFIG_PARAMETER_SIGNATURE); setSubaruEJ20GDefaults(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case TEST_ENGINE_VVT: case TEST_ENGINE_VVT:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setTestVVTEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setTestVVTEngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case SACHS: case SACHS:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setSachs(PASS_CONFIG_PARAMETER_SIGNATURE); setSachs(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case DAIHATSU: case DAIHATSU:
setDaihatsu(PASS_CONFIG_PARAMETER_SIGNATURE); setDaihatsu(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case CAMARO_4: case CAMARO_4:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setCamaro4(PASS_CONFIG_PARAMETER_SIGNATURE); setCamaro4(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case CHEVY_C20_1973: case CHEVY_C20_1973:
@ -1263,9 +1245,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case TOYOTA_JZS147: case TOYOTA_JZS147:
setToyota_jzs147EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setToyota_jzs147EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break; break;
case GEO_STORM:
setGeoStormConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
default: default:
warning(CUSTOM_UNEXPECTED_ENGINE_TYPE, "Unexpected engine type: %d", engineType); warning(CUSTOM_UNEXPECTED_ENGINE_TYPE, "Unexpected engine type: %d", engineType);