fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

naming adaptions

Browse Source
This commit is contained in:
Robin Müller 2021-07-26 13:50:45 +02:00
parent 1f6a5e635f
commit 54c028f913
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/osal/common/TcpTmTcBridge.cpp
View File

@ -17,7 +17,7 @@
#endif #endif
const std::string TcpTmTcBridge::DEFAULT_TCP_SERVER_PORT = tcpip::DEFAULT_TCP_SERVER_PORT; const std::string TcpTmTcBridge::DEFAULT_SERVER_PORT = tcpip::DEFAULT_TCP_SERVER_PORT;
TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination, TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
object_id_t tmStoreId, object_id_t tcStoreId): object_id_t tmStoreId, object_id_t tcStoreId):

2
src/fsfw/osal/common/TcpTmTcBridge.h
View File

@ -30,7 +30,7 @@ class TcpTmTcBridge:
friend class TcpTmTcServer; friend class TcpTmTcServer;
public: public:
// The ports chosen here should not be used by any other process // The ports chosen here should not be used by any other process
static const std::string DEFAULT_TCP_SERVER_PORT; static const std::string DEFAULT_SERVER_PORT;
/** /**
* Constructor * Constructor

4
src/fsfw/osal/common/UdpTmTcBridge.cpp
View File

@ -17,13 +17,13 @@
#define FSFW_UDP_SEND_WIRETAPPING_ENABLED 0 #define FSFW_UDP_SEND_WIRETAPPING_ENABLED 0
#endif #endif
const std::string UdpTmTcBridge::DEFAULT_UDP_SERVER_PORT = tcpip::DEFAULT_UDP_SERVER_PORT; const std::string UdpTmTcBridge::DEFAULT_SERVER_PORT = tcpip::DEFAULT_UDP_SERVER_PORT;
UdpTmTcBridge::UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination, UdpTmTcBridge::UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
std::string udpServerPort, object_id_t tmStoreId, object_id_t tcStoreId): std::string udpServerPort, object_id_t tmStoreId, object_id_t tcStoreId):
TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) { TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {
if(udpServerPort == "") { if(udpServerPort == "") {
this->udpServerPort = DEFAULT_UDP_SERVER_PORT; this->udpServerPort = DEFAULT_SERVER_PORT;
} }
else { else {
this->udpServerPort = udpServerPort; this->udpServerPort = udpServerPort;

2
src/fsfw/osal/common/UdpTmTcBridge.h
View File

@ -28,7 +28,7 @@ class UdpTmTcBridge:
friend class UdpTcPollingTask; friend class UdpTcPollingTask;
public: public:
/* The ports chosen here should not be used by any other process. */ /* The ports chosen here should not be used by any other process. */
static const std::string DEFAULT_UDP_SERVER_PORT; static const std::string DEFAULT_SERVER_PORT;
UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination, UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
std::string udpServerPort = "", object_id_t tmStoreId = objects::TM_STORE, std::string udpServerPort = "", object_id_t tmStoreId = objects::TM_STORE,