Merge branch 'master' into mueller/FixedTimeslotUpdate

objectmanager/frameworkObjects.h

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

osal/linux/Clock.cpp

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