diff --git a/firmware/hw_layer/ports/at32/at32_spi.cpp b/firmware/hw_layer/ports/at32/at32_spi.cpp index 64e2d5b477..77b9caf2ee 100644 --- a/firmware/hw_layer/ports/at32/at32_spi.cpp +++ b/firmware/hw_layer/ports/at32/at32_spi.cpp @@ -217,17 +217,17 @@ void initSpiModule(SPIDriver *driver, brain_pin_e sck, brain_pin_e miso, criticalError("Incorrect SPI pin configuration"); } - efiSetPadMode("SPI clock", sck, + efiSetPadMode("SPI CLK ", sck, PAL_MODE_ALTERNATE(sckAf) | sckMode | PAL_STM32_OSPEED_HIGHEST); - efiSetPadMode("SPI master out", mosi, + efiSetPadMode("SPI MOSI", mosi, PAL_MODE_ALTERNATE(mosiAf) | mosiMode | PAL_STM32_OSPEED_HIGHEST); // Activate the internal pullup on MISO: SD cards indicate "busy" by holding MOSI low, // so in case there is no SD card installed, the line could float low and indicate that // the (non existent) card is busy. We pull the line high to indicate "not busy" in case // of a missing card. - efiSetPadMode("SPI master in ", miso, + efiSetPadMode("SPI MISO ", miso, PAL_MODE_ALTERNATE(misoAf) | misoMode | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_PULLUP); } diff --git a/firmware/hw_layer/ports/cypress/mpu_util.cpp b/firmware/hw_layer/ports/cypress/mpu_util.cpp index 253066cd7a..3a1f61813b 100644 --- a/firmware/hw_layer/ports/cypress/mpu_util.cpp +++ b/firmware/hw_layer/ports/cypress/mpu_util.cpp @@ -139,10 +139,10 @@ void initSpiModule(SPIDriver *driver, brain_pin_e sck, brain_pin_e miso, * Info on the silicon defect can be found in this document, section 2.5.2: * https://www.st.com/content/ccc/resource/technical/document/errata_sheet/0a/98/58/84/86/b6/47/a2/DM00037591.pdf/files/DM00037591.pdf/jcr:content/translations/en.DM00037591.pdf */ - efiSetPadMode("SPI clock", sck, PAL_MODE_ALTERNATE(getSpiAf(driver)) /*| sckMode | PAL_STM32_OSPEED_HIGHEST*/); + efiSetPadMode("SPI CLK ", sck, PAL_MODE_ALTERNATE(getSpiAf(driver)) /*| sckMode | PAL_STM32_OSPEED_HIGHEST*/); - efiSetPadMode("SPI master out", mosi, PAL_MODE_ALTERNATE(getSpiAf(driver)) /*| mosiMode | PAL_STM32_OSPEED_HIGHEST*/); - efiSetPadMode("SPI master in ", miso, PAL_MODE_ALTERNATE(getSpiAf(driver)) /*| misoMode | PAL_STM32_OSPEED_HIGHEST*/); + efiSetPadMode("SPI MOSI", mosi, PAL_MODE_ALTERNATE(getSpiAf(driver)) /*| mosiMode | PAL_STM32_OSPEED_HIGHEST*/); + efiSetPadMode("SPI MISO ", miso, PAL_MODE_ALTERNATE(getSpiAf(driver)) /*| misoMode | PAL_STM32_OSPEED_HIGHEST*/); } void initSpiCsNoOccupy(SPIConfig *spiConfig, brain_pin_e csPin) { diff --git a/firmware/hw_layer/ports/kinetis/mpu_util.cpp b/firmware/hw_layer/ports/kinetis/mpu_util.cpp index 324a383378..2577b5965e 100644 --- a/firmware/hw_layer/ports/kinetis/mpu_util.cpp +++ b/firmware/hw_layer/ports/kinetis/mpu_util.cpp @@ -132,10 +132,10 @@ void initSpiModule(SPIDriver *driver, brain_pin_e sck, brain_pin_e miso, * Info on the silicon defect can be found in this document, section 2.5.2: * https://www.st.com/content/ccc/resource/technical/document/errata_sheet/0a/98/58/84/86/b6/47/a2/DM00037591.pdf/files/DM00037591.pdf/jcr:content/translations/en.DM00037591.pdf */ - efiSetPadMode("SPI clock", sck, PAL_MODE_ALTERNATE(getSpiAf(driver)) | sckMode | PAL_STM32_OSPEED_HIGHEST); + efiSetPadMode("SPI CLK ", sck, PAL_MODE_ALTERNATE(getSpiAf(driver)) | sckMode | PAL_STM32_OSPEED_HIGHEST); - efiSetPadMode("SPI master out", mosi, PAL_MODE_ALTERNATE(getSpiAf(driver)) | mosiMode | PAL_STM32_OSPEED_HIGHEST); - efiSetPadMode("SPI master in ", miso, PAL_MODE_ALTERNATE(getSpiAf(driver)) | misoMode | PAL_STM32_OSPEED_HIGHEST); + efiSetPadMode("SPI MOSI", mosi, PAL_MODE_ALTERNATE(getSpiAf(driver)) | mosiMode | PAL_STM32_OSPEED_HIGHEST); + efiSetPadMode("SPI MISO", miso, PAL_MODE_ALTERNATE(getSpiAf(driver)) | misoMode | PAL_STM32_OSPEED_HIGHEST); } void initSpiCsNoOccupy(SPIConfig *spiConfig, brain_pin_e csPin) { diff --git a/firmware/hw_layer/ports/stm32/stm32_spi.cpp b/firmware/hw_layer/ports/stm32/stm32_spi.cpp index 6455233d65..ee3b9e9817 100644 --- a/firmware/hw_layer/ports/stm32/stm32_spi.cpp +++ b/firmware/hw_layer/ports/stm32/stm32_spi.cpp @@ -139,15 +139,15 @@ void initSpiModule(SPIDriver *driver, * Info on the silicon defect can be found in this document, section 2.5.2: * https://www.st.com/content/ccc/resource/technical/document/errata_sheet/0a/98/58/84/86/b6/47/a2/DM00037591.pdf/files/DM00037591.pdf/jcr:content/translations/en.DM00037591.pdf */ - efiSetPadMode("SPI clock", sck, PAL_MODE_ALTERNATE(getSpiAf(driver)) | sckMode | PAL_STM32_OSPEED_HIGHEST); + efiSetPadMode("SPI CLK ", sck, PAL_MODE_ALTERNATE(getSpiAf(driver)) | sckMode | PAL_STM32_OSPEED_HIGHEST); - efiSetPadMode("SPI master out", mosi, PAL_MODE_ALTERNATE(getSpiAf(driver)) | mosiMode | PAL_STM32_OSPEED_HIGHEST); + efiSetPadMode("SPI MOSI", mosi, PAL_MODE_ALTERNATE(getSpiAf(driver)) | mosiMode | PAL_STM32_OSPEED_HIGHEST); // Activate the internal pullup on MISO: SD cards indicate "busy" by holding MOSI low, // so in case there is no SD card installed, the line could float low and indicate that // the (non existent) card is busy. We pull the line high to indicate "not busy" in case // of a missing card. - efiSetPadMode("SPI master in ", miso, PAL_MODE_ALTERNATE(getSpiAf(driver)) | misoMode | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_PULLUP); + efiSetPadMode("SPI MISO", miso, PAL_MODE_ALTERNATE(getSpiAf(driver)) | misoMode | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_PULLUP); } void initSpiCsNoOccupy(SPIConfig *spiConfig, brain_pin_e csPin) {