resolved small errors

pull/2/head
polymurph 3 years ago
parent 731af596ae
commit 3ebf3744f3

@ -63,7 +63,7 @@ void spi_setPolarity(spiCH_t spi_hw_ch, spi_clkPol_t clkPol);
* @param spi_hw_ch SPI hardware cannel * @param spi_hw_ch SPI hardware cannel
* @param framef Frame format * @param framef Frame format
*/ */
void spi_set_setFrameFormat(spiCH_t spi_hw_ch, spi_framef_t framef); void spi_setFrameFormat(spiCH_t spi_hw_ch, spi_framef_t framef);
/** /**
* @brief Set Clock Prescaler * @brief Set Clock Prescaler

@ -20,8 +20,8 @@ typedef uint8_t (*readReg_t) (uint8_t);
* select. * select.
* */ * */
typedef struct{ typedef struct{
pinNo_t pin, /*!< pin number */ pinNo_t pin; /*!< pin number */
spiCH_t spi /*!< spi hardware channel number */ spiCH_t spi; /*!< spi hardware channel number */
}spi_ch_t; }spi_ch_t;
/** /**

@ -230,7 +230,6 @@ static const uint32_t timerRes_Prescaler[MAX_TIMER_CHANNEL_COUNT] = {
0xFFFF, /*!< Timer 17 Prescaler Max Value */ 0xFFFF, /*!< Timer 17 Prescaler Max Value */
}; };
/*! /*!
* RCC Bus number index list connected to the SPI * RCC Bus number index list connected to the SPI
* */ * */

@ -7,13 +7,12 @@
void spi_init(spiCH_t spi_hw_ch) void spi_init(spiCH_t spi_hw_ch)
{ {
spi_reset(spi_hw_ch); spi_reset(spi_hw_ch);
// TODO implement bittwiddeling etc. for generic SPI init // TODO implement bittwiddeling etc. for generic SPI init
RCC->APB2ENR |= (1<<12); // Enable SPI1 CLock RCC->APB2ENR |= (1<<12); // Enable SPI1 CLock
//SPI1->CR1 |= (1<<0)|(1<<1); // CPOL=1, CPHA=1 //SPI1->CR1 |= (1<<0)|(1<<1); // CPOL=1, CPHA=1
SPI_BASE->CR1(1<<2) SPI_BASE->CR1 |= (1<<2) | (1 << 1);
//SPI1->CR1 |= (1<<2); // Master Mode //SPI1->CR1 |= (1<<2); // Master Mode
SPI_BASE->CR1 |= (1 << 2); SPI_BASE->CR1 |= (1 << 2);
@ -59,11 +58,6 @@ void spi_setPolarity(spiCH_t spi_hw_ch, spi_clkPol_t clkPol)
//TODO void spi_setPolarity(spi_clkPol_t clkPol); //TODO void spi_setPolarity(spi_clkPol_t clkPol);
} }
void spi_set_setFrameFormat(spiCH_t spi_hw_ch, spi_framef_t framef)
{
//TODO void spi_set_setFrameFormat(spi_framef_t framef);
}
void spi_set_setFrameFormat(spiCH_t spi_hw_ch, spi_framef_t framef) void spi_set_setFrameFormat(spiCH_t spi_hw_ch, spi_framef_t framef)
{ {
// TODO void spi_set_setFrameFormat(spi_framef_t framef); // TODO void spi_set_setFrameFormat(spi_framef_t framef);

@ -5,7 +5,7 @@
#include "ascii.h" #include "ascii.h"
#include "timer.h" #include "timer.h"
#include "spi.h" #include "spi.h"
#include "spi_ch.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])

Loading…
Cancel
Save