From c07c8dc88ef8b65fd40c323a7f90ebc87a21ab57 Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Sat, 3 Jun 2017 00:37:45 -0500 Subject: [PATCH] Small cleanup to SPI write16 and write32 for big-endian Merge a common line. --- libraries/SPI/SPI.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp index 9431077c4..a5638d9c6 100644 --- a/libraries/SPI/SPI.cpp +++ b/libraries/SPI/SPI.cpp @@ -343,12 +343,11 @@ void SPIClass::write16(uint16_t data, bool msb) { if(msb) { // MSBFIRST Byte first SPI1W0 = (data >> 8) | (data << 8); - SPI1CMD |= SPIBUSY; } else { // LSBFIRST Byte first SPI1W0 = data; - SPI1CMD |= SPIBUSY; } + SPI1CMD |= SPIBUSY; while(SPI1CMD & SPIBUSY) {} } @@ -367,14 +366,11 @@ void SPIClass::write32(uint32_t data, bool msb) { } data_; data_.l = data; // MSBFIRST Byte first - SPI1W0 = (data_.b[3] | (data_.b[2] << 8) | (data_.b[1] << 16) | (data_.b[0] << 24)); - SPI1CMD |= SPIBUSY; - } else { - // LSBFIRST Byte first - SPI1W0 = data; - SPI1CMD |= SPIBUSY; + data = (data_.b[3] | (data_.b[2] << 8) | (data_.b[1] << 16) | (data_.b[0] << 24)); } - while(SPI1CMD & SPIBUSY) {} + SPI1W0 = data; + SPI1CMD |= SPIBUSY; + while(SPI1CMD & SPIBUSY) {} } /**