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

some tweaks

Browse Source
This commit is contained in:
Robin Müller 2020-09-05 21:18:30 +02:00
parent 883103af2b
commit c43ae66205
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osal/host/MessageQueue.cpp
View File

@ -1,6 +1,7 @@
#include "../../osal/host/MessageQueue.h" #include "MessageQueue.h"
#include "QueueMapManager.h"
#include "../../serviceinterface/ServiceInterfaceStream.h" #include "../../serviceinterface/ServiceInterfaceStream.h"
#include "../../osal/host/QueueMapManager.h"
#include "../../ipc/MutexFactory.h" #include "../../ipc/MutexFactory.h"
#include "../../ipc/MutexHelper.h" #include "../../ipc/MutexHelper.h"
@ -9,7 +10,8 @@ MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize):
queueLock = MutexFactory::instance()->createMutex(); queueLock = MutexFactory::instance()->createMutex();
auto result = QueueMapManager::instance()->addMessageQueue(this, &mqId); auto result = QueueMapManager::instance()->addMessageQueue(this, &mqId);
if(result != HasReturnvaluesIF::RETURN_OK) { if(result != HasReturnvaluesIF::RETURN_OK) {
sif::error << "MessageQueue: Could not be created" << std::endl; sif::error << "MessageQueue::MessageQueue:"
<< " Could not be created" << std::endl;
} }
} }

6
osal/host/Mutex.h
View File

@ -1,5 +1,5 @@
#ifndef FRAMEWORK_OSAL_FREERTOS_MUTEX_H_ #ifndef FSFW_OSAL_HOSTED_MUTEX_H_
#define FRAMEWORK_OSAL_FREERTOS_MUTEX_H_ #define FSFW_OSAL_HOSTED_MUTEX_H_
#include "../../ipc/MutexIF.h" #include "../../ipc/MutexIF.h"
@ -26,4 +26,4 @@ private:
std::timed_mutex mutex; std::timed_mutex mutex;
}; };
#endif /* FRAMEWORK_FREERTOS_MUTEX_H_ */ #endif /* FSFW_OSAL_HOSTED_MUTEX_H_ */

6
osal/host/PeriodicTask.cpp
View File

@ -1,7 +1,7 @@
#include "../../ipc/MutexFactory.h" #include "Mutex.h"
#include "../../osal/host/Mutex.h" #include "PeriodicTask.h"
#include "../../osal/host/PeriodicTask.h"
#include "../../ipc/MutexFactory.h"
#include "../../serviceinterface/ServiceInterfaceStream.h" #include "../../serviceinterface/ServiceInterfaceStream.h"
#include "../../tasks/ExecutableObjectIF.h" #include "../../tasks/ExecutableObjectIF.h"