From 571a64c42a72efb1ce0fc717215f714f81294fcb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 22 Dec 2020 16:10:53 +0100 Subject: [PATCH 1/3] time stamper ID added --- objectmanager/frameworkObjects.h | 1 + 1 file changed, 1 insertion(+) diff --git a/objectmanager/frameworkObjects.h b/objectmanager/frameworkObjects.h index 57783286..8f8e93af 100644 --- a/objectmanager/frameworkObjects.h +++ b/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 }; From e674b9248a272a48f1aed66e6550770bfb9abcf1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 22 Dec 2020 16:15:40 +0100 Subject: [PATCH 2/3] better error handling --- osal/windows/TmTcWinUdpBridge.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/osal/windows/TmTcWinUdpBridge.cpp b/osal/windows/TmTcWinUdpBridge.cpp index 1f66290f..e1ba132e 100644 --- a/osal/windows/TmTcWinUdpBridge.cpp +++ b/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/ From f017e9c6d4f16cc8a417d1d06c06a439139a0bb1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 22 Dec 2020 16:22:11 +0100 Subject: [PATCH 3/3] include guards --- tmtcpacket/pus/TmPacketStored.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tmtcpacket/pus/TmPacketStored.h b/tmtcpacket/pus/TmPacketStored.h index 6ddbf131..b231407d 100644 --- a/tmtcpacket/pus/TmPacketStored.h +++ b/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_ */