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

Restore STM32F1 series to working order. (#10229)

Browse Source 
The `_O2` attribute is no longer needed on the malyanlcd function, and the macros have broken timer numbers - reset this to a function to return the right device. Also fix the bit order cast in SPI.
This commit is contained in:
xC0000005
2018-03-28 11:07:52 -07:00
committed by Scott Lahteine
parent d1f14202a9
commit 7dc256432f
6 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp
View File

@@ -41,6 +41,7 @@
#include "pins_arduino.h"
#include "spi_pins.h"
#include "../../core/macros.h"
#include <spi.h>
// --------------------------------------------------------------------------
// Public Variables
@@ -166,7 +167,7 @@ void spiSendBlock(uint8_t token, const uint8_t* buf) {
/** Begin SPI transaction, set clock, bit order, data mode */
void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
spiConfig = SPISettings(spiClock, bitOrder, dataMode);
spiConfig = SPISettings(spiClock, (BitOrder)bitOrder, dataMode);
SPI.beginTransaction(spiConfig);
}