mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
into mueller_framework
This commit is contained in:
Robin Müller
2020-04-18 13:30:22 +02:00
parent ea1d55b033 05c1330b68
commit a405357578
16 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
memory/MemoryHelper.cpp
View File

@ -1,4 +1,4 @@
#include <framework/globalfunctions/crc_ccitt.h>
#include <framework/globalfunctions/CRC.h>
#include <framework/memory/MemoryHelper.h>
#include <framework/memory/MemoryMessage.h>
#include <framework/objectmanager/ObjectManagerIF.h>
@ -98,7 +98,7 @@ void MemoryHelper::completeDump(ReturnValue_t errorCode,
break;
}
case MemoryMessage::CMD_MEMORY_CHECK: {
uint16_t crc = ::Calculate_CRC(reservedSpaceInIPC, size);
uint16_t crc = CRC::crc16ccitt(reservedSpaceInIPC, size);
//Delete data immediately, was temporary.
ipcStore->deleteData(ipcAddress);
MemoryMessage::setMemoryCheckReply(&reply, crc);