Merge branch 'mueller/tcp-keep-open-pr' into mueller/master

src/fsfw/FSFWVersion.h

@@ -1,10 +0,0 @@
-#ifndef FSFW_VERSION_H_
-#define FSFW_VERSION_H_
-
-const char* const FSFW_VERSION_NAME = "ASTP";
-
-#define FSFW_VERSION        2
-#define FSFW_SUBVERSION     0
-#define FSFW_REVISION       0
-
-#endif /* FSFW_VERSION_H_ */

src/fsfw/FSFWVersion.h.in

@@ -0,0 +1,9 @@
+#ifndef FSFW_VERSION_H_
+#define FSFW_VERSION_H_
+
+// Versioning is kept in project CMakeLists.txt file
+#define FSFW_VERSION @FSFW_VERSION@
+#define FSFW_SUBVERSION @FSFW_SUBVERSION@
+#define FSFW_REVISION @FSFW_REVISION@
+
+#endif /* FSFW_VERSION_H_ */

src/fsfw/tmtcpacket/SpacePacket.h

@@ -71,12 +71,20 @@ protected:
 
 namespace spacepacket {
 
-constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
-    return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
+constexpr uint16_t getSpacePacketIdFromApid(bool isTc, uint16_t apid,
+        bool secondaryHeaderFlag = true) {
+    return (((isTc << 5) & 0x10) | ((secondaryHeaderFlag << 4) & 0x08) |
+            ((apid >> 8) & 0x07)) << 8 | (apid & 0x00ff);
 }
 
-constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
-    return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
+constexpr uint16_t getTcSpacketIdFromApid(uint16_t apid,
+        bool secondaryHeaderFlag = true) {
+    return getSpacePacketIdFromApid(true, apid, secondaryHeaderFlag);
+}
+
+constexpr uint16_t getTmSpacketIdFromApid(uint16_t apid,
+        bool secondaryHeaderFlag = true) {
+    return getSpacePacketIdFromApid(false, apid, secondaryHeaderFlag);
 }
 
 }

src/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.cpp

@@ -118,7 +118,7 @@ void TmPacketStoredBase::handleStoreFailure(const char *const packetType, Return
                 "%d too large\n", packetType, sizeToReserve);
         break;
     }
-#endif
 #endif
     }
+#endif
 }