Merge branch 'master' into mueller/oldPoolRenaming

2020-09-26 14:04:41 +02:00 · 2020-09-26 14:04:41 +02:00 · c24c0ea575
commit c24c0ea575
parent d57b329630 d1fb512c1f
4 changed files with 4 additions and 2 deletions
--- a/events/fwSubsystemIdRanges.h
+++ b/events/fwSubsystemIdRanges.h
@ -19,6 +19,7 @@ enum {
 	SYSTEM_MANAGER_1 = 75,
 	SYSTEM_1 = 79,
 	PUS_SERVICE_1 = 80,
+	PUS_SERVICE_9 = 89,
 	PUS_SERVICE_17 = 97,
 	FW_SUBSYSTEM_ID_RANGE
 };
--- a/objectmanager/frameworkObjects.h
+++ b/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
--- a/osal/linux/Clock.cpp
+++ b/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;

--- a/returnvalues/FwClassIds.h
+++ b/returnvalues/FwClassIds.h
@ -56,7 +56,6 @@ enum {
 	DEVICE_COMMUNICATION_IF, //DC
 	BSP, //BSP
 	TIME_STAMPER_IF, //TSI 53
-	//TODO This will shift all IDs for FLP
 	SGP4PROPAGATOR_CLASS, //SGP4 54
 	MUTEX_IF, //MUX 55
 	MESSAGE_QUEUE_IF,//MQI 56