KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Missing Initialization of FDIR in FreshDeviceHandlerBase #33

Merged
muellerr merged 8 commits from meier/debug into develop 2024-03-29 12:50:44 +01:00
Conversation 0 Commits 8 Files Changed 5 +16 -14
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit babb02ebb6 - Show all commits

9
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) {
if (receiveSizesFifo == nullptr) {
return returnvalue::FAILED; return returnvalue::FAILED;
} }
MutexGuard mg(mutex, timeoutType, timeoutMs); MutexGuard mg(mutex, timeoutType, timeoutMs);
if(mg.getLockResult() != returnvalue::OK) { if (mg.getLockResult() != returnvalue::OK) {
return mg.getLockResult(); return mg.getLockResult();
} }
empty = receiveSizesFifo->empty(); empty = receiveSizesFifo->empty();
return returnvalue::OK; 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;