Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix STM32F1 SPI device init, MKS_LCD12864 #19271

Merged
merged 8 commits into from Sep 6, 2020
Merged

Fix STM32F1 SPI device init, MKS_LCD12864 #19271

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
876943c
start hal spi with accord with board pins definition, not hardcoded 1
rhapsodyv Sep 5, 2020
ab850d3
better code
rhapsodyv Sep 5, 2020
d72d26e
lcd need some delay after the init sequence; it fixes the show bootsc…
rhapsodyv Sep 6, 2020
2044dba
now that the MKS_LCD12864 have the init fixed, it can have that init_…
rhapsodyv Sep 6, 2020
a1587a7
remove duplicated ENABLE_SPI2
rhapsodyv Sep 6, 2020
f385531
remove old code
rhapsodyv Sep 6, 2020
2f20711
better place for the init delay
rhapsodyv Sep 6, 2020
0a596c2
Update u8g_dev_uc1701_mini12864_HAL.cpp
thinkyhead Sep 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion Marlin/src/HAL/STM32F1/SPI.cpp
View file
Open in desktop
Expand Up @@ -40,6 +40,9 @@
#include <boards.h>
#include <wirish.h>

#include "../../inc/MarlinConfig.h"
#include "spi_pins.h"

/** Time in ms for DMA receive timeout */
#define DMA_TIMEOUT 100

Expand Down Expand Up @@ -710,6 +713,6 @@ static spi_baud_rate determine_baud_rate(spi_dev *dev, uint32_t freq) {
return baud_rates[i];
}

SPIClass SPI(1);
SPIClass SPI(SPI_DEVICE);

#endif // __STM32F1__