From 7b1f72254f866666d251f097b6587fc1c92f67e2 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 29 Sep 2020 13:30:30 +0200
Subject: [PATCH] object id names improved

---
 objectmanager/frameworkObjects.h      | 14 +++++++-------
 tmtcservices/VerificationReporter.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/objectmanager/frameworkObjects.h b/objectmanager/frameworkObjects.h
index 87439c88..4d08f084 100644
--- a/objectmanager/frameworkObjects.h
+++ b/objectmanager/frameworkObjects.h
@@ -4,13 +4,13 @@
 namespace objects {
 enum framework_objects {
 	// Default verification reporter.
-	PUS_SERVICE_1 = 0x53000001,
-	PUS_SERVICE_2 = 0x53000002,
-	PUS_SERVICE_5 = 0x53000005,
-	PUS_SERVICE_8 = 0x53000008,
-	PUS_SERVICE_9 = 0x53000009,
-	PUS_SERVICE_17 = 0x53000017,
-	PUS_SERVICE_200 = 0x53000200,
+	PUS_SERVICE_1_VERIFICATION = 0x53000001,
+	PUS_SERVICE_2_DEVICE_ACCESS = 0x53000002,
+	PUS_SERVICE_5_EVENT_REPORTING = 0x53000005,
+	PUS_SERVICE_8_FUNCTION_MGMT = 0x53000008,
+	PUS_SERVICE_9_TIME_MGMT = 0x53000009,
+	PUS_SERVICE_17_TEST = 0x53000017,
+	PUS_SERVICE_200_MODE_MGMT = 0x53000200,
 
 	//Generic IDs for IPC, modes, health, events
 	HEALTH_TABLE = 0x53010000,
diff --git a/tmtcservices/VerificationReporter.cpp b/tmtcservices/VerificationReporter.cpp
index 0c53e1a4..4255c5ae 100644
--- a/tmtcservices/VerificationReporter.cpp
+++ b/tmtcservices/VerificationReporter.cpp
@@ -6,7 +6,7 @@
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "../objectmanager/frameworkObjects.h"
 
-object_id_t VerificationReporter::messageReceiver = objects::PUS_SERVICE_1;
+object_id_t VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
 
 VerificationReporter::VerificationReporter() :
 		acknowledgeQueue(MessageQueueIF::NO_QUEUE) {