eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

FSFW Update #21

Merged
meierj merged 26 commits from mueller/unittest-fixes into eive/develop 2021-09-29 15:45:40 +02:00
Conversation 1 Commits 26 Files Changed 16 +679 -240
11 changed files with 679 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5fd7a8c9b7 - Show all commits

4
src/fsfw/osal/common/TcpTmTcServer.cpp
View File

@@ -185,7 +185,7 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
size_t availableReadData = ringBuffer.getAvailableReadData(); size_t availableReadData = ringBuffer.getAvailableReadData();
if(availableReadData > lastRingBufferSize) { if(availableReadData > lastRingBufferSize) {
tcAvailable = true; tcAvailable = true;
handleRingBufferData(availableReadData); handleTcRingBufferData(availableReadData);
} }
ReturnValue_t result = handleTmSending(connSocket, tmSent); ReturnValue_t result = handleTmSending(connSocket, tmSent);
if(result == CONN_BROKEN) { if(result == CONN_BROKEN) {
@@ -287,7 +287,7 @@ ReturnValue_t TcpTmTcServer::handleTmSending(socket_t connSocket, bool& tmSent)
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
ReturnValue_t TcpTmTcServer::handleRingBufferData(size_t availableReadData) { ReturnValue_t TcpTmTcServer::handleTcRingBufferData(size_t availableReadData) {
ReturnValue_t status = HasReturnvaluesIF::RETURN_OK; ReturnValue_t status = HasReturnvaluesIF::RETURN_OK;
ReturnValue_t result = HasReturnvaluesIF::RETURN_OK; ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
size_t readAmount = availableReadData; size_t readAmount = availableReadData;

2
src/fsfw/osal/common/TcpTmTcServer.h
View File

@@ -129,7 +129,7 @@ private:
void handleServerOperation(socket_t& connSocket); void handleServerOperation(socket_t& connSocket);
ReturnValue_t handleTcReception(uint8_t* spacePacket, size_t packetSize); ReturnValue_t handleTcReception(uint8_t* spacePacket, size_t packetSize);
ReturnValue_t handleTmSending(socket_t connSocket, bool& tmSent); ReturnValue_t handleTmSending(socket_t connSocket, bool& tmSent);
ReturnValue_t handleRingBufferData(size_t availableReadData); ReturnValue_t handleTcRingBufferData(size_t availableReadData);
void handleSocketError(ConstStorageAccessor& accessor); void handleSocketError(ConstStorageAccessor& accessor);
}; };