eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/development' into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2020-12-23 20:19:23 +01:00
commit a00f3b9adc
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
objectmanager/frameworkObjects.h
View File

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

5
osal/windows/TmTcWinUdpBridge.cpp
View File

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

6
tmtcpacket/pus/TmPacketStored.h
View File

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