eive/fsfw

forked from fsfw/fsfw

mueller/master #37

Closed

muellerr wants to merge 126 commits from mueller/master into eive/develop

241 changed files with 1978 additions and 8451 deletions

Showing only changes of commit 9e36bbc11d - 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);

					}

					}