From 114a94d2a27c6429ca53824dde493f0578fc1108 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 2 May 2022 16:10:19 -0400 Subject: [PATCH] invalid SD card configuration on MRE causes RED, blinking BLUE and no USB :( #4131 --- firmware/config/boards/microrusefi/board.mk | 4 ++++ .../boards/microrusefi/board_configuration.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index 3744f94aa2..a79d58ce0d 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -21,6 +21,10 @@ endif # *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 +# 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_CJ125=FALSE -DBOARD_L9779_COUNT=0 -DEFI_HD44780_LCD=FALSE -DEFI_LCD=FALSE diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index 6b7bab6bf7..caf01ee7d4 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -186,7 +186,6 @@ void setSerialConfigurationOverrides() { void setBoardDefaultConfiguration() { setInjectorPins(); setIgnitionPins(); - engineConfiguration->sdCardCsPin = Gpio::B9; // MRE has a special main relay control low side pin // rusEfi firmware is totally not involved with main relay control on microRusEfi board @@ -210,13 +209,14 @@ void setBoardDefaultConfiguration() { // SPI for SD card -// engineConfiguration->is_enabled_spi_2 = true; -// engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; -// -// engineConfiguration->spi2mosiPin = Gpio::B15; -// engineConfiguration->spi2misoPin = Gpio::B14; -// engineConfiguration->spi2sckPin = Gpio::B13; -// engineConfiguration->sdCardCsPin = Gpio::E15; + engineConfiguration->is_enabled_spi_2 = true; + engineConfiguration->sdCardSpiDevice = SPI_DEVICE_2; + engineConfiguration->isSdCardEnabled = true; + + engineConfiguration->spi2mosiPin = Gpio::B15; + engineConfiguration->spi2misoPin = Gpio::B14; + engineConfiguration->spi2sckPin = Gpio::B13; + engineConfiguration->sdCardCsPin = Gpio::E15; engineConfiguration->specs.cylindersCount = 4; engineConfiguration->specs.firingOrder = FO_1_3_4_2;