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

clean up sd overrides (#4272)

This commit is contained in:
Matthew Kennedy 2022-06-23 06:15:51 -07:00 committed by GitHub
parent 529fd4128c
commit 4d7fe35c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 143 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/boards/48way/board_configuration.cpp
View File

@ -34,10 +34,6 @@ static void setIgnitionPins() {
engineConfiguration->ignitionPins[7] = Gpio::D10;
}
void setSdCardConfigurationOverrides(void) {
}
static void setEtbConfig() {
}

3
firmware/config/boards/atlas/board_configuration.cpp
View File

@ -1,4 +1 @@
#include "pch.h"
void setSdCardConfigurationOverrides() {
}

4
firmware/config/boards/core8/board_configuration.cpp
View File

@ -34,10 +34,6 @@ static void setIgnitionPins() {
engineConfiguration->ignitionPins[7] = Gpio::G1;
}
void setSdCardConfigurationOverrides(void) {
}
static void setEtbConfig() {
// TLE9201 driver
// This chip has three control pins:

7
firmware/config/boards/f407-discovery/board_extra.cpp
View File

@ -10,10 +10,3 @@
*/
void setPinConfigurationOverrides() {
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
}

3
firmware/config/boards/f429-discovery/board_configuration.cpp
View File

@ -1,8 +1,5 @@
#include "pch.h"
void setSdCardConfigurationOverrides() {
}
/**
* @brief Board-specific initialization code.
* @todo Add your board-specific code, if any.

22
firmware/config/boards/hellen/alphax-2chan/board_configuration.cpp
View File

@ -117,7 +117,13 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -162,20 +168,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}
void boardPrepareForStop() {
// Wake on the CAN RX pin
palEnableLineEvent(PAL_LINE(GPIOD, 0), PAL_EVENT_MODE_RISING_EDGE);

22
firmware/config/boards/hellen/alphax-4chan/board_configuration.cpp
View File

@ -157,7 +157,13 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -207,20 +213,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->vrThreshold[1].pin = H144_OUT_PWM4;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}
void boardPrepareForStop() {
// Wake on the CAN RX pin
palEnableLineEvent(PAL_LINE(GPIOD, 0), PAL_EVENT_MODE_RISING_EDGE);

1
firmware/config/boards/hellen/cypress/board.h
View File

@ -26,7 +26,6 @@ extern "C" {
void boardInit(void);
void setPinConfigurationOverrides(void);
void setSerialConfigurationOverrides(void);
void setSdCardConfigurationOverrides(void);
void setAdcChannelOverrides(void);
/**

3
firmware/config/boards/hellen/cypress/board_configuration.cpp
View File

@ -128,9 +128,6 @@ void setSerialConfigurationOverrides() {
#endif
}
void setSdCardConfigurationOverrides() {
}
void setAdcChannelOverrides() {
addAdcChannelForTrigger();
}

22
firmware/config/boards/hellen/harley81/board_configuration.cpp
View File

@ -137,7 +137,13 @@ void boardOnConfigurationChange(engine_configuration_s * /*previousConfiguration
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -197,20 +203,6 @@ void setBoardDefaultConfiguration() {
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM4;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}
void boardPrepareForStop() {
// Wake on the CAN RX pin
palEnableLineEvent(PAL_LINE(GPIOD, 0), PAL_EVENT_MODE_RISING_EDGE);

21
firmware/config/boards/hellen/hellen-gm-e67/board_configuration.cpp
View File

@ -98,8 +98,13 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -186,17 +191,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH;
// ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}

22
firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp
View File

@ -86,7 +86,13 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -145,17 +151,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH;
// ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}

32
firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
View File

@ -92,7 +92,18 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -174,22 +185,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->tps1SecondaryMax = 102;
hellenWbo();
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
}

31
firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
View File

@ -98,7 +98,17 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen176LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -175,22 +185,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->vrThreshold[0].pin = H144_OUT_PWM6;
hellenWbo();
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
}

23
firmware/config/boards/hellen/hellen128/board_configuration.cpp
View File

@ -148,7 +148,14 @@ static void setHellen128ETBConfig() {
void setBoardConfigOverrides() {
setHellen176LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
setHellen128ETBConfig();
// this specific Hellen has less common pull-up value R49
@ -222,17 +229,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->vrThreshold[0].pin = Gpio::D14;
hellenWbo();
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}

22
firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp
View File

@ -101,7 +101,13 @@ static bool isFirstInvocation = true;
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -205,17 +211,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->tps1SecondaryMin = 880;
engineConfiguration->tps1SecondaryMax = 68;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}

31
firmware/config/boards/hellen/hellen64_miataNA6_94/board_configuration.cpp
View File

@ -91,7 +91,17 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen176LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -145,22 +155,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
}

31
firmware/config/boards/hellen/hellen72/board_configuration.cpp
View File

@ -92,7 +92,17 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen176LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = H_SPI3_MOSI;
engineConfiguration->spi3misoPin = H_SPI3_MISO;
engineConfiguration->spi3sckPin = H_SPI3_SCK;
engineConfiguration->sdCardCsPin = H_SPI3_CS;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->etbIo[0].directionPin1 = Gpio::C7; // out_pwm3
engineConfiguration->etbIo[0].directionPin2 = Gpio::C8; // out_pwm4
@ -162,22 +172,3 @@ void setBoardDefaultConfiguration() {
hellenWbo();
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = H_SPI3_MOSI;
engineConfiguration->spi3misoPin = H_SPI3_MISO;
engineConfiguration->spi3sckPin = H_SPI3_SCK;
engineConfiguration->sdCardCsPin = H_SPI3_CS;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
}

49
firmware/config/boards/hellen/hellen81/board_configuration.cpp
View File

@ -100,7 +100,27 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setLedPins();
setupVbatt();
setSdCardConfigurationOverrides();
// Hellen81a uses SPI2 for SD-card
#if 1
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = Gpio::B15;
engineConfiguration->spi2misoPin = Gpio::B14;
engineConfiguration->spi2sckPin = Gpio::B13;
engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_2 = true;
#else
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
engineConfiguration->is_enabled_spi_3 = true;
#endif
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -156,30 +176,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SEQUENTIAL; // IM_SIMULTANEOUS; //IM_BATCH;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
// Hellen81a uses SPI2 for SD-card
#if 1
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = Gpio::B15;
engineConfiguration->spi2misoPin = Gpio::B14;
engineConfiguration->spi2sckPin = Gpio::B13;
engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_2 = true;
#else
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
engineConfiguration->is_enabled_spi_3 = true;
#endif
}

31
firmware/config/boards/hellen/hellen88bmw/board_configuration.cpp
View File

@ -88,7 +88,17 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -169,22 +179,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->tps1SecondaryMax = 102;
hellenWbo();
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->spi3mosiPin = Gpio::C12;
engineConfiguration->spi3misoPin = Gpio::C11;
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->sdCardCsPin = Gpio::A15;
// engineConfiguration->spi2mosiPin = Gpio::B15;
// engineConfiguration->spi2misoPin = Gpio::B14;
// engineConfiguration->spi2sckPin = Gpio::B13;
// engineConfiguration->sdCardCsPin = Gpio::B12;
engineConfiguration->is_enabled_spi_3 = true;
}

22
firmware/config/boards/hellen/hellenNA8_96/board_configuration.cpp
View File

@ -86,7 +86,13 @@ static void setupDefaultSensorInputs() {
void setBoardConfigOverrides() {
setHellen144LedPins();
setupVbatt();
setSdCardConfigurationOverrides();
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
engineConfiguration->clt.config.bias_resistor = 4700;
engineConfiguration->iat.config.bias_resistor = 4700;
@ -150,17 +156,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH;
// ? engineConfiguration->malfunctionIndicatorPin = Gpio::G4; //1E - Check Engine Light
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
engineConfiguration->spi2mosiPin = H_SPI2_MOSI;
engineConfiguration->spi2misoPin = H_SPI2_MISO;
engineConfiguration->spi2sckPin = H_SPI2_SCK;
engineConfiguration->sdCardCsPin = H_SPI2_CS;
engineConfiguration->is_enabled_spi_2 = true;
}

7
firmware/config/boards/microrusefi/board_configuration.cpp
View File

@ -226,10 +226,3 @@ void setBoardDefaultConfiguration() {
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL;
}
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
}

3
firmware/config/boards/nucleo_f767/board_configuration.cpp
View File

@ -23,9 +23,6 @@ void setSerialConfigurationOverrides() {
engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED;
}
void setSdCardConfigurationOverrides() {
}
/**
* @brief Board-specific configuration defaults.
* @todo Add your board-specific code, if any.

7
firmware/config/boards/nucleo_h743/board_configuration.cpp
View File

@ -1,8 +1 @@
#include "pch.h"
/**
* @brief Board-specific SD card configuration code overrides. Needed by bootloader code.
* @todo Add your board-specific code, if any.
*/
void setSdCardConfigurationOverrides() {
}

12
firmware/config/boards/prometheus/board_configuration.cpp
View File

@ -107,13 +107,6 @@ void setSerialConfigurationOverrides() {
engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED;
}
void setSdCardConfigurationOverrides() {
engineConfiguration->is_enabled_spi_1 = true;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_1;
engineConfiguration->sdCardCsPin = Gpio::A2;
engineConfiguration->isSdCardEnabled = true;
}
/**
* @brief Board-specific configuration defaults.
* @todo Add your board-specific code, if any.
@ -248,5 +241,10 @@ void setBoardDefaultConfiguration() {
//!!!!!!!!!!!!!!!!!!!
//engineConfiguration->silentTriggerError = true;
engineConfiguration->is_enabled_spi_1 = true;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_1;
engineConfiguration->sdCardCsPin = Gpio::A2;
engineConfiguration->isSdCardEnabled = true;
}

4
firmware/config/boards/proteus/board_configuration.cpp
View File

@ -49,9 +49,6 @@ static void setIgnitionPins() {
engineConfiguration->ignitionPinMode = OM_DEFAULT;
}
void setSdCardConfigurationOverrides() {
}
static void setLedPins() {
// PE3 is error LED, configured in board.mk
engineConfiguration->communicationLedPin = Gpio::E4;
@ -128,7 +125,6 @@ static void setupDefaultSensorInputs() {
}
static void setupSdCard() {
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->sdCardCsPin = Gpio::D2;

12
firmware/config/boards/subaru_eg33/board_configuration.cpp
View File

@ -22,13 +22,6 @@ void setSerialConfigurationOverrides() {
engineConfiguration->uartConsoleSerialSpeed = SERIAL_SPEED;
}
void setSdCardConfigurationOverrides() {
engineConfiguration->is_enabled_spi_1 = false;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_1;
engineConfiguration->sdCardCsPin = Gpio::A2;
engineConfiguration->isSdCardEnabled = false;
}
/**
* @brief Board-specific configuration defaults.
* @todo Add your board-specific code, if any.
@ -183,6 +176,11 @@ void setBoardDefaultConfiguration() {
engineConfiguration->spi3sckPin = Gpio::C10;
engineConfiguration->spi3SckMode = PO_DEFAULT;
engineConfiguration->is_enabled_spi_1 = false;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_1;
engineConfiguration->sdCardCsPin = Gpio::A2;
engineConfiguration->isSdCardEnabled = false;
/* TODO: add settings for SPI4 */
/* Knock sensor */

3
firmware/config/boards/tdg-pdm8/board_configuration.cpp
View File

@ -2,9 +2,6 @@
#include "protected_gpio.h"
void setSdCardConfigurationOverrides() {
}
void setBoardConfigOverrides() {
// No divider, just direct connected analog inputs (they're all internal, so why divide?)
engineConfiguration->analogInputDividerCoefficient = 1;

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

@ -296,15 +296,7 @@ void setDefaultBasePins() {
// needed also by bootloader code
// at the moment bootloader does NOT really need SD card, this is a step towards future bootloader SD card usage
void setDefaultSdCardParameters() {
engineConfiguration->is_enabled_spi_3 = true;
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_3;
engineConfiguration->sdCardCsPin = Gpio::D4;
engineConfiguration->isSdCardEnabled = true;
#if EFI_PROD_CODE
// call overrided board-specific SD card configuration setup, if needed (for custom boards only)
setSdCardConfigurationOverrides();
#endif /* EFI_PROD_CODE */
}
static void setDefaultWarmupIdleCorrection() {

1
firmware/hw_layer/ports/chconf_common.h
View File

@ -47,7 +47,6 @@ extern "C" {
void boardInit(void);
void setPinConfigurationOverrides(void);
void setSerialConfigurationOverrides(void);
void setSdCardConfigurationOverrides(void);
void setAdcChannelOverrides(void);
#ifdef __cplusplus
}