invalid SD card configuration on MRE causes RED, blinking BLUE and no USB :( #4131
This commit is contained in:
parent
82cb7a07da
commit
fc44f655bf
|
@ -21,6 +21,10 @@ endif
|
||||||
# *TODO* need to give people the horrible choice between Bluetooth via TTL or SD card via SPI :( horrible choice
|
# *TODO* need to give people the horrible choice between Bluetooth via TTL or SD card via SPI :( horrible choice
|
||||||
EFI_CONSOLE_TTL_PINS = -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::B10 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::B11
|
EFI_CONSOLE_TTL_PINS = -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::B10 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::B11
|
||||||
|
|
||||||
|
# on MRE 0.6.0 we have SD card on SPI2 which shared channel 3 with USART3
|
||||||
|
# todo: enable serial which would not DMA thus not conflict?
|
||||||
|
DDEFS += -DSTM32_UART_USE_USART3=FALSE
|
||||||
|
|
||||||
DDEFS += -DEFI_CAN_SERIAL=TRUE
|
DDEFS += -DEFI_CAN_SERIAL=TRUE
|
||||||
|
|
||||||
DDEFS += -DEFI_CJ125=FALSE -DBOARD_L9779_COUNT=0 -DEFI_HD44780_LCD=FALSE -DEFI_LCD=FALSE
|
DDEFS += -DEFI_CJ125=FALSE -DBOARD_L9779_COUNT=0 -DEFI_HD44780_LCD=FALSE -DEFI_LCD=FALSE
|
||||||
|
|
|
@ -186,7 +186,6 @@ void setSerialConfigurationOverrides() {
|
||||||
void setBoardDefaultConfiguration() {
|
void setBoardDefaultConfiguration() {
|
||||||
setInjectorPins();
|
setInjectorPins();
|
||||||
setIgnitionPins();
|
setIgnitionPins();
|
||||||
engineConfiguration->sdCardCsPin = Gpio::B9;
|
|
||||||
|
|
||||||
// MRE has a special main relay control low side pin
|
// MRE has a special main relay control low side pin
|
||||||
// rusEfi firmware is totally not involved with main relay control on microRusEfi board
|
// rusEfi firmware is totally not involved with main relay control on microRusEfi board
|
||||||
|
@ -210,13 +209,14 @@ void setBoardDefaultConfiguration() {
|
||||||
|
|
||||||
|
|
||||||
// SPI for SD card
|
// SPI for SD card
|
||||||
// engineConfiguration->is_enabled_spi_2 = true;
|
engineConfiguration->is_enabled_spi_2 = true;
|
||||||
// engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
|
engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2;
|
||||||
//
|
engineConfiguration->isSdCardEnabled = true;
|
||||||
// engineConfiguration->spi2mosiPin = Gpio::B15;
|
|
||||||
// engineConfiguration->spi2misoPin = Gpio::B14;
|
engineConfiguration->spi2mosiPin = Gpio::B15;
|
||||||
// engineConfiguration->spi2sckPin = Gpio::B13;
|
engineConfiguration->spi2misoPin = Gpio::B14;
|
||||||
// engineConfiguration->sdCardCsPin = Gpio::E15;
|
engineConfiguration->spi2sckPin = Gpio::B13;
|
||||||
|
engineConfiguration->sdCardCsPin = Gpio::E15;
|
||||||
|
|
||||||
engineConfiguration->specs.cylindersCount = 4;
|
engineConfiguration->specs.cylindersCount = 4;
|
||||||
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
|
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
|
||||||
|
|
Loading…
Reference in New Issue