thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SPI_SD Outside of HAL_STM32F1 (#14306)

Browse Source
This commit is contained in:
3DSmitty
2019-06-18 03:38:18 -04:00
committed by Scott Lahteine
parent 089d12df16
commit 5b13abcacb
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp
View File

@@ -113,9 +113,7 @@ void spiInit(uint8_t spiRate) {
* @details
*/
uint8_t spiRec(void) {
WRITE(SS_PIN, LOW);
uint8_t returnByte = SPI.transfer(0xFF);
WRITE(SS_PIN, HIGH);
return returnByte;
}
@@ -129,9 +127,7 @@ uint8_t spiRec(void) {
* @details Uses DMA
*/
void spiRead(uint8_t* buf, uint16_t nbyte) {
WRITE(SS_PIN, LOW);
SPI.dmaTransfer(0, const_cast<uint8_t*>(buf), nbyte);
WRITE(SS_PIN, HIGH);
}
/**
@@ -142,9 +138,7 @@ void spiRead(uint8_t* buf, uint16_t nbyte) {
* @details
*/
void spiSend(uint8_t b) {
WRITE(SS_PIN, LOW);
SPI.send(b);
WRITE(SS_PIN, HIGH);
}
/**
@@ -156,10 +150,8 @@ void spiSend(uint8_t b) {
* @details Use DMA
*/
void spiSendBlock(uint8_t token, const uint8_t* buf) {
WRITE(SS_PIN, LOW);
SPI.send(token);
SPI.dmaSend(const_cast<uint8_t*>(buf), 512);
WRITE(SS_PIN, HIGH);
}
#if ENABLED(SPI_EEPROM)