noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync with latest(2.7.1) Arduino_Core_STM32 (#1168)

This commit is contained in:
Vitor Moreno B. Sales 2024-01-31 20:20:10 -03:00 committed by GitHub
parent fdb6e492fb
commit 2afcf93adc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
speeduino/src/FRAM/Fram.cpp
View File

@ -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;
}

2
speeduino/src/FRAM/Fram.h
View File

@ -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