Merge branch 'development' into mueller/master

objectmanager/frameworkObjects.h

@@ -22,6 +22,7 @@ enum framework_objects {
 	//IDs for PUS Packet Communication
 	TC_STORE = 0x534f0100,
 	TM_STORE = 0x534f0200,
+	TIME_STAMPER = 0x53500010,
 
 	NO_OBJECT = 0xFFFFFFFF
 };

osal/windows/TmTcWinUdpBridge.cpp

@@ -138,6 +138,11 @@ void TmTcWinUdpBridge::handleBindError() {
                 << "WSAStartup(...) call " << "necessary" << std::endl;
         break;
     }
+    case(WSAEADDRINUSE): {
+    	sif::warning << "TmTcWinUdpBridge::handleBindError: WSAEADDRINUSE: "
+    			<< "Port is already in use!" << std::endl;
+    	break;
+    }
     default: {
         /*
         https://docs.microsoft.com/en-us/windows/win32/winsock/

tmtcpacket/pus/TmPacketStored.h

@@ -1,5 +1,5 @@
-#ifndef TMTCPACKET_PUS_TMPACKETSTORED_H_
-#define TMTCPACKET_PUS_TMPACKETSTORED_H_
+#ifndef FSFW_TMTCPACKET_PUS_TMPACKETSTORED_H_
+#define FSFW_TMTCPACKET_PUS_TMPACKETSTORED_H_
 
 #include "TmPacketBase.h"
 
@@ -105,4 +105,4 @@ private:
 };
 
 
-#endif /* TMTCPACKET_PUS_TMPACKETSTORED_H_ */
+#endif /* FSFW_TMTCPACKET_PUS_TMPACKETSTORED_H_ */