Moved function implementation inside class

This commit is contained in:
BlackMark 2020-02-21 17:01:56 +01:00
parent d28cfc2929
commit 8e6c3738f8

117
spi.hpp
View File

@ -17,14 +17,33 @@ class Spi {
CLKDIV_2X_2 = 4, CLKDIV_2X_2 = 4,
CLKDIV_2X_8 = 5, CLKDIV_2X_8 = 5,
CLKDIV_2X_32 = 6, CLKDIV_2X_32 = 6,
CLKDIV_2X_64 = 7 CLKDIV_2X_64 = 7,
}; };
enum class Mode { MODE_0 = 0, MODE_1 = 1, MODE_2 = 2, MODE_3 = 3 }; enum class Mode {
MODE_0 = 0,
MODE_1 = 1,
MODE_2 = 2,
MODE_3 = 3,
};
private: private:
static void setCPOL(bool bCPOL); static void setCPOL(bool bCPOL)
static void setCPHA(bool bCPHA); {
if (bCPOL) {
SPCR |= (1 << CPOL);
} else {
SPCR &= ~(1 << CPOL);
}
}
static void setCPHA(bool bCPHA)
{
if (bCPHA) {
SPCR |= (1 << CPHA);
} else {
SPCR &= ~(1 << CPHA);
}
}
static io::Pin<io::P::B5> sm_cSCK; static io::Pin<io::P::B5> sm_cSCK;
static io::Pin<io::P::B4> sm_cMISO; static io::Pin<io::P::B4> sm_cMISO;
@ -33,42 +52,8 @@ class Spi {
public: public:
static void init(ClockDiv enmClockDiv = ClockDiv::CLKDIV_128, Mode enmMode = Mode::MODE_0, bool bMaster = true, static void init(ClockDiv enmClockDiv = ClockDiv::CLKDIV_128, Mode enmMode = Mode::MODE_0, bool bMaster = true,
bool bLSBFirst = false, bool bMISOPullup = false); bool bLSBFirst = false, bool bMISOPullup = false)
static void deinit(); {
static void setClockDiv(ClockDiv enmClockDiv);
static void setMode(Mode enmMode);
static void setMaster(bool bMaster);
static void setBitOrder(bool bLSBFirst);
static uint8_t transfer(uint8_t ui8Data);
static void select(bool bSelect);
};
//////////////////////////////////////////////////////////////////////////
void Spi::setCPOL(bool bCPOL)
{
if (bCPOL) {
SPCR |= (1 << CPOL);
} else {
SPCR &= ~(1 << CPOL);
}
}
//////////////////////////////////////////////////////////////////////////
void Spi::setCPHA(bool bCPHA)
{
if (bCPHA) {
SPCR |= (1 << CPHA);
} else {
SPCR &= ~(1 << CPHA);
}
}
//////////////////////////////////////////////////////////////////////////
void Spi::init(ClockDiv enmClockDiv /* = ClockDiv::CLKDIV_128 */, Mode enmMode /* = Mode::MODE_0 */,
bool bMaster /* = true */, bool bLSBFirst /* = false */, bool bMISOPullup /* = false */)
{
if (bMaster) { if (bMaster) {
sm_cSS.write(true); sm_cSS.write(true);
@ -91,22 +76,20 @@ void Spi::init(ClockDiv enmClockDiv /* = ClockDiv::CLKDIV_128 */, Mode enmMode /
setBitOrder(bLSBFirst); setBitOrder(bLSBFirst);
SPCR |= (1 << SPE); SPCR |= (1 << SPE);
} }
////////////////////////////////////////////////////////////////////////// static void deinit()
void Spi::deinit() {
{
SPCR = 0; SPCR = 0;
sm_cSCK.dir(io::Dir::IN); sm_cSCK.dir(io::Dir::IN);
sm_cMISO.dir(io::Dir::IN); sm_cMISO.dir(io::Dir::IN);
sm_cMOSI.dir(io::Dir::IN); sm_cMOSI.dir(io::Dir::IN);
sm_cSS.dir(io::Dir::IN); sm_cSS.dir(io::Dir::IN);
} }
////////////////////////////////////////////////////////////////////////// static void setClockDiv(ClockDiv enmClockDiv)
void Spi::setClockDiv(ClockDiv enmClockDiv) {
{
uint8_t ui8ClockDiv = static_cast<uint8_t>(enmClockDiv); uint8_t ui8ClockDiv = static_cast<uint8_t>(enmClockDiv);
if (ui8ClockDiv & 1) { if (ui8ClockDiv & 1) {
@ -126,11 +109,10 @@ void Spi::setClockDiv(ClockDiv enmClockDiv)
} else { } else {
SPSR &= ~(1 << SPI2X); SPSR &= ~(1 << SPI2X);
} }
} }
////////////////////////////////////////////////////////////////////////// static void setMode(Mode enmMode)
void Spi::setMode(Mode enmMode) {
{
if (enmMode == Mode::MODE_0 || enmMode == Mode::MODE_1) { if (enmMode == Mode::MODE_0 || enmMode == Mode::MODE_1) {
setCPOL(false); setCPOL(false);
} else { } else {
@ -142,41 +124,38 @@ void Spi::setMode(Mode enmMode)
} else { } else {
setCPHA(true); setCPHA(true);
} }
} }
////////////////////////////////////////////////////////////////////////// static void setMaster(bool bMaster)
void Spi::setMaster(bool bMaster) {
{
if (bMaster) { if (bMaster) {
SPCR |= (1 << MSTR); SPCR |= (1 << MSTR);
} else { } else {
SPCR &= ~(1 << MSTR); SPCR &= ~(1 << MSTR);
} }
} }
////////////////////////////////////////////////////////////////////////// static void setBitOrder(bool bLSBFirst)
void Spi::setBitOrder(bool bLSBFirst) {
{
if (bLSBFirst) { if (bLSBFirst) {
SPCR |= (1 << DORD); SPCR |= (1 << DORD);
} else { } else {
SPCR &= ~(1 << DORD); SPCR &= ~(1 << DORD);
} }
} }
////////////////////////////////////////////////////////////////////////// static uint8_t transfer(uint8_t ui8Data)
uint8_t Spi::transfer(uint8_t ui8Data) {
{
SPDR = ui8Data; SPDR = ui8Data;
while (!(SPSR & (1 << SPIF))) while (!(SPSR & (1 << SPIF)))
; ;
return SPDR; return SPDR;
} }
////////////////////////////////////////////////////////////////////////// static void select(bool bSelect)
void Spi::select(bool bSelect) {
{
sm_cSS.write(!bSelect); sm_cSS.write(!bSelect);
} }
};
} // namespace spi } // namespace spi