Skip to content

Commit

Permalink
Merge pull request #13264 from gschorcht/sys/arduinu/fix_spi_ndebug_e…
Browse files Browse the repository at this point in the history
…rror

sys/arduino: fix of compilation error in with NDEBUG
  • Loading branch information
maribu authored Feb 3, 2020
2 parents e2312d4 + 3455574 commit 7692093
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions sys/arduino/SPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ extern "C" {

SPISettings::SPISettings(uint32_t clock_hz, uint8_t bitOrder, uint8_t dataMode)
{
(void)bitOrder;

static const spi_clk_t clocks[] = {
SPI_CLK_10MHZ, SPI_CLK_5MHZ, SPI_CLK_1MHZ, SPI_CLK_400KHZ
};
Expand Down Expand Up @@ -80,6 +82,9 @@ void SPIClass::beginTransaction(SPISettings settings)
settings.mode, settings.clock);
/* No support for exceptions (at least on AVR), resort to assert() */
assert(retval == SPI_OK);
if (retval != SPI_OK) {
return;
}
is_transaction = true;
}

Expand All @@ -99,6 +104,9 @@ void SPIClass::transfer(void *buf, size_t count)
settings.mode, settings.clock);
/* No support for exceptions (at least on AVR), resort to assert() */
assert(retval == SPI_OK);
if (retval != SPI_OK) {
return;
}
}
spi_transfer_bytes(spi_dev, SPI_CS_UNDEF, false, buf, buf, count);
if (!is_transaction) {
Expand All @@ -110,6 +118,7 @@ void SPIClass::transfer(void *buf, size_t count)

void SPIClass::setBitOrder(uint8_t order)
{
(void)order;
assert(order == MSBFIRST);
}

Expand Down

0 comments on commit 7692093

Please sign in to comment.