From 5284eadca64199ed48fee02fd30882735f13b6c6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 28 Sep 2021 16:30:51 +0200
Subject: [PATCH] changes for C++11

---
 src/fsfw/returnvalues/FwClassIds.h        |  1 +
 src/fsfw/tmtcpacket/SpacePacket.h         | 17 ++++++++---------
 src/fsfw/tmtcservices/SpacePacketParser.h |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/fsfw/returnvalues/FwClassIds.h b/src/fsfw/returnvalues/FwClassIds.h
index 9ef6c3f2..6b09fd8a 100644
--- a/src/fsfw/returnvalues/FwClassIds.h
+++ b/src/fsfw/returnvalues/FwClassIds.h
@@ -79,6 +79,7 @@ enum: uint8_t {
     HAL_GPIO, //HGIO
     MGM_LIS3MDL, //MGMLIS3
     MGM_RM3100, //MGMRM3100
+    SPACE_PACKET_PARSER, //SPPA
     FW_CLASS_ID_COUNT // [EXPORT] : [END]
 
 };
diff --git a/src/fsfw/tmtcpacket/SpacePacket.h b/src/fsfw/tmtcpacket/SpacePacket.h
index 9eec87a8..67746859 100644
--- a/src/fsfw/tmtcpacket/SpacePacket.h
+++ b/src/fsfw/tmtcpacket/SpacePacket.h
@@ -32,15 +32,6 @@ public:
      */
     virtual ~SpacePacket();
 
-    static constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
-        uint16_t tcPacketId = (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
-        return tcPacketId;
-    }
-    static constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
-        uint16_t tmPacketId = (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
-        return tmPacketId;
-    }
-
     /**
      * With this call, the complete data content (including the CCSDS Primary
      * Header) is overwritten with the byte stream given.
@@ -78,4 +69,12 @@ protected:
     SpacePacketData localData;
 };
 
+constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
+    return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
+}
+
+constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
+    return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
+}
+
 #endif /* SPACEPACKET_H_ */
diff --git a/src/fsfw/tmtcservices/SpacePacketParser.h b/src/fsfw/tmtcservices/SpacePacketParser.h
index 82b15010..bed3369b 100644
--- a/src/fsfw/tmtcservices/SpacePacketParser.h
+++ b/src/fsfw/tmtcservices/SpacePacketParser.h
@@ -21,7 +21,7 @@ public:
 	//! is the size of the PUS packet starting at that index.
 	using IndexSizePair = std::pair<size_t, size_t>;
 
-	static constexpr uint8_t INTERFACE_ID = CLASS_ID::PUS_PARSER;
+	static constexpr uint8_t INTERFACE_ID = CLASS_ID::SPACE_PACKET_PARSER;
 	static constexpr ReturnValue_t NO_PACKET_FOUND = MAKE_RETURN_CODE(0x00);
 	static constexpr ReturnValue_t SPLIT_PACKET = MAKE_RETURN_CODE(0x01);