Moved function implementation inside class

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

71
spi.hpp
View File

@ -17,36 +17,18 @@ 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);
static io::Pin<io::P::B5> sm_cSCK;
static io::Pin<io::P::B4> sm_cMISO;
static io::Pin<io::P::B3> sm_cMOSI;
static io::Pin<io::P::B2> sm_cSS;
public:
static void init(ClockDiv enmClockDiv = ClockDiv::CLKDIV_128, Mode enmMode = Mode::MODE_0, bool bMaster = true,
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) { if (bCPOL) {
SPCR |= (1 << CPOL); SPCR |= (1 << CPOL);
@ -54,9 +36,7 @@ void Spi::setCPOL(bool bCPOL)
SPCR &= ~(1 << CPOL); SPCR &= ~(1 << CPOL);
} }
} }
static void setCPHA(bool bCPHA)
//////////////////////////////////////////////////////////////////////////
void Spi::setCPHA(bool bCPHA)
{ {
if (bCPHA) { if (bCPHA) {
SPCR |= (1 << CPHA); SPCR |= (1 << CPHA);
@ -65,9 +45,14 @@ void Spi::setCPHA(bool bCPHA)
} }
} }
////////////////////////////////////////////////////////////////////////// static io::Pin<io::P::B5> sm_cSCK;
void Spi::init(ClockDiv enmClockDiv /* = ClockDiv::CLKDIV_128 */, Mode enmMode /* = Mode::MODE_0 */, static io::Pin<io::P::B4> sm_cMISO;
bool bMaster /* = true */, bool bLSBFirst /* = false */, bool bMISOPullup /* = false */) static io::Pin<io::P::B3> sm_cMOSI;
static io::Pin<io::P::B2> sm_cSS;
public:
static void 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);
@ -93,8 +78,7 @@ void Spi::init(ClockDiv enmClockDiv /* = ClockDiv::CLKDIV_128 */, Mode enmMode /
SPCR |= (1 << SPE); SPCR |= (1 << SPE);
} }
////////////////////////////////////////////////////////////////////////// static void deinit()
void Spi::deinit()
{ {
SPCR = 0; SPCR = 0;
@ -104,8 +88,7 @@ void Spi::deinit()
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);
@ -128,8 +111,7 @@ void Spi::setClockDiv(ClockDiv enmClockDiv)
} }
} }
////////////////////////////////////////////////////////////////////////// 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);
@ -144,8 +126,7 @@ void Spi::setMode(Mode enmMode)
} }
} }
////////////////////////////////////////////////////////////////////////// static void setMaster(bool bMaster)
void Spi::setMaster(bool bMaster)
{ {
if (bMaster) { if (bMaster) {
SPCR |= (1 << MSTR); SPCR |= (1 << MSTR);
@ -154,8 +135,7 @@ void Spi::setMaster(bool bMaster)
} }
} }
////////////////////////////////////////////////////////////////////////// static void setBitOrder(bool bLSBFirst)
void Spi::setBitOrder(bool bLSBFirst)
{ {
if (bLSBFirst) { if (bLSBFirst) {
SPCR |= (1 << DORD); SPCR |= (1 << DORD);
@ -164,8 +144,7 @@ void Spi::setBitOrder(bool bLSBFirst)
} }
} }
////////////////////////////////////////////////////////////////////////// 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)))
@ -173,10 +152,10 @@ uint8_t Spi::transfer(uint8_t ui8Data)
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