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

freertos and dll replacements

Browse Source
This commit is contained in:
Robin Müller 2022-05-18 10:51:38 +02:00
parent b11ae1c11d
commit a3b9937f32
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
16 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/datalinklayer/Clcw.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/datalinklayer/Clcw.h" #include "fsfw/datalinklayer/Clcw.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
Clcw::Clcw() { Clcw::Clcw() {
content.raw = 0; content.raw = 0;

2
src/fsfw/datalinklayer/DataLinkLayer.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/datalinklayer/DataLinkLayer.h" #include "fsfw/datalinklayer/DataLinkLayer.h"
#include "fsfw/globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
DataLinkLayer::DataLinkLayer(uint8_t* set_frame_buffer, ClcwIF* setClcw, DataLinkLayer::DataLinkLayer(uint8_t* set_frame_buffer, ClcwIF* setClcw,
uint8_t set_start_sequence_length, uint16_t set_scid) uint8_t set_start_sequence_length, uint16_t set_scid)

2
src/fsfw/datalinklayer/MapPacketExtraction.cpp
View File

@ -4,7 +4,7 @@
#include "fsfw/ipc/QueueFactory.h" #include "fsfw/ipc/QueueFactory.h"
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
#include "fsfw/storagemanager/StorageManagerIF.h" #include "fsfw/storagemanager/StorageManagerIF.h"
#include "fsfw/tmtcpacket/SpacePacketBase.h" #include "fsfw/tmtcpacket/SpacePacketBase.h"
#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h" #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"

2
src/fsfw/datalinklayer/TcTransferFrame.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/datalinklayer/TcTransferFrame.h" #include "fsfw/datalinklayer/TcTransferFrame.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
TcTransferFrame::TcTransferFrame() { frame = nullptr; } TcTransferFrame::TcTransferFrame() { frame = nullptr; }

2
src/fsfw/datalinklayer/TcTransferFrameLocal.cpp
View File

@ -3,7 +3,7 @@
#include <cstring> #include <cstring>
#include "fsfw/globalfunctions/CRC.h" #include "fsfw/globalfunctions/CRC.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid, TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid,
uint8_t vcId, uint8_t sequenceNumber, uint8_t vcId, uint8_t sequenceNumber,

2
src/fsfw/datalinklayer/VirtualChannelReception.cpp
View File

@ -8,7 +8,7 @@
#include "fsfw/datalinklayer/VirtualChannelReception.h" #include "fsfw/datalinklayer/VirtualChannelReception.h"
#include "fsfw/datalinklayer/BCFrame.h" #include "fsfw/datalinklayer/BCFrame.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId, VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,
uint8_t setSlidingWindowWidth) uint8_t setSlidingWindowWidth)

2
src/fsfw/osal/freertos/BinSemaphUsingTask.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/osal/freertos/BinSemaphUsingTask.h" #include "fsfw/osal/freertos/BinSemaphUsingTask.h"
#include "fsfw/osal/freertos/TaskManagement.h" #include "fsfw/osal/freertos/TaskManagement.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
#if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || tskKERNEL_VERSION_MAJOR > 8 #if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || tskKERNEL_VERSION_MAJOR > 8

