KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests1 Releases Wiki Activity

correct preprocessor define now used

Browse Source
This commit is contained in:
Robin Müller
2021-01-03 14:16:52 +01:00
parent 4515c0d3cd
commit 2edf158312
100 changed files with 356 additions and 356 deletions
container
SharedRingBuffer.cpp
controller
ExtendedControllerBase.cpp
datalinklayer
Clcw.cppDataLinkLayer.cppMapPacketExtraction.cppTcTransferFrame.cppTcTransferFrameLocal.cppVirtualChannelReception.cpp
datapool
PoolDataSetBase.cppPoolEntry.cpp
datapoollocal
HasLocalDataPoolIF.hLocalDataPoolManager.cppLocalDataPoolManager.hLocalPoolDataSetBase.cppLocalPoolObjectBase.cppLocalPoolVariable.tppLocalPoolVector.tppPoolReadHelper.h
defaultcfg/fsfwconfig/pollingsequence
PollingSequenceFactory.cpp
devicehandlers
DeviceHandlerBase.cppDeviceHandlerFailureIsolation.cpp
events
EventManager.cpp
fdir
FailureIsolationBase.cpp
globalfunctions
arrayprinter.cpp
health
HealthHelper.cpp
internalError
InternalErrorReporter.cpp
ipc
MessageQueueMessage.cppMutexHelper.h
memory
MemoryHelper.cpp
monitoring
MonitoringMessageContent.h
objectmanager
ObjectManager.cppObjectManagerIF.h
osal
FreeRTOS
BinSemaphUsingTask.cppBinarySemaphore.cppCountingSemaphUsingTask.cppCountingSemaphore.cppFixedTimeslotTask.cppMessageQueue.cppMutex.cppPeriodicTask.cppSemaphoreFactory.cpp
host
Clock.cppFixedTimeslotTask.cppMessageQueue.cppPeriodicTask.cppQueueMapManager.cppSemaphoreFactory.cpp
linux
BinarySemaphore.cppClock.cppCountingSemaphore.cppFixedTimeslotTask.cppMessageQueue.cppMutex.cppPeriodicPosixTask.cppPosixThread.cppTcUnixUdpPollingTask.cppTimer.cppTmTcUnixUdpBridge.cpp
rtems
MessageQueue.cppMultiObjectTask.cppMutex.cppPollingTask.cppTaskBase.cpp
windows
TcWinUdpPollingTask.cppTmTcWinUdpBridge.cpp
parameters
ParameterHelper.cpp
pus
CService201HealthCommanding.cppService1TelecommandVerification.cppService2DeviceAccess.cppService3Housekeeping.cppService5EventReporting.cppService8FunctionManagement.cpp
serialize
SerialBufferAdapter.cpp
serviceinterface
ServiceInterfaceBuffer.cppServiceInterfaceBuffer.hServiceInterfaceStream.cppServiceInterfaceStream.h
storagemanager
ConstStorageAccessor.cppLocalPool.cppPoolManager.cppStorageAccessor.cpp
subsystem
SubsystemBase.cpp
tasks
FixedSlotSequence.cpp
tcdistribution
CCSDSDistributor.cppPUSDistributor.cppTcDistributor.cpp
timemanager
Stopwatch.cpp
tmtcpacket/pus
TcPacketBase.cppTcPacketStored.cppTmPacketBase.cppTmPacketStored.cpp
tmtcservices
CommandingServiceBase.cppPusServiceBase.cppTmTcBridge.cppVerificationReporter.cpp
unittest
internal
InternalUnitTester.cppUnittDefinitions.cpp
osal
IntTestSemaphore.cpp
user
testcfg
pollingsequence
PollingSequenceFactory.cpp
unittest
core
CatchDefinitions.cpp

18
osal/linux/TcUnixUdpPollingTask.cpp

@ -39,7 +39,7 @@ ReturnValue_t TcUnixUdpPollingTask::performOperation(uint8_t opCode) {
reinterpret_cast<sockaddr*>(&senderAddress), &senderSockLen);
if(bytesReceived < 0) {
// handle error
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcSocketPollingTask::performOperation: Reception"
"error." << std::endl;
#endif
@ -47,7 +47,7 @@ ReturnValue_t TcUnixUdpPollingTask::performOperation(uint8_t opCode) {
continue;
}
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
// sif::debug << "TcSocketPollingTask::performOperation: " << bytesReceived
// << " bytes received" << std::endl;
#endif
@ -69,7 +69,7 @@ ReturnValue_t TcUnixUdpPollingTask::handleSuccessfullTcRead(size_t bytesRead) {
receptionBuffer.data(), bytesRead);
// arrayprinter::print(receptionBuffer.data(), bytesRead);
if (result != HasReturnvaluesIF::RETURN_OK) {
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcSerialPollingTask::transferPusToSoftwareBus: Data "
"storage failed" << std::endl;
sif::error << "Packet size: " << bytesRead << std::endl;
@ -81,7 +81,7 @@ ReturnValue_t TcUnixUdpPollingTask::handleSuccessfullTcRead(size_t bytesRead) {
result = MessageQueueSenderIF::sendMessage(targetTcDestination, &message);
if (result != HasReturnvaluesIF::RETURN_OK) {
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "Serial Polling: Sending message to queue failed"
<< std::endl;
#endif
@ -93,7 +93,7 @@ ReturnValue_t TcUnixUdpPollingTask::handleSuccessfullTcRead(size_t bytesRead) {
ReturnValue_t TcUnixUdpPollingTask::initialize() {
tcStore = objectManager->get<StorageManagerIF>(objects::TC_STORE);
if (tcStore == nullptr) {
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcSerialPollingTask::initialize: TC Store uninitialized!"
<< std::endl;
#endif
@ -102,7 +102,7 @@ ReturnValue_t TcUnixUdpPollingTask::initialize() {
tmtcBridge = objectManager->get<TmTcUnixUdpBridge>(tmtcBridgeId);
if(tmtcBridge == nullptr) {
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcSocketPollingTask::TcSocketPollingTask: Invalid"
" TMTC bridge object!" << std::endl;
#endif
@ -127,7 +127,7 @@ void TcUnixUdpPollingTask::setTimeout(double timeoutSeconds) {
int result = setsockopt(serverUdpSocket, SOL_SOCKET, SO_RCVTIMEO,
&tval, sizeof(receptionTimeout));
if(result == -1) {
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcSocketPollingTask::TcSocketPollingTask: Setting "
"receive timeout failed with " << strerror(errno) << std::endl;
#endif
@ -140,14 +140,14 @@ void TcUnixUdpPollingTask::handleReadError() {
case(EAGAIN): {
// todo: When working in timeout mode, this will occur more often
// and is not an error.
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcUnixUdpPollingTask::handleReadError: Timeout."
<< std::endl;
#endif
break;
}
default: {
#if CPP_OSTREAM_ENABLED == 1
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TcUnixUdpPollingTask::handleReadError: "
<< strerror(errno) << std::endl;
#endif