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

mueller_TmTcBridge_cherryPicked #40

Merged
muellerr merged 30 commits from KSat/fsfw:mueller_TmTcBridge_cherryPicked into master 2020-07-07 12:06:47 +02:00
Conversation 3 Commits 30 Files Changed 2 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ab2794e2d8 - Show all commits

10
tmtcservices/TmTcBridge.cpp
View File

@ -23,7 +23,7 @@ ReturnValue_t TmTcBridge::setNumberOfSentPacketsPerCycle(
}
else {
warning << "TmTcBridge: Number of packets sent per cycle "
"exceeds limits" << std::endl;
"exceeds limits. Keeping default value." << std::endl;
return RETURN_FAILED;
}
}
@ -36,7 +36,7 @@ ReturnValue_t TmTcBridge::setMaxNumberOfPacketsStored(
}
else {
warning << "TmTcBridge: Number of packets stored "
"exceeds limits" << std::endl;
"exceeds limits. Keeping default value." << std::endl;
return RETURN_FAILED;
}
}
@ -142,7 +142,7 @@ ReturnValue_t TmTcBridge::storeDownlinkData(TmTcMessage *message) {
ReturnValue_t TmTcBridge::handleStoredTm() {
uint8_t counter = 0;
ReturnValue_t result = RETURN_OK;
while(!fifo.empty() && counter < sentPacketsPerCycle) {
while(not fifo.empty() && counter < sentPacketsPerCycle) {
//info << "TMTC Bridge: Sending stored TM data. There are "
// << (int) fifo.size() << " left to send\r\n" << std::flush;
store_address_t storeId;
@ -169,7 +169,7 @@ ReturnValue_t TmTcBridge::handleStoredTm() {
}
void TmTcBridge::registerCommConnect() {
if(!communicationLinkUp) {
if(not communicationLinkUp) {
//info << "TMTC Bridge: Registered Comm Link Connect" << std::endl;
communicationLinkUp = true;
}
@ -190,7 +190,7 @@ MessageQueueId_t TmTcBridge::getReportReceptionQueue(uint8_t virtualChannel) {
void TmTcBridge::printData(uint8_t * data, size_t dataLen) {
info << "TMTC Bridge: Printing data: [";
for(uint32_t i=0;i<dataLen;i++) {
for(uint32_t i = 0; i < dataLen; i++) {
info << std::hex << (int)data[i];
if(i < dataLen-1){
info << " , ";