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

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +2 -18
7 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a3dc94108 - Show all commits

2
osal/FreeRTOS/BinSemaphUsingTask.h
View File

@ -4,10 +4,8 @@
#include <framework/returnvalues/HasReturnvaluesIF.h> #include <framework/returnvalues/HasReturnvaluesIF.h>
#include <framework/tasks/SemaphoreIF.h> #include <framework/tasks/SemaphoreIF.h>
extern "C" {
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/task.h> #include <freertos/task.h>
}
/** /**
* @brief Binary Semaphore implementation using the task notification value. * @brief Binary Semaphore implementation using the task notification value.

2
osal/FreeRTOS/BinarySemaphore.h
View File

@ -4,10 +4,8 @@
#include <framework/returnvalues/HasReturnvaluesIF.h> #include <framework/returnvalues/HasReturnvaluesIF.h>
#include <framework/tasks/SemaphoreIF.h> #include <framework/tasks/SemaphoreIF.h>
extern "C" {
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/semphr.h> #include <freertos/semphr.h>
}
/** /**
* @brief OS Tool to achieve synchronization of between tasks or between * @brief OS Tool to achieve synchronization of between tasks or between

2
osal/FreeRTOS/CountingSemaphore.cpp
View File

@ -2,9 +2,7 @@
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <framework/osal/FreeRTOS/TaskManagement.h> #include <framework/osal/FreeRTOS/TaskManagement.h>
extern "C" {
#include <freertos/semphr.h> #include <freertos/semphr.h>
}
// Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in // Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in
// free FreeRTOSConfig.h file. // free FreeRTOSConfig.h file.

2
osal/FreeRTOS/MessageQueue.cpp
View File

@ -1,4 +1,4 @@
#include "MessageQueue.h" #include <framework/osal/FreeRTOS/MessageQueue.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>

7
osal/FreeRTOS/MessageQueue.h
View File

@ -6,11 +6,8 @@
#include <framework/ipc/MessageQueueMessage.h> #include <framework/ipc/MessageQueueMessage.h>
#include <framework/osal/FreeRTOS/TaskManagement.h> #include <framework/osal/FreeRTOS/TaskManagement.h>
extern "C" {
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/queue.h> #include <freertos/queue.h>
}
// TODO: this class assumes that MessageQueueId_t is the same size as void* // TODO: this class assumes that MessageQueueId_t is the same size as void*
// (the FreeRTOS handle type), compiler will catch this but it might be nice // (the FreeRTOS handle type), compiler will catch this but it might be nice
@ -164,11 +161,7 @@ public:
MessageQueueId_t getId() const; MessageQueueId_t getId() const;
/** /**
<<<<<<< HEAD
* \brief This method is a simple setter for the default destination.
=======
* @brief This method is a simple setter for the default destination. * @brief This method is a simple setter for the default destination.
>>>>>>> mueller_BinSempahInterface
*/ */
void setDefaultDestination(MessageQueueId_t defaultDestination); void setDefaultDestination(MessageQueueId_t defaultDestination);
/** /**

2
osal/FreeRTOS/Mutex.cpp
View File

@ -1,4 +1,4 @@
#include "Mutex.h" #include <framework/osal/FreeRTOS/Mutex.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>

3
osal/FreeRTOS/Mutex.h
View File

@ -3,11 +3,8 @@
#include <framework/ipc/MutexIF.h> #include <framework/ipc/MutexIF.h>
extern "C" {
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <freertos/semphr.h> #include <freertos/semphr.h>
}
/** /**
* @brief OS component to implement MUTual EXclusion * @brief OS component to implement MUTual EXclusion