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

Bugfix in Command Executor and Timer Update #10

Closed
muellerr wants to merge 17 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 17 Files Changed 11 +16
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6073abb12d - Show all commits

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

@ -27,6 +27,7 @@ int Timer::setTimer(uint32_t intervalMs) {
timer.it_value.tv_nsec = (intervalMs * 1000000) % (1000000000); timer.it_value.tv_nsec = (intervalMs * 1000000) % (1000000000);
timer.it_interval.tv_sec = 0; timer.it_interval.tv_sec = 0;
timer.it_interval.tv_nsec = 0; timer.it_interval.tv_nsec = 0;
set = true;
return timer_settime(timerId, 0, &timer, NULL); return timer_settime(timerId, 0, &timer, NULL);
} }
@ -43,3 +44,14 @@ int Timer::getTimer(uint32_t* remainingTimeMs){
return status; return status;
} }
bool Timer::isSet() const {
return this->set;
}
void Timer::resetTimer() {
if(not this->set) {
set = false;
}
setTimer(0);
}

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

@ -38,7 +38,11 @@ public:
*/ */
int getTimer(uint32_t* remainingTimeMs); int getTimer(uint32_t* remainingTimeMs);
bool isSet() const;
void resetTimer();
private: private:
bool set = true;
timer_t timerId; timer_t timerId;
}; };