Skip to content

feat(spi): make SPISettings constructors constexpr #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aymane-ST wants to merge 1 commit into
base: api-patches
Choose a base branch
from
Open

feat(spi): make SPISettings constructors constexpr #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 18 additions & 29 deletions api/HardwareSPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,25 @@ typedef enum {

class SPISettings {
public:
SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode = SPI_CONTROLLER) {
if (__builtin_constant_p(clock)) {
init_AlwaysInline(clock, bitOrder, dataMode, busMode);
} else {
init_MightInline(clock, bitOrder, dataMode, busMode);
}
}

SPISettings(uint32_t clock, BitOrder bitOrder, int dataMode, SPIBusMode busMode = SPI_CONTROLLER) {
if (__builtin_constant_p(clock)) {
init_AlwaysInline(clock, bitOrder, (SPIMode)dataMode, busMode);
} else {
init_MightInline(clock, bitOrder, (SPIMode)dataMode, busMode);
}
}

constexpr SPISettings(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode = SPI_CONTROLLER)
: clockFreq(clock),
dataMode(dataMode),
bitOrder(bitOrder),
busMode(busMode)
{ }
constexpr SPISettings(uint32_t clock, BitOrder bitOrder, int dataMode, SPIBusMode busMode = SPI_CONTROLLER)
: clockFreq(clock),
dataMode((SPIMode)dataMode),
bitOrder(bitOrder),
busMode(busMode)
{ }
// Default speed set to 4MHz, SPI mode set to MODE 0 and Bit order set to MSB first.
SPISettings() { init_AlwaysInline(4000000, MSBFIRST, SPI_MODE0, SPI_CONTROLLER); }
constexpr SPISettings()
: clockFreq(4000000),
dataMode(SPI_MODE0),
bitOrder(MSBFIRST),
busMode(SPI_CONTROLLER)
{ }

bool operator==(const SPISettings& rhs) const
{
Expand Down Expand Up @@ -94,18 +95,6 @@ class SPISettings {
}

private:
void init_MightInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) {
init_AlwaysInline(clock, bitOrder, dataMode, busMode);
}

// Core developer MUST use an helper function in beginTransaction() to use this data
void init_AlwaysInline(uint32_t clock, BitOrder bitOrder, SPIMode dataMode, SPIBusMode busMode) __attribute__((__always_inline__)) {
this->clockFreq = clock;
this->dataMode = dataMode;
this->bitOrder = bitOrder;
this->busMode = busMode;
}

uint32_t clockFreq;
SPIMode dataMode;
BitOrder bitOrder;
Expand Down