Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
5 changed files with 9 additions and 17 deletions
Showing only changes of commit db84dcd3ce - Show all commits

View File

@ -566,7 +566,7 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
if (result != returnvalue::OK) {
return result;
}
if(fromTimestamp > toTimestamp) {
if (fromTimestamp > toTimestamp) {
return INVALID_TIME_WINDOW;
}
itBegin = telecommandMap.begin();
@ -575,7 +575,7 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
itBegin++;
}
//start looking for end beginning at begin
// start looking for end beginning at begin
itEnd = itBegin;
while (itEnd->first <= toTimestamp && itEnd != telecommandMap.end()) {
itEnd++;

View File

@ -17,7 +17,6 @@
*/
class SpacePacketParser {
public:
struct FoundPacketInfo {
size_t startIdx = 0;
size_t sizeFound = 0;
@ -51,9 +50,7 @@ class SpacePacketParser {
ReturnValue_t parseSpacePackets(const uint8_t** buffer, const size_t maxSize,
FoundPacketInfo& packetInfo);
size_t getAmountRead() {
return amountRead;
}
size_t getAmountRead() { return amountRead; }
void reset() {
nextStartIdx = 0;

View File

@ -1,6 +1,3 @@
target_sources(${FSFW_TEST_TGT} PRIVATE
testLocalPoolVariable.cpp
testLocalPoolVector.cpp
testDataSet.cpp
testLocalPoolManager.cpp
)
target_sources(
${FSFW_TEST_TGT} PRIVATE testLocalPoolVariable.cpp testLocalPoolVector.cpp
testDataSet.cpp testLocalPoolManager.cpp)

View File

@ -1,3 +1 @@
target_sources(${FSFW_TEST_TGT} PRIVATE
testService11.cpp
)
target_sources(${FSFW_TEST_TGT} PRIVATE testService11.cpp)

View File

@ -7,8 +7,8 @@
#include "tmtc/pusIds.h"
TEST_CASE("PUS Service 11", "[pus-srvc11]") {
Service11TelecommandScheduling<13> pusService11({objects::PUS_SERVICE_11_TC_SCHEDULER,
apid::DEFAULT_APID, pus::PUS_SERVICE_11}, nullptr);
Service11TelecommandScheduling<13> pusService11(
{objects::PUS_SERVICE_11_TC_SCHEDULER, apid::DEFAULT_APID, pus::PUS_SERVICE_11}, nullptr);
// TODO test something...
}