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

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0b218c18e - Show all commits

2
osal/host/MessageQueue.cpp
View File

@ -135,7 +135,7 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo,
return HasReturnvaluesIF::RETURN_OK;
}
ReturnValue_t MessageQueue::lockQueue(millis_t lockTimeout) {
ReturnValue_t MessageQueue::lockQueue(dur_millis_t lockTimeout) {
return queueLock->lockMutex(lockTimeout);
}

2
osal/host/MessageQueue.h
View File

@ -182,7 +182,7 @@ public:
bool isDefaultDestinationSet() const override;
ReturnValue_t lockQueue(millis_t lockTimeout);
ReturnValue_t lockQueue(dur_millis_t lockTimeout);
ReturnValue_t unlockQueue();
protected:
/**