Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-08-13 13:46:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Branch_flash_pr_with_large_eeprom' of https://github.com/SirSydom/knx into Branch_flash_pr_with_large_eeprom

Browse Source
This commit is contained in:
SirSydom 2022-02-19 09:06:27 +01:00
commit 4513e1de2a
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/knx/platform.cpp
View File

@ -179,8 +179,8 @@ uint32_t Platform::writeNonVolatileMemory(uint32_t relativeAddress, uint8_t* buf
while (size > 0) while (size > 0)
{ {
loadEraseblockContaining(relativeAddress); loadEraseblockContaining(relativeAddress);
uint32_t start = bufferedEraseBlockStart(); uint32_t start = _bufferedEraseblockNumber * (flashEraseBlockSize() * flashPageSize());
uint32_t end = bufferedEraseBlockEnd(); uint32_t end = start + (flashEraseBlockSize() * flashPageSize());
ptrdiff_t offset = relativeAddress - start; ptrdiff_t offset = relativeAddress - start;
ptrdiff_t length = end - relativeAddress; ptrdiff_t length = end - relativeAddress;
@ -217,17 +217,6 @@ void Platform::loadEraseblockContaining(uint32_t relativeAddress)
bufferEraseBlock(blockNum); bufferEraseBlock(blockNum);
} }
uint32_t Platform::bufferedEraseBlockStart()
{
return _bufferedEraseblockNumber * (flashEraseBlockSize() * flashPageSize());
}
uint32_t Platform::bufferedEraseBlockEnd()
{
return (_bufferedEraseblockNumber + 1) * (flashEraseBlockSize() * flashPageSize()) -1;
}
int32_t Platform::getEraseBlockNumberOf(uint32_t relativeAddress) int32_t Platform::getEraseBlockNumberOf(uint32_t relativeAddress)
{ {
return relativeAddress / (flashEraseBlockSize() * flashPageSize()); return relativeAddress / (flashEraseBlockSize() * flashPageSize());

2
src/knx/platform.h
View File

@ -98,8 +98,6 @@ class Platform
NvMemoryType _memoryType = Eeprom; NvMemoryType _memoryType = Eeprom;
void loadEraseblockContaining(uint32_t relativeAddress); void loadEraseblockContaining(uint32_t relativeAddress);
uint32_t bufferedEraseBlockStart();
uint32_t bufferedEraseBlockEnd();
int32_t getEraseBlockNumberOf(uint32_t relativeAddress); int32_t getEraseBlockNumberOf(uint32_t relativeAddress);
// writes _eraseblockBuffer to flash // writes _eraseblockBuffer to flash
virtual void writeBufferedEraseBlock(); virtual void writeBufferedEraseBlock();