From 98333b92eff9389783a2b70c4979eed4b96d5e88 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Tue, 22 Sep 2020 15:57:26 +0200 Subject: [PATCH 1/2] srv17 id added, include fix for linux --- objectmanager/frameworkObjects.h | 1 + osal/linux/Clock.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/objectmanager/frameworkObjects.h b/objectmanager/frameworkObjects.h index 4a30e70ae..a7103018a 100644 --- a/objectmanager/frameworkObjects.h +++ b/objectmanager/frameworkObjects.h @@ -8,6 +8,7 @@ enum framework_objects { PUS_SERVICE_2 = 0x53000002, PUS_SERVICE_5 = 0x53000005, PUS_SERVICE_8 = 0x53000008, + PUS_SERVICE_17 = 0x53000017, PUS_SERVICE_200 = 0x53000200, //Generic IDs for IPC, modes, health, events diff --git a/osal/linux/Clock.cpp b/osal/linux/Clock.cpp index b14f2a970..4de18f83b 100644 --- a/osal/linux/Clock.cpp +++ b/osal/linux/Clock.cpp @@ -6,8 +6,8 @@ #include #include #include +#include -//#include uint16_t Clock::leapSeconds = 0; MutexIF* Clock::timeMutex = NULL; From ab0f4d8c87aedf5013debc6012da3aebb4389f8a Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Tue, 22 Sep 2020 16:01:34 +0200 Subject: [PATCH 2/2] service 9 ID added --- objectmanager/frameworkObjects.h | 1 + 1 file changed, 1 insertion(+) diff --git a/objectmanager/frameworkObjects.h b/objectmanager/frameworkObjects.h index a7103018a..87439c88b 100644 --- a/objectmanager/frameworkObjects.h +++ b/objectmanager/frameworkObjects.h @@ -8,6 +8,7 @@ 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,