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

Merge branch 'mueller_framework' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_framework

Browse Source
This commit is contained in:
Robin Müller 2020-04-16 17:02:10 +02:00
commit 5595b0f3ce
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devicehandlers/DeviceHandlerBase.cpp
View File

@ -116,7 +116,7 @@ ReturnValue_t DeviceHandlerBase::initialize() {
AcceptsDeviceResponsesIF *rawReceiver = objectManager->get< AcceptsDeviceResponsesIF *rawReceiver = objectManager->get<
AcceptsDeviceResponsesIF>(rawDataReceiverId); AcceptsDeviceResponsesIF>(rawDataReceiverId);
if (rawReceiver == NULL) { if (rawReceiver == nullptr) {
return RETURN_FAILED; return RETURN_FAILED;
} }

11
devicehandlers/FixedSlotSequence.cpp
View File

@ -1,5 +1,6 @@
#include <framework/devicehandlers/FixedSlotSequence.h> #include <framework/devicehandlers/FixedSlotSequence.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <cstdlib>
FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) : FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
slotLengthMs(setLengthMs) { slotLengthMs(setLengthMs) {
@ -87,7 +88,15 @@ uint32_t FixedSlotSequence::getLengthMs() const {
} }
ReturnValue_t FixedSlotSequence::checkSequence() const { ReturnValue_t FixedSlotSequence::checkSequence() const {
// Iterate through slotList and check successful creation. if(slotList.empty()) {
error << "Fixed Slot Sequence: Slot list is empty!" << std::endl;
// does check sequence have to be const?
// if I want to check a class, I need the ability to set
// internal class states.
//isEmpty = true;
std::exit(0);
}
// Iterate through slotList and check successful creation.
// Checks if timing is ok (must be ascending) and if all handlers were found. // Checks if timing is ok (must be ascending) and if all handlers were found.
auto slotIt = slotList.begin(); auto slotIt = slotList.begin();
uint32_t count = 0; uint32_t count = 0;

4
devicehandlers/FixedSlotSequence.h
View File

@ -3,6 +3,7 @@
#include <framework/devicehandlers/FixedSequenceSlot.h> #include <framework/devicehandlers/FixedSequenceSlot.h>
#include <framework/objectmanager/SystemObject.h> #include <framework/objectmanager/SystemObject.h>
#include <framework/returnvalues/HasReturnvaluesIF.h>
#include <list> #include <list>
#include <set> #include <set>
@ -23,7 +24,6 @@ using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
class FixedSlotSequence { class FixedSlotSequence {
public: public:
/** /**
* @brief The constructor of the FixedSlotSequence object. * @brief The constructor of the FixedSlotSequence object.
* *
@ -127,6 +127,8 @@ protected:
SlotList slotList; SlotList slotList;
uint32_t slotLengthMs; uint32_t slotLengthMs;
bool isEmpty = false;
}; };
#endif /* FIXEDSLOTSEQUENCE_H_ */ #endif /* FIXEDSLOTSEQUENCE_H_ */

1
osal/FreeRTOS/FixedTimeslotTask.cpp
View File

@ -112,7 +112,6 @@ void FixedTimeslotTask::taskFunctionality() {
vTaskDelayUntil(&xLastWakeTime, interval); vTaskDelayUntil(&xLastWakeTime, interval);
//TODO deadline missed check //TODO deadline missed check
} }
} }
} }

2
test/CatchExample.cpp
View File

@ -1,5 +1,7 @@
// Catch Example. // Catch Example.
// Does not work yet. Problems with linker without main and config folder. // Does not work yet. Problems with linker without main and config folder.
// propably because global object manager and some config files are not supplied
// but mandatory for full compilation of the framework.
// Let Catch provide main(): // Let Catch provide main():
#if defined(UNIT_TEST) #if defined(UNIT_TEST)