esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into mueller/FixedTimeslotUpdate

Browse Source
This commit is contained in:
Steffen Gaisser 2020-09-22 16:20:07 +02:00
commit d0f912f32b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objectmanager/frameworkObjects.h
View File

@ -8,6 +8,8 @@ enum framework_objects {
PUS_SERVICE_2 = 0x53000002, PUS_SERVICE_2 = 0x53000002,
PUS_SERVICE_5 = 0x53000005, PUS_SERVICE_5 = 0x53000005,
PUS_SERVICE_8 = 0x53000008, PUS_SERVICE_8 = 0x53000008,
PUS_SERVICE_9 = 0x53000009,
PUS_SERVICE_17 = 0x53000017,
PUS_SERVICE_200 = 0x53000200, PUS_SERVICE_200 = 0x53000200,
//Generic IDs for IPC, modes, health, events //Generic IDs for IPC, modes, health, events

2
osal/linux/Clock.cpp
View File

@ -6,8 +6,8 @@
#include <linux/sysinfo.h> #include <linux/sysinfo.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <fstream>
//#include <fstream>
uint16_t Clock::leapSeconds = 0; uint16_t Clock::leapSeconds = 0;
MutexIF* Clock::timeMutex = NULL; MutexIF* Clock::timeMutex = NULL;