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

compiling and working again

Browse Source
This commit is contained in:
Robin Müller 2020-09-05 21:11:27 +02:00
parent 39b675cf99
commit 80e60566d8
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osal/host/FixedTimeslotTask.cpp
View File

@ -90,9 +90,12 @@ ReturnValue_t FixedTimeslotTask::sleepFor(uint32_t ms) {
} }
void FixedTimeslotTask::taskFunctionality() { void FixedTimeslotTask::taskFunctionality() {
pollingSeqTable.intializeSequenceAfterTaskCreation();
// A local iterator for the Polling Sequence Table is created to // A local iterator for the Polling Sequence Table is created to
// find the start time for the first entry. // find the start time for the first entry.
FixedSlotSequence::SlotListIter slotListIter = pollingSeqTable.current; auto slotListIter = pollingSeqTable.current;
// Get start time for first entry. // Get start time for first entry.
chron_ms interval(slotListIter->pollingTimeMs); chron_ms interval(slotListIter->pollingTimeMs);
auto currentStartTime { auto currentStartTime {
@ -124,7 +127,7 @@ ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
uint32_t slotTimeMs, int8_t executionStep) { uint32_t slotTimeMs, int8_t executionStep) {
ExecutableObjectIF* executableObject = objectManager-> ExecutableObjectIF* executableObject = objectManager->
get<ExecutableObjectIF>(componentId); get<ExecutableObjectIF>(componentId);
if (executableObject!= nullptr) { if (executableObject != nullptr) {
pollingSeqTable.addSlot(componentId, slotTimeMs, executionStep, pollingSeqTable.addSlot(componentId, slotTimeMs, executionStep,
executableObject, this); executableObject, this);
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
@ -135,7 +138,7 @@ ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
} }
ReturnValue_t FixedTimeslotTask::checkAndInitializeSequence() const { ReturnValue_t FixedTimeslotTask::checkSequence() const {
return pollingSeqTable.checkSequence(); return pollingSeqTable.checkSequence();
} }

2
osal/host/FixedTimeslotTask.h
View File

@ -61,7 +61,7 @@ public:
ReturnValue_t addSlot(object_id_t componentId, ReturnValue_t addSlot(object_id_t componentId,
uint32_t slotTimeMs, int8_t executionStep); uint32_t slotTimeMs, int8_t executionStep);
ReturnValue_t checkAndInitializeSequence() const; ReturnValue_t checkSequence() const override;
uint32_t getPeriodMs() const; uint32_t getPeriodMs() const;

2
osal/host/QueueMapManager.cpp
View File

@ -37,7 +37,7 @@ ReturnValue_t QueueMapManager::addMessageQueue(
MessageQueueIF* QueueMapManager::getMessageQueue( MessageQueueIF* QueueMapManager::getMessageQueue(
MessageQueueId_t messageQueueId) const { MessageQueueId_t messageQueueId) const {
MutexHelper(MutexIF::TimeoutType::WAITING, mapLock, 50); MutexHelper(mapLock, MutexIF::TimeoutType::WAITING, 50);
auto queueIter = queueMap.find(messageQueueId); auto queueIter = queueMap.find(messageQueueId);
if(queueIter != queueMap.end()) { if(queueIter != queueMap.end()) {
return queueIter->second; return queueIter->second;

4
timemanager/CCSDSTime.cpp
View File

@ -3,6 +3,10 @@
#include <inttypes.h> #include <inttypes.h>
#include <math.h> #include <math.h>
#ifndef SCNu8
#define SCNu8 "hhu"
#endif
CCSDSTime::CCSDSTime() { CCSDSTime::CCSDSTime() {
} }