eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf4c3acc01 - Show all commits

4
src/fsfw/osal/linux/Timer.cpp
View File

@ -50,8 +50,6 @@ bool Timer::isSet() const {
} }
void Timer::resetTimer() { void Timer::resetTimer() {
if(not this->set) { set = false;
set = false;
}
setTimer(0); setTimer(0);
} }