Added TCP support #63
@ -1,9 +1,14 @@
|
|||||||
#include "CoreController.h"
|
#include "CoreController.h"
|
||||||
#include "q7sConfig.h"
|
#include "OBSWConfig.h"
|
||||||
#include "OBSWVersion.h"
|
#include "OBSWVersion.h"
|
||||||
|
|
||||||
#include "fsfw/FSFWVersion.h"
|
#include "fsfw/FSFWVersion.h"
|
||||||
#include "fsfw/serviceinterface/ServiceInterface.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
#if OBSW_USE_TMTC_TCP_BRIDGE == 0
|
||||||
|
#include "fsfw/osal/common/UdpTmTcBridge.h"
|
||||||
|
#else
|
||||||
|
#include "fsfw/osal/common/TcpTmTcBridge.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "bsp_q7s/memory/scratchApi.h"
|
#include "bsp_q7s/memory/scratchApi.h"
|
||||||
#include "bsp_q7s/memory/SdCardManager.h"
|
#include "bsp_q7s/memory/SdCardManager.h"
|
||||||
@ -188,6 +193,7 @@ ReturnValue_t CoreController::initializeAfterTaskCreation() {
|
|||||||
if(result != HasReturnvaluesIF::RETURN_OK) {
|
if(result != HasReturnvaluesIF::RETURN_OK) {
|
||||||
sif::warning << "CoreController::initialize: Version initialization failed" << std::endl;
|
sif::warning << "CoreController::initialize: Version initialization failed" << std::endl;
|
||||||
}
|
}
|
||||||
|
initPrint();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -349,3 +355,15 @@ ReturnValue_t CoreController::versionFileInit() {
|
|||||||
|
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CoreController::initPrint() {
|
||||||
|
#if OBSW_VERBOSE_LEVEL >= 1
|
||||||
|
#if OBSW_USE_TMTC_TCP_BRIDGE == 0
|
||||||
|
sif::info << "Created UDP server for TMTC commanding with listener port " <<
|
||||||
|
TcpTmTcBridge::DEFAULT_UDP_SERVER_PORT << std::endl;
|
||||||
|
#else
|
||||||
|
sif::info << "Created TCP server for TMTC commanding with listener port " <<
|
||||||
|
TcpTmTcBridge::DEFAULT_TCP_SERVER_PORT << std::endl;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
@ -41,6 +41,7 @@ private:
|
|||||||
SdCardManager::SdStatusPair& statusPair);
|
SdCardManager::SdStatusPair& statusPair);
|
||||||
|
|
||||||
ReturnValue_t versionFileInit();
|
ReturnValue_t versionFileInit();
|
||||||
|
void initPrint();
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
2
fsfw
2
fsfw
@ -1 +1 @@
|
|||||||
Subproject commit c5b4b0136217219a4443d858f42c368af9b15f27
|
Subproject commit 1f6a5e635fcd6bd812e262cc65a15a8a054f7ecf
|
@ -20,7 +20,7 @@ debugging. */
|
|||||||
|
|
||||||
// Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
|
// Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
|
||||||
// because UDP packets are not allowed in the VPN
|
// because UDP packets are not allowed in the VPN
|
||||||
#define OBSW_USE_TMTC_TCP_BRIDGE 1
|
#define OBSW_USE_TMTC_TCP_BRIDGE 0
|
||||||
|
|
||||||
#define OBSW_PRINT_MISSED_DEADLINES 1
|
#define OBSW_PRINT_MISSED_DEADLINES 1
|
||||||
#define OBSW_ADD_TEST_CODE 1
|
#define OBSW_ADD_TEST_CODE 1
|
||||||
|
Loading…
Reference in New Issue
Block a user