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

run auto formatter

Browse Source
This commit is contained in:
Jakob Meier 2024-03-27 12:13:01 +01:00
parent 41cdf3c1e8
commit babb02ebb6
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fsfw/container/SharedRingBuffer.cpp
View File

@ -52,14 +52,15 @@ DynamicFIFO<size_t>* SharedRingBuffer::getReceiveSizesFifo() {
return receiveSizesFifo; return receiveSizesFifo;
} }
ReturnValue_t SharedRingBuffer::fifoEmpty(bool& empty, MutexIF::TimeoutType timeoutType, uint32_t timeoutMs) { ReturnValue_t SharedRingBuffer::fifoEmpty(bool& empty, MutexIF::TimeoutType timeoutType,
if(receiveSizesFifo == nullptr) { uint32_t timeoutMs) {
return returnvalue::FAILED; 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;
} }
MutexGuard mg(mutex, timeoutType, timeoutMs);
if (mg.getLockResult() != returnvalue::OK) {
return mg.getLockResult();
}
empty = receiveSizesFifo->empty();
return returnvalue::OK;
}

3
src/fsfw/controller/ExtendedControllerBase.cpp
View File

@ -3,8 +3,7 @@
ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId, size_t commandQueueDepth) ExtendedControllerBase::ExtendedControllerBase(object_id_t objectId, size_t commandQueueDepth)
: ControllerBase(objectId, commandQueueDepth), : ControllerBase(objectId, commandQueueDepth),
poolManager(this, commandQueue), poolManager(this, commandQueue),
actionHelper(this, commandQueue) { actionHelper(this, commandQueue) {}
}
ExtendedControllerBase::~ExtendedControllerBase() = default; ExtendedControllerBase::~ExtendedControllerBase() = default;

2
src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp
View File

@ -11,7 +11,7 @@ FreshDeviceHandlerBase::FreshDeviceHandlerBase(DhbConfig config)
healthHelper(this, getObjectId()), healthHelper(this, getObjectId()),
paramHelper(this), paramHelper(this),
poolManager(this, nullptr), poolManager(this, nullptr),
fdirInstance(config.fdirInstance), fdirInstance(config.fdirInstance),
defaultFdirParent(config.defaultFdirParent) { defaultFdirParent(config.defaultFdirParent) {
auto mqArgs = MqArgs(config.objectId, static_cast<void*>(this)); auto mqArgs = MqArgs(config.objectId, static_cast<void*>(this));
messageQueue = QueueFactory::instance()->createMessageQueue( messageQueue = QueueFactory::instance()->createMessageQueue(