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

setDefaultBoardConfiguration shouldn't have Frankenso pinout #852 

merging methods since always invoked together
This commit is contained in:
rusefi 2019-07-24 21:24:39 -04:00
parent 6fb2b34120
commit fc241ce665
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/bootloader/src/main.cpp
View File

@ -39,8 +39,6 @@ int main(void) {
chSysInit();
// set base pin configuration based on the board
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// set UART pads configuration based on the board
setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
/* at the moment SD card is not needed by bootloader
// set SD card configuration also
setDefaultSdCardParameters(PASS_ENGINE_PARAMETER_SIGNATURE);

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

@ -274,8 +274,6 @@ void setBoschVNH2SP30Curve(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// set engine_type 58
void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// TODO: HOW?! IS THIS HELPING USB SERIAL?!
setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
// VAG test ETB
// set tps_min 54
engineConfiguration->tpsMin = 54;
@ -329,8 +327,6 @@ void setEtbTestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// set engine_type 59
void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
// TODO: HOW?! IS THIS HELPING USB SERIAL?!
setDefaultSerialParameters(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;

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

@ -347,10 +347,9 @@ void setDefaultBasePins(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
// needed also by bootloader code
setPinConfigurationOverrides();
#endif /* EFI_PROD_CODE */
}
// set UART pads configuration based on the board
// needed also by bootloader code
void setDefaultSerialParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
boardConfiguration->useSerialPort = true;
engineConfiguration->binarySerialTxPin = GPIOC_10;
engineConfiguration->binarySerialRxPin = GPIOC_11;
@ -547,11 +546,6 @@ static void setCanDefaults(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
boardConfiguration->canDeviceMode = CD_USE_CAN2;
boardConfiguration->canTxPin = GPIOB_6;
boardConfiguration->canRxPin = GPIOB_12;
engineConfiguration->canSleepPeriodMs = 50;
engineConfiguration->canReadEnabled = true;
engineConfiguration->canWriteEnabled = true;
engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
}
/**
@ -610,6 +604,11 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setBosch02880155868(PASS_ENGINE_PARAMETER_SIGNATURE);
engineConfiguration->canSleepPeriodMs = 50;
engineConfiguration->canReadEnabled = true;
engineConfiguration->canWriteEnabled = true;
engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
for (int i = 0; i < FSIO_COMMAND_COUNT; i++) {
config->fsioFormulas[i][0] = 0;
}
@ -970,8 +969,6 @@ void setDefaultBoardConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
// set initial pin groups
setDefaultBasePins(PASS_CONFIG_PARAMETER_SIGNATURE);
setDefaultSerialParameters(PASS_CONFIG_PARAMETER_SIGNATURE);
setCanDefaults(PASS_ENGINE_PARAMETER_SIGNATURE);
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;

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

@ -68,7 +68,7 @@ void printFloatArray(const char *prefix, float array[], int size);
// needed by bootloader
void setDefaultBasePins(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setDefaultSerialParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setDefaultSdCardParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void rememberCurrentConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE);