Hack in support for other boards/microcontrollers, add GpioDriver
There's definitely plenty of cleanup work to be done (see: "ifdefs").
This commit is contained in:
@@ -27,51 +27,19 @@ namespace BSP {
|
||||
using RC = BSP::ReturnCode;
|
||||
using BSP::Schedule::TaskScheduler;
|
||||
using BSP::Schedule::NextTime;
|
||||
using BSP::GpioPin;
|
||||
using BSP::Time;
|
||||
|
||||
SpiDriver::SpiDriver(TaskScheduler &scheduler)
|
||||
SpiDriver::SpiDriver(TaskScheduler &scheduler, GpioPin &nss)
|
||||
: m_scheduler(scheduler)
|
||||
, m_spi(SPI1)
|
||||
, m_nss(nss)
|
||||
{}
|
||||
|
||||
void SpiDriver::init()
|
||||
{
|
||||
SET(RCC->IOPENR, RCC_IOPENR_IOPAEN);
|
||||
SET(RCC->IOPENR, RCC_IOPENR_IOPBEN);
|
||||
RCC->APB2ENR |= RCC_APB2ENR_SPI1EN;
|
||||
|
||||
/* Assign SPI_MOSI to PB1, since PA7 is taken by LPTIM_OUT */
|
||||
GPIOB->AFR[0] &= ~GPIO_AFRH_AFRH1;
|
||||
GPIOB->AFR[0] |= 1u << GPIO_AFRH_AFRH1_Pos;
|
||||
|
||||
SET_TO(GPIOB->MODER, GPIO_MODER_MODE1, 2u << GPIO_MODER_MODE1_Pos);
|
||||
|
||||
GPIOB->OTYPER &= ~GPIO_OTYPER_OT_1;
|
||||
GPIOB->PUPDR &= ~GPIO_PUPDR_PUPD12;
|
||||
|
||||
// SPI1 NSS (PA4)
|
||||
|
||||
SET_TO(GPIOA->MODER, GPIO_MODER_MODE4, 1u << GPIO_MODER_MODE4_Pos);
|
||||
|
||||
GPIOA->OTYPER &= ~GPIO_OTYPER_OT_4;
|
||||
GPIOA->PUPDR &= ~GPIO_PUPDR_PUPD4;
|
||||
|
||||
// SPI1 SCK (PA5)
|
||||
GPIOA->AFR[0] &= ~GPIO_AFRL_AFRL5;
|
||||
|
||||
SET_TO(GPIOA->MODER, GPIO_MODER_MODE5, 2u << GPIO_MODER_MODE5_Pos);
|
||||
|
||||
GPIOA->OTYPER &= ~GPIO_OTYPER_OT_5;
|
||||
GPIOA->PUPDR &= ~GPIO_PUPDR_PUPD5;
|
||||
|
||||
// SPI1 MISO (PA6)
|
||||
GPIOA->AFR[0] &= ~GPIO_AFRL_AFRL6;
|
||||
|
||||
SET_TO(GPIOA->MODER, GPIO_MODER_MODE6, 2u << GPIO_MODER_MODE6_Pos);
|
||||
|
||||
GPIOA->OTYPER &= ~GPIO_OTYPER_OT_6;
|
||||
GPIOA->PUPDR &= ~GPIO_PUPDR_PUPD6;
|
||||
|
||||
// Enable Master mode and half the baud rate, so it's set to ~1MHz
|
||||
m_spi->CR1 |= SPI_CR1_MSTR | SPI_CR1_LSBFIRST | SPI_CR1_SSM;
|
||||
//m_spi->CR1 |= 1u << SPI_CR1_BR_Pos;
|
||||
@@ -91,17 +59,14 @@ RC SpiDriver::tx_blocking(const uint8_t *data, size_t len)
|
||||
|
||||
m_spi->CR1 |= SPI_CR1_SPE;
|
||||
|
||||
//FLIP(GPIOB->ODR, GPIO_ODR_OD3);
|
||||
CLR(m_spi->CR1, SPI_CR1_SSI);
|
||||
SET(GPIOA->ODR, GPIO_ODR_OD4);
|
||||
m_nss.write(1);
|
||||
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
while (!(m_spi->SR & SPI_SR_TXE)) {}
|
||||
m_spi->DR = data[i];
|
||||
}
|
||||
|
||||
//FLIP(GPIOB->ODR, GPIO_ODR_OD3);
|
||||
|
||||
while (!(m_spi->SR & SPI_SR_TXE)) {}
|
||||
|
||||
// Ensure that NSS is held for long enough to meet the display's thSCS
|
||||
@@ -109,6 +74,7 @@ RC SpiDriver::tx_blocking(const uint8_t *data, size_t len)
|
||||
|
||||
m_spi->CR1 &= ~SPI_CR1_SPE;
|
||||
SET(m_spi->CR1, SPI_CR1_SSI);
|
||||
m_nss.write(0);
|
||||
CLR(GPIOA->ODR, GPIO_ODR_OD4);
|
||||
|
||||
return RC::OK;
|
||||
|
||||
Reference in New Issue
Block a user