eive/fsfw
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 +70 -63
3 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c7ce568a30 - Show all commits

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

@ -324,26 +324,23 @@ ReturnValue_t TcpTmTcServer::handleTcRingBufferData(size_t availableReadData) {
size_t startIdx = 0; size_t startIdx = 0;
size_t foundSize = 0; size_t foundSize = 0;
size_t readLen = 0; size_t readLen = 0;
while(readLen <= readAmount) { while(readLen < readAmount) {
result = spacePacketParser->parseSpacePackets(bufPtrPtr, readAmount, result = spacePacketParser->parseSpacePackets(bufPtrPtr, readAmount,
startIdx, foundSize, readLen); startIdx, foundSize, readLen);
if(result == SpacePacketParser::NO_PACKET_FOUND) { switch(result) {
ringBuffer.deleteData(foundSize); case(SpacePacketParser::NO_PACKET_FOUND):
lastRingBufferSize = ringBuffer.getAvailableReadData(); case(SpacePacketParser::SPLIT_PACKET): {
break;
} }
else if(result == SpacePacketParser::SPLIT_PACKET) { case(HasReturnvaluesIF::RETURN_OK): {
// might be half of a packet? Skip it for now
ringBuffer.deleteData(foundSize);
lastRingBufferSize = ringBuffer.getAvailableReadData();
}
else if(result == HasReturnvaluesIF::RETURN_OK) {
result = handleTcReception(receptionBuffer.data() + startIdx, foundSize); result = handleTcReception(receptionBuffer.data() + startIdx, foundSize);
ringBuffer.deleteData(foundSize);
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {
status = result; status = result;
} }
lastRingBufferSize = ringBuffer.getAvailableReadData();
} }
}
ringBuffer.deleteData(foundSize);
lastRingBufferSize = ringBuffer.getAvailableReadData();
std::memset(receptionBuffer.data() + startIdx, 0, foundSize); std::memset(receptionBuffer.data() + startIdx, 0, foundSize);
} }
return status; return status;

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

@ -127,7 +127,7 @@ private:
SpacePacketParser* spacePacketParser = nullptr; SpacePacketParser* spacePacketParser = nullptr;
uint8_t lastRingBufferSize = 0; uint8_t lastRingBufferSize = 0;
void handleServerOperation(socket_t& connSocket); virtual 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 handleTcRingBufferData(size_t availableReadData); ReturnValue_t handleTcRingBufferData(size_t availableReadData);

10
src/fsfw/tmtcpacket/SpacePacket.h
View File

@ -31,6 +31,16 @@ public:
* The class's default destructor. * The class's default destructor.
*/ */
virtual ~SpacePacket(); virtual ~SpacePacket();
static constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
uint16_t tcPacketId = (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
return tcPacketId;
}
static constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
uint16_t tmPacketId = (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
return tmPacketId;
}
/** /**
* With this call, the complete data content (including the CCSDS Primary * With this call, the complete data content (including the CCSDS Primary
* Header) is overwritten with the byte stream given. * Header) is overwritten with the byte stream given.