From 2afcf93adc359063a08118b35f205029bc6e47b5 Mon Sep 17 00:00:00 2001
From: "Vitor Moreno B. Sales" <vitor.m.benevides@outlook.com>
Date: Wed, 31 Jan 2024 20:20:10 -0300
Subject: [PATCH] Sync with latest(2.7.1) Arduino_Core_STM32 (#1168)

---
 speeduino/src/FRAM/Fram.cpp | 18 +++---------------
 speeduino/src/FRAM/Fram.h   |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/speeduino/src/FRAM/Fram.cpp b/speeduino/src/FRAM/Fram.cpp
index 4398001f..6cd4322f 100644
--- a/speeduino/src/FRAM/Fram.cpp
+++ b/speeduino/src/FRAM/Fram.cpp
@@ -114,12 +114,8 @@ void FramClass::setClock(uint32_t clockSpeed) {
   spiSpeed = 1000000 / (clockSpeed * 2);
   #ifdef SPI_HAS_TRANSACTION
   FRAMSettings = SPISettings(clockSpeed, MSBFIRST, SPI_MODE0);
-  #if defined(ARDUINO_ARCH_STM32)
-  spi->beginTransaction(csPin, FRAMSettings);
-  #else
   spi->beginTransaction(FRAMSettings);
   #endif
-  #endif
 }
 
 /*-----------------------------------------------------------------------------*/
@@ -227,7 +223,7 @@ uint8_t FramClass::read (uint32_t addr, uint8_t *dataBuffer, uint16_t count)
   spiSend(FRAM_CMD_READ);
   sendAddr(addr);
   for (uint16_t i=0; i < count; ++i)
-    dataBuffer[i] = spiSend(DUMMYBYTE);
+    dataBuffer[i] = spiSend(FRAM_DUMMYBYTE);
   deassertCS();
 
   return 1U;
@@ -242,7 +238,7 @@ uint8_t FramClass::read (uint32_t addr)
   assertCS();
   spiSend(FRAM_CMD_READ);
   sendAddr(addr);
-  dataBuffer = spiSend(DUMMYBYTE);
+  dataBuffer = spiSend(FRAM_DUMMYBYTE);
   deassertCS();
 
   return dataBuffer;
@@ -283,7 +279,7 @@ uint8_t FramClass::readSR(void)
 
   assertCS();
   spiSend(FRAM_CMD_RDSR);
-  dataBuffer = spiSend(DUMMYBYTE);
+  dataBuffer = spiSend(FRAM_DUMMYBYTE);
   deassertCS();
 
   return dataBuffer;
@@ -320,11 +316,7 @@ uint8_t FramClass::spiSend(uint8_t data)
     }
     fastWrite(clkPort, clkMask, LOW);
   }
-#if defined(ARDUINO_ARCH_STM32)
-  else { reply = spi->transfer(csPin, data, SPI_CONTINUE); }
-#else
   else { reply = spi->transfer(data); }
-#endif
   return reply;
 }
 
@@ -345,11 +337,7 @@ uint16_t FramClass::spiSend16(uint16_t data)
     }
     fastWrite(clkPort, clkMask, LOW);
   }
-#if defined(ARDUINO_ARCH_STM32)
-  else { reply = spi->transfer16(csPin, data, SPI_CONTINUE); }
-#else
   else { reply = spi->transfer16(data); }
-#endif
   return reply;
 }
 
diff --git a/speeduino/src/FRAM/Fram.h b/speeduino/src/FRAM/Fram.h
index 0bbdc63a..0b30bf70 100644
--- a/speeduino/src/FRAM/Fram.h
+++ b/speeduino/src/FRAM/Fram.h
@@ -41,7 +41,7 @@
 // MB85RS64A - 256 K (32 K x 8) bit SPI FRAM
 #define FRAM_SIZE 0x8000UL
 
-#define DUMMYBYTE  0xFE	//dummy bytes to make easier to sniff
+#define FRAM_DUMMYBYTE 0xFE	//dummy bytes to make easier to sniff
 
 #define FRAM_CMD_WREN  0x06	//write enable
 #define FRAM_CMD_WRDI  0x04	//write disable