diff --git a/src/fsfw/container/SharedRingBuffer.cpp b/src/fsfw/container/SharedRingBuffer.cpp index 4be9c09f..88003e2e 100644 --- a/src/fsfw/container/SharedRingBuffer.cpp +++ b/src/fsfw/container/SharedRingBuffer.cpp @@ -52,14 +52,15 @@ DynamicFIFO* SharedRingBuffer::getReceiveSizesFifo() { return receiveSizesFifo; } - ReturnValue_t SharedRingBuffer::fifoEmpty(bool& empty, MutexIF::TimeoutType timeoutType, uint32_t timeoutMs) { - if(receiveSizesFifo == nullptr) { - return returnvalue::FAILED; - } - MutexGuard mg(mutex, timeoutType, timeoutMs); - if(mg.getLockResult() != returnvalue::OK) { - return mg.getLockResult(); - } - empty = receiveSizesFifo->empty(); - return returnvalue::OK; - } \ No newline at end of file +ReturnValue_t SharedRingBuffer::fifoEmpty(bool& empty, MutexIF::TimeoutType timeoutType, + uint32_t timeoutMs) { + if (receiveSizesFifo == nullptr) { + return returnvalue::FAILED; + } + MutexGuard mg(mutex, timeoutType, timeoutMs); + if (mg.getLockResult() != returnvalue::OK) { + return mg.getLockResult(); + } + empty = receiveSizesFifo->empty(); + return returnvalue::OK; +} \ No newline at end of file diff --git a/src/fsfw/controller/ExtendedControllerBase.cpp b/src/fsfw/controller/ExtendedControllerBase.cpp index 8bde6310..63b21ba1 100644 --- a/src/fsfw/controller/ExtendedControllerBase.cpp +++ b/src/fsfw/controller/ExtendedControllerBase.cpp @@ -3,8 +3,7 @@ ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId, size_t commandQueueDepth) : ControllerBase(objectId, commandQueueDepth), poolManager(this, commandQueue), - actionHelper(this, commandQueue) { -} + actionHelper(this, commandQueue) {} ExtendedControllerBase::~ExtendedControllerBase() = default; diff --git a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp index 46ae02de..1b463a37 100644 --- a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp +++ b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp @@ -11,7 +11,7 @@ FreshDeviceHandlerBase::FreshDeviceHandlerBase(DhbConfig config) healthHelper(this, getObjectId()), paramHelper(this), poolManager(this, nullptr), - fdirInstance(config.fdirInstance), + fdirInstance(config.fdirInstance), defaultFdirParent(config.defaultFdirParent) { auto mqArgs = MqArgs(config.objectId, static_cast(this)); messageQueue = QueueFactory::instance()->createMessageQueue(