moving setDefaultFrankensoConfiguration down is the way of righteousness

This commit is contained in:
rusefi 2019-11-03 17:25:34 -05:00
parent 9c94dd503e
commit 06b7524c1d
5 changed files with 9 additions and 10 deletions

View File

@ -69,9 +69,9 @@ EXTERN_CONFIG;
* set engine_type 14
*/
void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
common079721_2351(PASS_CONFIG_PARAMETER_SIGNATURE);
common079721_2351(engineConfiguration, boardConfiguration);
engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
setFrankenso_01_LCD(boardConfiguration);
setFrankenso0_1_joystick(engineConfiguration);

View File

@ -167,7 +167,8 @@ static void commonMiataNa(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setCommonNTCSensor(&engineConfiguration->iat, 2700);
}
void common079721_2351(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
void common079721_2351(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->engineChartSize = 300;
@ -204,7 +205,7 @@ void common079721_2351(engine_configuration_s *engineConfiguration, board_config
* Frankenstein board
*/
void setMiata1990(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
common079721_2351(engineConfiguration, boardConfiguration);
common079721_2351(PASS_CONFIG_PARAMETER_SIGNATURE);
commonMiataNa(PASS_CONFIG_PARAMETER_SIGNATURE);
@ -313,6 +314,7 @@ static void setMiata1994_common(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
*/
void setMiata1994_d(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setMiata1994_common(PASS_CONFIG_PARAMETER_SIGNATURE);
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
/**
* This board was avoiding PE0 & PE1 mosfets altogether

View File

@ -14,7 +14,7 @@
#include "engine_configuration.h"
void common079721_2351(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void common079721_2351(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiata1990(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiata1994_d(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiata1996(DECLARE_CONFIG_PARAMETER_SIGNATURE);

View File

@ -18,6 +18,8 @@
EXTERN_CONFIG;
void setMazdaMiataNb1EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
// set_rpm_hard_limit 3000
engineConfiguration->rpmHardLimit = 3000; // yes, 3k. let's play it safe for now

View File

@ -1156,7 +1156,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setHonda600(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MAZDA_MIATA_NB1:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMazdaMiataNb1EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MAZDA_323:
@ -1169,20 +1168,16 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
setSuzukiVitara(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case FORD_ESCORT_GT:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setFordEscortGt(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_1990:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMiata1990(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_1994_DEVIATOR:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMiata1994_d(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case MIATA_1994_SPAGS:
case MIATA_1996:
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setMiata1996(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case CITROEN_TU3JP: