Merge pull request #124 from bmourit/patch-2

SPI fix for MSB code
CommunityGD32Cores · Apr 20, 2024 · c9e2b2f · c9e2b2f
2 parents 8f14963 + 89ed65b
commit c9e2b2f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp
@@ -114,11 +114,11 @@ uint16_t SPIClass::transfer16(uint16_t val16)
     if (spisettings.bitorder == LSBFIRST) {
         rec_data0 = transfer(trans_data0);
         rec_data1 = transfer(trans_data1);
-        out_halfword = uint16_t(rec_data0 || rec_data1 << 8);
+        out_halfword = uint16_t(rec_data0 | (rec_data1 << 8));
     } else {
         rec_data0 = transfer(trans_data1);
         rec_data1 = transfer(trans_data0);
-        out_halfword = uint16_t(rec_data1 || rec_data0 << 8);
+        out_halfword = uint16_t(rec_data1 | (rec_data0 << 8));
     }
 
     return out_halfword;