2
src/fsfw/osal/freertos/BinarySemaphore.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/osal/freertos/BinarySemaphore.h" #include "fsfw/osal/freertos/BinarySemaphore.h"
#include "fsfw/osal/freertos/TaskManagement.h" #include "fsfw/osal/freertos/TaskManagement.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
BinarySemaphore::BinarySemaphore() { BinarySemaphore::BinarySemaphore() {
handle = xSemaphoreCreateBinary(); handle = xSemaphoreCreateBinary();

2
src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/osal/freertos/CountingSemaphUsingTask.h" #include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
#include "fsfw/osal/freertos/TaskManagement.h" #include "fsfw/osal/freertos/TaskManagement.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
#if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || tskKERNEL_VERSION_MAJOR > 8 #if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || tskKERNEL_VERSION_MAJOR > 8

2
src/fsfw/osal/freertos/CountingSemaphore.cpp
View File

@ -2,7 +2,7 @@
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "fsfw/osal/freertos/TaskManagement.h" #include "fsfw/osal/freertos/TaskManagement.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
#include "semphr.h" #include "semphr.h"
// Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in // Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in

2
src/fsfw/osal/freertos/FixedTimeslotTask.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/osal/freertos/FixedTimeslotTask.h" #include "fsfw/osal/freertos/FixedTimeslotTask.h"
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
uint32_t FixedTimeslotTask::deadlineMissedCount = 0; uint32_t FixedTimeslotTask::deadlineMissedCount = 0;
const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE; const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE;

9
src/fsfw/osal/freertos/MessageQueue.cpp
View File

@ -2,7 +2,7 @@
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/osal/freertos/QueueMapManager.h" #include "fsfw/osal/freertos/QueueMapManager.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize, MqArgs* args) MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize, MqArgs* args)
: MessageQueueBase(MessageQueueIF::NO_QUEUE, MessageQueueIF::NO_QUEUE, args), : MessageQueueBase(MessageQueueIF::NO_QUEUE, MessageQueueIF::NO_QUEUE, args),
@ -14,9 +14,10 @@ MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize, MqArgs* a
sif::error << "Specified Message Depth: " << messageDepth << std::endl; sif::error << "Specified Message Depth: " << messageDepth << std::endl;
sif::error << "Specified Maximum Message Size: " << maxMessageSize << std::endl; sif::error << "Specified Maximum Message Size: " << maxMessageSize << std::endl;
#else #else
sif::printError("MessageQueue::MessageQueue: Creation failed\n"); // TODO: FMTLOG
sif::printError("Specified Message Depth: %d\n", messageDepth); // sif::printError("MessageQueue::MessageQueue: Creation failed\n");
sif::printError("Specified Maximum Message Size: %d\n", maxMessageSize); // sif::printError("Specified Message Depth: %d\n", messageDepth);
// sif::printError("Specified Maximum Message Size: %d\n", maxMessageSize);
#endif #endif
} }
QueueMapManager::instance()->addMessageQueue(handle, &id); QueueMapManager::instance()->addMessageQueue(handle, &id);

2
src/fsfw/osal/freertos/Mutex.cpp
View File

@ -1,6 +1,6 @@
#include "fsfw/osal/freertos/Mutex.h" #include "fsfw/osal/freertos/Mutex.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
Mutex::Mutex() { Mutex::Mutex() {
handle = xSemaphoreCreateMutex(); handle = xSemaphoreCreateMutex();

2
src/fsfw/osal/freertos/PeriodicTask.cpp
View File

@ -1,7 +1,7 @@
#include "fsfw/osal/freertos/PeriodicTask.h" #include "fsfw/osal/freertos/PeriodicTask.h"
#include "fsfw/objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
#include "fsfw/tasks/ExecutableObjectIF.h" #include "fsfw/tasks/ExecutableObjectIF.h"
PeriodicTask::PeriodicTask(const char* name, TaskPriority setPriority, TaskStackSize setStack, PeriodicTask::PeriodicTask(const char* name, TaskPriority setPriority, TaskStackSize setStack,

12
src/fsfw/osal/freertos/QueueMapManager.cpp
View File

@ -30,9 +30,10 @@ ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueue
"inside the map!" "inside the map!"
<< std::endl; << std::endl;
#else #else
sif::printError( // TODO: FMTLOG
"QueueMapManager::addMessageQueue This ID is already " // sif::printError(
"inside the map!\n"); // "QueueMapManager::addMessageQueue This ID is already "
// "inside the map!\n");
#endif #endif
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
} }
@ -51,8 +52,9 @@ QueueHandle_t QueueMapManager::getMessageQueue(MessageQueueId_t messageQueueId)
sif::warning << "QueueMapManager::getQueueHandle: The ID " << messageQueueId sif::warning << "QueueMapManager::getQueueHandle: The ID " << messageQueueId
<< " does not exists in the map!" << std::endl; << " does not exists in the map!" << std::endl;
#else #else
sif::printWarning("QueueMapManager::getQueueHandle: The ID %d does not exist in the map!\n", // TODO: FMTLOG
messageQueueId); // sif::printWarning("QueueMapManager::getQueueHandle: The ID %d does not exist in the map!\n",
// messageQueueId);
#endif #endif
} }
return nullptr; return nullptr;

2
src/fsfw/osal/freertos/SemaphoreFactory.cpp
View File

@ -4,7 +4,7 @@
#include "fsfw/osal/freertos/BinarySemaphore.h" #include "fsfw/osal/freertos/BinarySemaphore.h"
#include "fsfw/osal/freertos/CountingSemaphUsingTask.h" #include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
#include "fsfw/osal/freertos/CountingSemaphore.h" #include "fsfw/osal/freertos/CountingSemaphore.h"
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface.h"
SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr; SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;