mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge branch 'mueller/master' into mueller/project/distribDatapool

Browse Source
This commit is contained in:
Robin Müller
2020-08-08 12:04:52 +02:00
parent b7411591a1 03cd5780f9
commit 4afb19be51
52 changed files with 590 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datapoolglob/GlobalDataPool.cpp
View File

@ -54,7 +54,8 @@ ReturnValue_t GlobalDataPool::unlockDataPool() {
}
ReturnValue_t GlobalDataPool::lockDataPool(uint32_t timeoutMs) {
ReturnValue_t status = mutex->lockMutex(timeoutMs);
ReturnValue_t status = mutex->lockMutex(MutexIF::TimeoutType::WAITING,
timeoutMs);
if(status != RETURN_OK) {
sif::error << "DataPool::DataPool: lock of mutex failed "
"with error code: " << status << std::endl;