mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

all cstdout uses wrapped in preprocessor defines

Browse Source
This commit is contained in:
Robin Müller
2021-01-03 13:58:18 +01:00
parent 61fc6cac97
commit c19e628d79
96 changed files with 715 additions and 14 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
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

12
tasks/FixedSlotSequence.cpp

@ -91,8 +91,10 @@ void FixedSlotSequence::addSlot(object_id_t componentId, uint32_t slotTimeMs,
ReturnValue_t FixedSlotSequence::checkSequence() const {
if(slotList.empty()) {
#if CPP_OSTREAM_ENABLED == 1
sif::error << "FixedSlotSequence::checkSequence:"
<< " Slot list is empty!" << std::endl;
#endif
return HasReturnvaluesIF::RETURN_FAILED;
}
@ -100,8 +102,10 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
ReturnValue_t result = customCheckFunction(slotList);
if(result != HasReturnvaluesIF::RETURN_OK) {
// Continue for now but print error output.
#if CPP_OSTREAM_ENABLED == 1
sif::error << "FixedSlotSequence::checkSequence:"
<< " Custom check failed!" << std::endl;
#endif
}
}
@ -112,21 +116,27 @@ ReturnValue_t FixedSlotSequence::checkSequence() const {
errorCount++;
}
else if (slot.pollingTimeMs < time) {
#if CPP_OSTREAM_ENABLED == 1
sif::error << "FixedSlotSequence::checkSequence: Time: "
<< slot.pollingTimeMs << " is smaller than previous with "
<< time << std::endl;
#endif
errorCount++;
}
else {
// All ok, print slot.
#if CPP_OSTREAM_ENABLED == 1
//sif::info << "Current slot polling time: " << std::endl;
//sif::info << std::dec << slotIt->pollingTimeMs << std::endl;
#endif
}
time = slot.pollingTimeMs;
}
#if CPP_OSTREAM_ENABLED == 1
//sif::info << "Number of elements in slot list: "
// << slotList.size() << std::endl;
#endif
if (errorCount > 0) {
return HasReturnvaluesIF::RETURN_FAILED;
}
@ -149,8 +159,10 @@ ReturnValue_t FixedSlotSequence::intializeSequenceAfterTaskCreation() const {
}
}
if (count > 0) {
#if CPP_OSTREAM_ENABLED == 1
sif::error << "FixedSlotSequence::intializeSequenceAfterTaskCreation:"
"Counted " << count << " failed initializations!" << std::endl;
#endif
return HasReturnvaluesIF::RETURN_FAILED;
}
return HasReturnvaluesIF::RETURN_OK;