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

Update FSFW #25

Merged
muellerr merged 89 commits from mueller/master into master 2021-10-05 20:21:44 +02:00
Conversation 0 Commits 89 Files Changed 28 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5064d44999 - Show all commits

1
osal/linux/CMakeLists.txt
View File

@ -13,7 +13,6 @@ target_sources(${LIB_FSFW_NAME}
QueueFactory.cpp QueueFactory.cpp
SemaphoreFactory.cpp SemaphoreFactory.cpp
TaskFactory.cpp TaskFactory.cpp
Timer.cpp
tcpipHelpers.cpp tcpipHelpers.cpp
unixUtility.cpp unixUtility.cpp
) )

6
timemanager/Countdown.cpp
View File

@ -47,7 +47,7 @@ uint32_t Countdown::getRemainingMillis() const {
} }
uint32_t Countdown::getCurrentTime() const { uint32_t Countdown::getCurrentTime() const {
uint32_t current_time; uint32_t currentTime;
Clock::getUptime( &current_time ); Clock::getUptime( &currentTime );
return current_time; return currentTime;
} }