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

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +9 -17
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit db84dcd3ce - Show all commits

4
src/fsfw/pus/Service11TelecommandScheduling.tpp
View File

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

5
src/fsfw/tmtcservices/SpacePacketParser.h
View File

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

9
unittests/datapoollocal/CMakeLists.txt
View File

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

4
unittests/pus/CMakeLists.txt
View File

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

4
unittests/pus/testService11.cpp
View File

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